OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1922 from joakim-hove/dynamicstate-update-equal

Browse Source 
Dynamicstate update equal
This commit is contained in:
Bård Skaflestad
2020-09-17 08:03:29 +02:00
committed by GitHub
parent fb93e08ef0 a023d4b437
commit 7a2350bc3c
3 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/parser/DynamicStateTests.cpp
View File

@@ -202,28 +202,29 @@ BOOST_AUTO_TEST_CASE( find ) {
Opm::TimeMap timeMap = make_timemap(6);
Opm::DynamicState<int> state(timeMap , 137);
BOOST_CHECK_EQUAL( state.find( 137 ) , 0 );
BOOST_CHECK_EQUAL( state.find( 200 ) , -1 );
BOOST_CHECK_EQUAL( state.find_not(137), -1);
BOOST_CHECK_EQUAL( state.find_not(200), 0);
BOOST_CHECK_EQUAL( state.find( 137 ).value() , 0 );
BOOST_CHECK_EQUAL( state.find_not(200).value(), 0);
BOOST_CHECK( !state.find( 200 ));
BOOST_CHECK( !state.find_not(137));
state.update( 0 , 200 );
BOOST_CHECK_EQUAL( state.find( 137 ) , -1 );
BOOST_CHECK_EQUAL( state.find( 200 ) , 0 );
BOOST_CHECK( !state.find( 137 ) );
BOOST_CHECK_EQUAL( state.find( 200 ).value() , 0 );
state.update( 2 , 300 );
BOOST_CHECK_EQUAL( state.find( 200 ) , 0 );
BOOST_CHECK_EQUAL( state.find( 300 ) , 2 );
BOOST_CHECK_EQUAL( state.find_not( 200 ) , 2 );
BOOST_CHECK_EQUAL( state.find( 200 ).value() , 0 );
BOOST_CHECK_EQUAL( state.find( 300 ).value() , 2 );
BOOST_CHECK_EQUAL( state.find_not( 200 ).value() , 2 );
state.update( 4 , 400 );
BOOST_CHECK_EQUAL( state.find( 200 ) , 0 );
BOOST_CHECK_EQUAL( state.find( 300 ) , 2 );
BOOST_CHECK_EQUAL( state.find( 400 ) , 4 );
BOOST_CHECK_EQUAL( state.find( 500 ) , -1 );
BOOST_CHECK_EQUAL( state.find( 200 ).value() , 0 );
BOOST_CHECK_EQUAL( state.find( 300 ).value() , 2 );
BOOST_CHECK_EQUAL( state.find( 400 ).value() , 4 );
BOOST_CHECK( !state.find( 500 ));
auto pred = [] (const int& elm) { return elm == 400 ;};
BOOST_CHECK_EQUAL( state.find_if(pred), 4);
BOOST_CHECK_EQUAL( state.find_if(pred).value(), 4);
}
@@ -265,15 +266,21 @@ BOOST_AUTO_TEST_CASE( update_equal ) {
BOOST_CHECK_EQUAL(state[4], 50);
BOOST_CHECK_EQUAL(state[5], 100);
state.update_equal(4,50);
BOOST_CHECK_EQUAL(state[4], 50);
BOOST_CHECK_EQUAL(state[5], 100);
{
auto next_index = state.update_equal(4,50);
BOOST_CHECK_EQUAL(state[4], 50);
BOOST_CHECK_EQUAL(state[5], 100);
BOOST_CHECK_EQUAL(next_index.value() , 5);
}
state.update_equal(9,200);
BOOST_CHECK_EQUAL(state[8] , 100);
BOOST_CHECK_EQUAL(state[9] , 200);
BOOST_CHECK_EQUAL(state[10], 200);
{
auto next_index = state.update_equal(9,200);
BOOST_CHECK_EQUAL(state[8] , 100);
BOOST_CHECK_EQUAL(state[9] , 200);
BOOST_CHECK_EQUAL(state[10], 200);
BOOST_CHECK(!next_index);
}
}