From bc3b9837e0216a172c43127e508a35eb9ee37d82 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 23 Jun 2015 08:21:16 +0200 Subject: [PATCH] Renamed DynamicState::add() -> Dynamicstate::update() --- .../EclipseState/IOConfig/IOConfig.cpp | 4 +- .../EclipseState/Schedule/DynamicState.hpp | 2 +- .../eclipse/EclipseState/Schedule/Group.cpp | 32 ++++----- .../EclipseState/Schedule/Schedule.cpp | 6 +- .../eclipse/EclipseState/Schedule/Tuning.cpp | 66 +++++++++---------- .../eclipse/EclipseState/Schedule/Well.cpp | 30 ++++----- .../Schedule/tests/DynamicStateTests.cpp | 30 ++++----- 7 files changed, 85 insertions(+), 85 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp b/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp index f30dae174..d1c6fb3f3 100644 --- a/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp +++ b/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp @@ -143,7 +143,7 @@ namespace Opm { m_restart_output_config->globalReset(rs); } else { - m_restart_output_config->add(timestep, rs); + m_restart_output_config->update(timestep, rs); } } @@ -169,7 +169,7 @@ namespace Opm { rs.timestep = timestep; rs.basic = (restart == 0) ? 0 : 1; - m_restart_output_config->add(timestep, rs); + m_restart_output_config->update(timestep, rs); } diff --git a/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp b/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp index a1f35a208..f28eda816 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp @@ -88,7 +88,7 @@ namespace Opm { } - void add(size_t index , T value) { + void update(size_t index , T value) { if (index >= (m_timeMap->size())) throw std::range_error("Index value is out range."); diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp index a96422438..47cef7d85 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp @@ -115,7 +115,7 @@ namespace Opm { } void Group::setProductionGroup(size_t timeStep, bool isProductionGroup_) { - m_isProductionGroup->add(timeStep, isProductionGroup_); + m_isProductionGroup->update(timeStep, isProductionGroup_); } @@ -146,7 +146,7 @@ namespace Opm { if (phase != currentPhase) throw std::invalid_argument("Sorry - we currently do not support injecting multiple phases at the same time."); } - m_injection->phase->add( time_step , phase ); + m_injection->phase->update( time_step , phase ); } Phase::PhaseEnum Group::getInjectionPhase( size_t time_step ) const { @@ -154,7 +154,7 @@ namespace Opm { } void Group::setInjectionRate( size_t time_step , double rate) { - return m_injection->rate->add( time_step , rate); + return m_injection->rate->update( time_step , rate); } double Group::getInjectionRate( size_t time_step ) const { @@ -162,7 +162,7 @@ namespace Opm { } void Group::setInjectionControlMode(size_t time_step , GroupInjection::ControlEnum controlMode) { - m_injection->controlMode->add( time_step , controlMode ); + m_injection->controlMode->update( time_step , controlMode ); } GroupInjection::ControlEnum Group::getInjectionControlMode( size_t time_step) const { @@ -170,7 +170,7 @@ namespace Opm { } void Group::setSurfaceMaxRate( size_t time_step , double rate) { - return m_injection->surfaceFlowMaxRate->add( time_step , rate); + return m_injection->surfaceFlowMaxRate->update( time_step , rate); } double Group::getSurfaceMaxRate( size_t time_step ) const { @@ -178,7 +178,7 @@ namespace Opm { } void Group::setReservoirMaxRate( size_t time_step , double rate) { - return m_injection->reservoirFlowMaxRate->add( time_step , rate); + return m_injection->reservoirFlowMaxRate->update( time_step , rate); } double Group::getReservoirMaxRate( size_t time_step ) const { @@ -186,7 +186,7 @@ namespace Opm { } void Group::setTargetReinjectFraction( size_t time_step , double rate) { - return m_injection->targetReinjectFraction->add( time_step , rate); + return m_injection->targetReinjectFraction->update( time_step , rate); } double Group::getTargetReinjectFraction( size_t time_step ) const { @@ -194,7 +194,7 @@ namespace Opm { } void Group::setTargetVoidReplacementFraction( size_t time_step , double rate) { - return m_injection->targetVoidReplacementFraction->add( time_step , rate); + return m_injection->targetVoidReplacementFraction->update( time_step , rate); } double Group::getTargetVoidReplacementFraction( size_t time_step ) const { @@ -204,7 +204,7 @@ namespace Opm { /*****************************************************************/ void Group::setProductionControlMode( size_t time_step , GroupProduction::ControlEnum controlMode) { - m_production->controlMode->add(time_step , controlMode ); + m_production->controlMode->update(time_step , controlMode ); } GroupProduction::ControlEnum Group::getProductionControlMode( size_t time_step ) const { @@ -218,12 +218,12 @@ namespace Opm { void Group::setProductionExceedLimitAction( size_t time_step , GroupProductionExceedLimit::ActionEnum action) { - m_production->exceedAction->add(time_step , action); + m_production->exceedAction->update(time_step , action); } void Group::setOilTargetRate(size_t time_step , double oilTargetRate) { - m_production->oilTarget->add(time_step , oilTargetRate); + m_production->oilTarget->update(time_step , oilTargetRate); } @@ -233,7 +233,7 @@ namespace Opm { void Group::setGasTargetRate(size_t time_step , double gasTargetRate) { - m_production->gasTarget->add(time_step , gasTargetRate); + m_production->gasTarget->update(time_step , gasTargetRate); } @@ -243,7 +243,7 @@ namespace Opm { void Group::setWaterTargetRate(size_t time_step , double waterTargetRate) { - m_production->waterTarget->add(time_step , waterTargetRate); + m_production->waterTarget->update(time_step , waterTargetRate); } @@ -253,7 +253,7 @@ namespace Opm { void Group::setLiquidTargetRate(size_t time_step , double liquidTargetRate) { - m_production->liquidTarget->add(time_step , liquidTargetRate); + m_production->liquidTarget->update(time_step , liquidTargetRate); } @@ -291,7 +291,7 @@ namespace Opm { WellSetPtr newWellSet = WellSetPtr( wellSet->shallowCopy() ); newWellSet->addWell(well); - m_wells->add(time_step , newWellSet); + m_wells->update(time_step , newWellSet); } @@ -300,7 +300,7 @@ namespace Opm { WellSetPtr newWellSet = WellSetPtr( wellSet->shallowCopy() ); newWellSet->delWell(wellName); - m_wells->add(time_step , newWellSet); + m_wells->update(time_step , newWellSet); } } diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index 80dbbe6f8..bef677cda 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -208,11 +208,11 @@ namespace Opm { needNewTree = needNewTree || treeChanged; } if (needNewTree) { - m_rootGroupTree->add(currentStep, newTree); + m_rootGroupTree->update(currentStep, newTree); } } - + void Schedule::checkWELSPECSConsistency(WellConstPtr well, DeckKeywordConstPtr keyword, size_t recordIdx) const { DeckRecordConstPtr record = keyword->getRecord(recordIdx); if (well->getHeadI() != record->getItem("HEAD_I")->getInt(0) - 1) { @@ -962,7 +962,7 @@ namespace Opm { if (!hasGroup(childName)) addGroup( childName , currentStep ); } - m_rootGroupTree->add(currentStep, newTree); + m_rootGroupTree->update(currentStep, newTree); } void Schedule::handleWRFT(DeckKeywordConstPtr keyword, size_t currentStep) { diff --git a/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp b/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp index ef7add007..05558be18 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp @@ -243,39 +243,39 @@ namespace Opm { } /*The following "set" method declarations diverges from coding standard to improve readability*/ - void Tuning::setTSINIT(size_t timestep, double TSINIT) { m_TSINIT->add(timestep, TSINIT); } - void Tuning::setTSMAXZ(size_t timestep, double TSMAXZ) { m_TSMAXZ->add(timestep, TSMAXZ); } - void Tuning::setTSMINZ(size_t timestep, double TSMINZ) { m_TSMINZ->add(timestep, TSMINZ); } - void Tuning::setTSMCHP(size_t timestep, double TSMCHP) { m_TSMCHP->add(timestep, TSMCHP); } - void Tuning::setTSFMAX(size_t timestep, double TSFMAX) { m_TSFMAX->add(timestep, TSFMAX); } - void Tuning::setTSFMIN(size_t timestep, double TSFMIN) { m_TSFMIN->add(timestep, TSFMIN); } - void Tuning::setTSFCNV(size_t timestep, double TSFCNV) { m_TSFCNV->add(timestep, TSFCNV); } - void Tuning::setTFDIFF(size_t timestep, double TFDIFF) { m_TFDIFF->add(timestep, TFDIFF); } - void Tuning::setTHRUPT(size_t timestep, double THRUPT) { m_THRUPT->add(timestep, THRUPT); } - void Tuning::setTMAXWC(size_t timestep, double TMAXWC) { m_TMAXWC->add(timestep, TMAXWC); m_TMAXWC_has_value->add(timestep, true); } - void Tuning::setTRGTTE(size_t timestep, double TRGTTE) { m_TRGTTE->add(timestep, TRGTTE); } - void Tuning::setTRGCNV(size_t timestep, double TRGCNV) { m_TRGCNV->add(timestep, TRGCNV); } - void Tuning::setTRGMBE(size_t timestep, double TRGMBE) { m_TRGMBE->add(timestep, TRGMBE); } - void Tuning::setTRGLCV(size_t timestep, double TRGLCV) { m_TRGLCV->add(timestep, TRGLCV); } - void Tuning::setXXXTTE(size_t timestep, double XXXTTE) { m_XXXTTE->add(timestep, XXXTTE); } - void Tuning::setXXXCNV(size_t timestep, double XXXCNV) { m_XXXCNV->add(timestep, XXXCNV); } - void Tuning::setXXXMBE(size_t timestep, double XXXMBE) { m_XXXMBE->add(timestep, XXXMBE); } - void Tuning::setXXXLCV(size_t timestep, double XXXLCV) { m_XXXLCV->add(timestep, XXXLCV); } - void Tuning::setXXXWFL(size_t timestep, double XXXWFL) { m_XXXWFL->add(timestep, XXXWFL); } - void Tuning::setTRGFIP(size_t timestep, double TRGFIP) { m_TRGFIP->add(timestep, TRGFIP); } - void Tuning::setTRGSFT(size_t timestep, double TRGSFT) { m_TRGSFT->add(timestep, TRGSFT); m_TRGSFT_has_value->add(timestep, true); } - void Tuning::setTHIONX(size_t timestep, double THIONX) { m_THIONX->add(timestep, THIONX); } - void Tuning::setTRWGHT(size_t timestep, int TRWGHT) { m_TRWGHT->add(timestep, TRWGHT); } - void Tuning::setNEWTMX(size_t timestep, int NEWTMX) { m_NEWTMX->add(timestep, NEWTMX); } - void Tuning::setNEWTMN(size_t timestep, int NEWTMN) { m_NEWTMN->add(timestep, NEWTMN); } - void Tuning::setLITMAX(size_t timestep, int LITMAX) { m_LITMAX->add(timestep, LITMAX); } - void Tuning::setLITMIN(size_t timestep, int LITMIN) { m_LITMIN->add(timestep, LITMIN); } - void Tuning::setMXWSIT(size_t timestep, int MXWSIT) { m_MXWSIT->add(timestep, MXWSIT); } - void Tuning::setMXWPIT(size_t timestep, int MXWPIT) { m_MXWPIT->add(timestep, MXWPIT); } - void Tuning::setDDPLIM(size_t timestep, double DDPLIM) { m_DDPLIM->add(timestep, DDPLIM); } - void Tuning::setDDSLIM(size_t timestep, double DDSLIM) { m_DDSLIM->add(timestep, DDSLIM); } - void Tuning::setTRGDPR(size_t timestep, double TRGDPR) { m_TRGDPR->add(timestep, TRGDPR); } - void Tuning::setXXXDPR(size_t timestep, double XXXDPR) { m_XXXDPR->add(timestep, XXXDPR); m_XXXDPR_has_value->add(timestep, true); } + void Tuning::setTSINIT(size_t timestep, double TSINIT) { m_TSINIT->update(timestep, TSINIT); } + void Tuning::setTSMAXZ(size_t timestep, double TSMAXZ) { m_TSMAXZ->update(timestep, TSMAXZ); } + void Tuning::setTSMINZ(size_t timestep, double TSMINZ) { m_TSMINZ->update(timestep, TSMINZ); } + void Tuning::setTSMCHP(size_t timestep, double TSMCHP) { m_TSMCHP->update(timestep, TSMCHP); } + void Tuning::setTSFMAX(size_t timestep, double TSFMAX) { m_TSFMAX->update(timestep, TSFMAX); } + void Tuning::setTSFMIN(size_t timestep, double TSFMIN) { m_TSFMIN->update(timestep, TSFMIN); } + void Tuning::setTSFCNV(size_t timestep, double TSFCNV) { m_TSFCNV->update(timestep, TSFCNV); } + void Tuning::setTFDIFF(size_t timestep, double TFDIFF) { m_TFDIFF->update(timestep, TFDIFF); } + void Tuning::setTHRUPT(size_t timestep, double THRUPT) { m_THRUPT->update(timestep, THRUPT); } + void Tuning::setTMAXWC(size_t timestep, double TMAXWC) { m_TMAXWC->update(timestep, TMAXWC); m_TMAXWC_has_value->update(timestep, true); } + void Tuning::setTRGTTE(size_t timestep, double TRGTTE) { m_TRGTTE->update(timestep, TRGTTE); } + void Tuning::setTRGCNV(size_t timestep, double TRGCNV) { m_TRGCNV->update(timestep, TRGCNV); } + void Tuning::setTRGMBE(size_t timestep, double TRGMBE) { m_TRGMBE->update(timestep, TRGMBE); } + void Tuning::setTRGLCV(size_t timestep, double TRGLCV) { m_TRGLCV->update(timestep, TRGLCV); } + void Tuning::setXXXTTE(size_t timestep, double XXXTTE) { m_XXXTTE->update(timestep, XXXTTE); } + void Tuning::setXXXCNV(size_t timestep, double XXXCNV) { m_XXXCNV->update(timestep, XXXCNV); } + void Tuning::setXXXMBE(size_t timestep, double XXXMBE) { m_XXXMBE->update(timestep, XXXMBE); } + void Tuning::setXXXLCV(size_t timestep, double XXXLCV) { m_XXXLCV->update(timestep, XXXLCV); } + void Tuning::setXXXWFL(size_t timestep, double XXXWFL) { m_XXXWFL->update(timestep, XXXWFL); } + void Tuning::setTRGFIP(size_t timestep, double TRGFIP) { m_TRGFIP->update(timestep, TRGFIP); } + void Tuning::setTRGSFT(size_t timestep, double TRGSFT) { m_TRGSFT->update(timestep, TRGSFT); m_TRGSFT_has_value->update(timestep, true); } + void Tuning::setTHIONX(size_t timestep, double THIONX) { m_THIONX->update(timestep, THIONX); } + void Tuning::setTRWGHT(size_t timestep, int TRWGHT) { m_TRWGHT->update(timestep, TRWGHT); } + void Tuning::setNEWTMX(size_t timestep, int NEWTMX) { m_NEWTMX->update(timestep, NEWTMX); } + void Tuning::setNEWTMN(size_t timestep, int NEWTMN) { m_NEWTMN->update(timestep, NEWTMN); } + void Tuning::setLITMAX(size_t timestep, int LITMAX) { m_LITMAX->update(timestep, LITMAX); } + void Tuning::setLITMIN(size_t timestep, int LITMIN) { m_LITMIN->update(timestep, LITMIN); } + void Tuning::setMXWSIT(size_t timestep, int MXWSIT) { m_MXWSIT->update(timestep, MXWSIT); } + void Tuning::setMXWPIT(size_t timestep, int MXWPIT) { m_MXWPIT->update(timestep, MXWPIT); } + void Tuning::setDDPLIM(size_t timestep, double DDPLIM) { m_DDPLIM->update(timestep, DDPLIM); } + void Tuning::setDDSLIM(size_t timestep, double DDSLIM) { m_DDSLIM->update(timestep, DDSLIM); } + void Tuning::setTRGDPR(size_t timestep, double TRGDPR) { m_TRGDPR->update(timestep, TRGDPR); } + void Tuning::setXXXDPR(size_t timestep, double XXXDPR) { m_XXXDPR->update(timestep, XXXDPR); m_XXXDPR_has_value->update(timestep, true); } } //namespace Opm diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp index 7f33472a9..edbeb6e29 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp @@ -64,8 +64,8 @@ namespace Opm { void Well::setProductionProperties(size_t timeStep , const WellProductionProperties newProperties) { - m_isProducer->add(timeStep , true); - m_productionProperties->add(timeStep, newProperties); + m_isProducer->update(timeStep , true); + m_productionProperties->update(timeStep, newProperties); } WellProductionProperties Well::getProductionPropertiesCopy(size_t timeStep) const { @@ -77,8 +77,8 @@ namespace Opm { } void Well::setInjectionProperties(size_t timeStep , const WellInjectionProperties newProperties) { - m_isProducer->add(timeStep , false); - m_injectionProperties->add(timeStep, newProperties); + m_isProducer->update(timeStep , false); + m_injectionProperties->update(timeStep, newProperties); } WellInjectionProperties Well::getInjectionPropertiesCopy(size_t timeStep) const { @@ -90,8 +90,8 @@ namespace Opm { } void Well::setPolymerProperties(size_t timeStep , const WellPolymerProperties newProperties) { - m_isProducer->add(timeStep , false); - m_polymerProperties->add(timeStep, newProperties); + m_isProducer->update(timeStep , false); + m_polymerProperties->update(timeStep, newProperties); } WellPolymerProperties Well::getPolymerPropertiesCopy(size_t timeStep) const { @@ -118,7 +118,7 @@ namespace Opm { std::cerr << "ERROR when handling keyword for well "<< name() << ": Cannot open a well where all completions are shut" << std::endl; } else { - m_status->add( timeStep , status ); + m_status->update( timeStep , status ); } } @@ -135,7 +135,7 @@ namespace Opm { } void Well::setAvailableForGroupControl(size_t timeStep, bool isAvailableForGroupControl_) { - m_isAvailableForGroupControl->add(timeStep, isAvailableForGroupControl_); + m_isAvailableForGroupControl->update(timeStep, isAvailableForGroupControl_); } double Well::getGuideRate(size_t timeStep) const { @@ -143,7 +143,7 @@ namespace Opm { } void Well::setGuideRate(size_t timeStep, double guideRate) { - m_guideRate->add(timeStep, guideRate); + m_guideRate->update(timeStep, guideRate); } GuideRate::GuideRatePhaseEnum Well::getGuideRatePhase(size_t timeStep) const { @@ -151,7 +151,7 @@ namespace Opm { } void Well::setGuideRatePhase(size_t timeStep, GuideRate::GuideRatePhaseEnum phase) { - m_guideRatePhase->add(timeStep, phase); + m_guideRatePhase->update(timeStep, phase); } double Well::getGuideRateScalingFactor(size_t timeStep) const { @@ -159,7 +159,7 @@ namespace Opm { } void Well::setGuideRateScalingFactor(size_t timeStep, double scalingFactor) { - m_guideRateScalingFactor->add(timeStep, scalingFactor); + m_guideRateScalingFactor->update(timeStep, scalingFactor); } /*****************************************************************/ @@ -224,7 +224,7 @@ namespace Opm { void Well::addCompletionSet(size_t time_step, const CompletionSetConstPtr newCompletionSet){ CompletionSetPtr mutable_copy(newCompletionSet->shallowCopy()); mutable_copy->orderCompletions(m_headI, m_headJ, m_grid); - m_completions->add(time_step, mutable_copy); + m_completions->update(time_step, mutable_copy); } const std::string Well::getGroupName(size_t time_step) const { @@ -233,13 +233,13 @@ namespace Opm { void Well::setGroupName(size_t time_step, const std::string& groupName ) { - m_groupName->add(time_step , groupName); + m_groupName->update(time_step , groupName); } void Well::setRFTActive(size_t time_step, bool value){ - m_rft->add(time_step, value); + m_rft->update(time_step, value); } bool Well::getRFTActive(size_t time_step) const{ @@ -250,7 +250,7 @@ namespace Opm { return m_plt->get(time_step); } void Well::setPLTActive(size_t time_step, bool value){ - m_plt->add(time_step, value); + m_plt->update(time_step, value); } int Well::findWellFirstOpen(int startTimeStep) const{ diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/DynamicStateTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/DynamicStateTests.cpp index 223c056b2..4df92b30e 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/tests/DynamicStateTests.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/tests/DynamicStateTests.cpp @@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(DynamicStateSetOutOfRangeThrows) { for (size_t i = 0; i < 2; i++) timeMap->addTStep( boost::posix_time::hours( (i+1) * 24 )); - BOOST_CHECK_THROW( state.add(3 , 100) , std::range_error); + BOOST_CHECK_THROW( state.update(3 , 100) , std::range_error); } @@ -74,19 +74,19 @@ BOOST_AUTO_TEST_CASE(DynamicStateSetOK) { for (size_t i = 0; i < 10; i++) timeMap->addTStep( boost::posix_time::hours( (i+1) * 24 )); - state.add(2 , 23 ); + state.update(2 , 23 ); BOOST_CHECK_EQUAL( 137 , state.get(0)); BOOST_CHECK_EQUAL( 137 , state.get(1)); BOOST_CHECK_EQUAL( 23 , state.get(2)); BOOST_CHECK_EQUAL( 23 , state.get(5)); - state.add(2 , 17); + state.update(2 , 17); BOOST_CHECK_EQUAL( 137 , state.get(0)); BOOST_CHECK_EQUAL( 137 , state.get(1)); BOOST_CHECK_EQUAL( 17 , state.get(2)); BOOST_CHECK_EQUAL( 17 , state.get(5)); - state.add(6 , 60); + state.update(6 , 60); BOOST_CHECK_EQUAL( 17 , state.get(2)); BOOST_CHECK_EQUAL( 17 , state.get(5)); BOOST_CHECK_EQUAL( 60 , state.get(6)); @@ -103,8 +103,8 @@ BOOST_AUTO_TEST_CASE(DynamicStateAddIndexAlreadySetThrows) { for (size_t i = 0; i < 10; i++) timeMap->addTStep( boost::posix_time::hours( (i+1) * 24 )); - state.add( 5 , 60); - BOOST_CHECK_THROW( state.add(3 , 78) , std::invalid_argument); + state.update( 5 , 60); + BOOST_CHECK_THROW( state.update(3 , 78) , std::invalid_argument); } @@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(DynamicStateAddAt) { for (size_t i = 0; i < 10; i++) timeMap->addTStep( boost::posix_time::hours( (i+1) * 24 )); - state.add( 10 , 77 ); + state.update( 10 , 77 ); { const int& v1 = state.at(10); int v2 = state.get(10); @@ -135,15 +135,15 @@ BOOST_AUTO_TEST_CASE(DynamicStateCheckSize) { BOOST_CHECK_EQUAL( 0U , state.size() ); - state.add( 0 , 10 ); + state.update( 0 , 10 ); BOOST_CHECK_EQUAL( 1U , state.size() ); - state.add( 2 , 10 ); + state.update( 2 , 10 ); BOOST_CHECK_EQUAL( 3U , state.size() ); - state.add( 2 , 10 ); + state.update( 2 , 10 ); BOOST_CHECK_EQUAL( 3U , state.size() ); - state.add( 6 , 10 ); + state.update( 6 , 10 ); BOOST_CHECK_EQUAL( 7U , state.size() ); } @@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE(DynamicStateOperatorSubscript) { for (size_t i = 0; i < 10; i++) timeMap->addTStep( boost::posix_time::hours( (i+1) * 24 )); - state.add( 10 , 200 ); + state.update( 10 , 200 ); BOOST_CHECK_EQUAL( state[9] , 137 ); BOOST_CHECK_EQUAL( state[0] , 137 ); @@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE(DynamicStateInitial) { timeMap->addTStep( boost::posix_time::hours( (i+1) * 24 )); - state.add( 10 , 200 ); + state.update( 10 , 200 ); BOOST_CHECK_EQUAL( state[9] , 137 ); BOOST_CHECK_EQUAL( state[0] , 137 ); BOOST_CHECK_EQUAL( state[10] , 200 ); @@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE(DynamicStateInitial) { BOOST_CHECK_EQUAL( state[10] , 200 ); - state2.add( 10 , 200 ); + state2.update( 10 , 200 ); BOOST_CHECK_EQUAL( state2[9] , 137 ); BOOST_CHECK_EQUAL( state2[0] , 137 ); BOOST_CHECK_EQUAL( state2[10] , 200 ); @@ -204,7 +204,7 @@ BOOST_AUTO_TEST_CASE( ResetGlobal ) { for (size_t i = 0; i < 10; i++) timeMap->addTStep( boost::posix_time::hours( (i+1) * 24 )); - state.add(5 , 100); + state.update(5 , 100); BOOST_CHECK_EQUAL( state[0] , 137 ); BOOST_CHECK_EQUAL( state[4] , 137 ); BOOST_CHECK_EQUAL( state[5] , 100 );