From d612362d4b9a66b45180cbdef96b2a8b7458803a Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 10 Aug 2018 14:12:14 +0200 Subject: [PATCH] #3197 Refactoring : Add const keyword and use const ref --- .../RigStimPlanFractureDefinition.cpp | 20 +++++++++---------- .../RigStimPlanFractureDefinition.h | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp index bd2890bdbc..637a1748cf 100644 --- a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp +++ b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp @@ -203,7 +203,7 @@ void RigStimPlanFractureDefinition::generateXsFromFileXs(bool xMirrorMode) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector> RigStimPlanFractureDefinition::generateDataLayoutFromFileDataLayout(std::vector> fileXYData) +std::vector> RigStimPlanFractureDefinition::generateDataLayoutFromFileDataLayout(std::vector> fileXYData) const { if (m_xMirrorMode) { @@ -234,12 +234,12 @@ std::vector> RigStimPlanFractureDefinition::generateDataLayo //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigStimPlanFractureDefinition::numberOfParameterValuesOK(std::vector> propertyValuesAtTimestep) +bool RigStimPlanFractureDefinition::numberOfParameterValuesOK(std::vector> propertyValuesAtTimestep) const { size_t xCount = m_Xs.size(); if ( propertyValuesAtTimestep.size() != yCount()) return false; - for ( std::vector valuesAtDepthVector : propertyValuesAtTimestep ) + for ( const std::vector& valuesAtDepthVector : propertyValuesAtTimestep ) { if ( valuesAtDepthVector.size() != xCount ) return false; } @@ -345,7 +345,7 @@ std::vector> cvf::ref RigStimPlanFractureDefinition::createFractureGrid(const QString& resultName, int activeTimeStepIndex, double wellPathIntersectionAtFractureDepth, - RiaEclipseUnitTools::UnitSystem requiredUnitSet) + RiaEclipseUnitTools::UnitSystem requiredUnitSet) const { std::vector> conductivityValues = conductivityValuesAtTimeStep(resultName, activeTimeStepIndex, requiredUnitSet); if (conductivityValues.empty()) @@ -377,7 +377,7 @@ cvf::ref RigStimPlanFractureDefinition::createFractureGrid(cons cellPolygon.push_back(cvf::Vec3d(xCoords[i], depthCoords[j + 1], 0.0)); RigFractureCell stimPlanCell(cellPolygon, i, j); - if ( conductivityValues.size() > 0 ) //Assuming vector to be of correct length, or no values + if ( !conductivityValues.empty() ) //Assuming vector to be of correct length, or no values { stimPlanCell.setConductivityValue(conductivityValues[j + 1][i + 1]); } @@ -455,7 +455,7 @@ std::vector RigStimPlanFractureDefinition::fractureGridResults(const QSt void RigStimPlanFractureDefinition::createFractureTriangleGeometry(double wellPathIntersectionAtFractureDepth, const QString& fractureUserName, std::vector* vertices, - std::vector* triangleIndices) + std::vector* triangleIndices) const { std::vector xCoords = this->m_Xs; cvf::uint lenXcoords = static_cast(xCoords.size()); @@ -504,7 +504,7 @@ void RigStimPlanFractureDefinition::createFractureTriangleGeometry(double wellPa //-------------------------------------------------------------------------------------------------- void sortPolygon(std::vector &polygon) { - if (polygon.size() == 0) return; + if (polygon.empty()) return; for (int i = 1; i < static_cast(polygon.size()) - 1; i++) { @@ -547,7 +547,7 @@ void RigStimPlanFractureDefinition::addTimeStep(double time) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigStimPlanFractureDefinition::timeStepExists(double timeStepValueToCheck) +bool RigStimPlanFractureDefinition::timeStepExists(double timeStepValueToCheck) const { for (double timeStep : m_timeSteps) { @@ -559,7 +559,7 @@ bool RigStimPlanFractureDefinition::timeStepExists(double timeStepValueToCheck) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigStimPlanFractureDefinition::getTimeStepIndex(double timeStepValue) +size_t RigStimPlanFractureDefinition::getTimeStepIndex(double timeStepValue) const { size_t index = 0; while (index < m_timeSteps.size()) @@ -576,7 +576,7 @@ size_t RigStimPlanFractureDefinition::getTimeStepIndex(double timeStepValue) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t RigStimPlanFractureDefinition::totalNumberTimeSteps() +size_t RigStimPlanFractureDefinition::totalNumberTimeSteps() const { return m_timeSteps.size(); } diff --git a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h index 880fa6e60f..4b8e08ace3 100644 --- a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h +++ b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h @@ -74,16 +74,16 @@ public: cvf::ref createFractureGrid(const QString& resultName, int activeTimeStepIndex, double wellPathIntersectionAtFractureDepth, - RiaEclipseUnitTools::UnitSystem requiredUnitSet); + RiaEclipseUnitTools::UnitSystem requiredUnitSet) const; void createFractureTriangleGeometry(double wellPathIntersectionAtFractureDepth, const QString& fractureUserName, std::vector* vertices, - std::vector* triangleIndices); + std::vector* triangleIndices) const; const std::vector& timeSteps() const; void addTimeStep(double time); - size_t totalNumberTimeSteps(); + size_t totalNumberTimeSteps() const; std::vector> getStimPlanPropertyNamesUnits() const; @@ -106,13 +106,13 @@ public: QStringList conductivityResultNames() const; private: - bool timeStepExists(double timeStepValue); - size_t getTimeStepIndex(double timeStepValue); + bool timeStepExists(double timeStepValue) const; + size_t getTimeStepIndex(double timeStepValue) const; size_t resultIndex(const QString& resultName, const QString& unit) const; void generateXsFromFileXs(bool xMirrorMode); - std::vector> generateDataLayoutFromFileDataLayout(std::vector> rawXYData); + std::vector> generateDataLayoutFromFileDataLayout(std::vector> rawXYData) const; std::vector adjustedYCoordsAroundWellPathPosition(double wellPathIntersectionAtFractureDepth) const; - bool numberOfParameterValuesOK(std::vector> propertyValuesAtTimestep); + bool numberOfParameterValuesOK(std::vector> propertyValuesAtTimestep) const; double minY() const; double maxY() const; void scaleXs(double scaleFactor);