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

Added DexkXXXItem.push_backDefault()

Browse Source
This commit is contained in:
Joakim Hove 2013-10-11 16:16:45 +02:00
parent 268119e1ce
commit 48a0fa39e1
9 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/parser/eclipse/Deck/DeckDoubleItem.cpp
View File

@ -51,6 +51,12 @@ namespace Opm {
}
void DeckDoubleItem::push_backDefault(double data) {
m_data.push_back( data );
m_defaultApplied = true;
}
size_t DeckDoubleItem::size() const {
return m_data.size();
}

1
opm/parser/eclipse/Deck/DeckDoubleItem.hpp
View File

@ -37,6 +37,7 @@ namespace Opm {
void push_back(std::deque<double> data , size_t items);
void push_back(std::deque<double> data);
void push_back(double value);
void push_backDefault(double value);
size_t size() const;
private:

8
opm/parser/eclipse/Deck/DeckIntItem.cpp
View File

@ -45,10 +45,16 @@ namespace Opm {
push_back(data, data.size());
}
void DeckIntItem::push_back(int data) {
void DeckIntItem::push_back(int data) {
m_data.push_back(data);
}
void DeckIntItem::push_backDefault(int data) {
m_data.push_back( data );
m_defaultApplied = true;
}
size_t DeckIntItem::size() const {
return m_data.size();
}

1
opm/parser/eclipse/Deck/DeckIntItem.hpp
View File

@ -38,6 +38,7 @@ namespace Opm {
void push_back(std::deque<int> data , size_t items);
void push_back(std::deque<int> data);
void push_back(int value);
void push_backDefault(int value);
size_t size() const;
private:

7
opm/parser/eclipse/Deck/DeckStringItem.cpp
View File

@ -51,6 +51,13 @@ namespace Opm {
m_data.push_back(data);
}
void DeckStringItem::push_backDefault(std::string data) {
m_data.push_back( data );
m_defaultApplied = true;
}
size_t DeckStringItem::size() const {
return m_data.size();
}

1
opm/parser/eclipse/Deck/DeckStringItem.hpp
View File

@ -37,6 +37,7 @@ namespace Opm {
void push_back(std::deque<std::string> data , size_t items);
void push_back(std::deque<std::string> data);
void push_back(std::string value);
void push_backDefault(std::string value);
size_t size() const;
private:

8
opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp
View File

@ -79,3 +79,11 @@ BOOST_AUTO_TEST_CASE(sizeDouble_correct) {
BOOST_AUTO_TEST_CASE(DefaultApplied) {
DeckDoubleItem deckDoubleItem("TEST");
BOOST_CHECK_EQUAL( false , deckDoubleItem.defaultApplied() );
deckDoubleItem.push_backDefault( 1 );
BOOST_CHECK_EQUAL( true , deckDoubleItem.defaultApplied() );
}

3
opm/parser/eclipse/Deck/tests/DeckIntItemTests.cpp
View File

@ -75,7 +75,10 @@ BOOST_AUTO_TEST_CASE(size_correct) {
BOOST_AUTO_TEST_CASE(DefaultApplied) {
DeckIntItem deckIntItem("TEST");
BOOST_CHECK_EQUAL( false , deckIntItem.defaultApplied() );
deckIntItem.push_backDefault( 1 );
BOOST_CHECK_EQUAL( true , deckIntItem.defaultApplied() );
}

10
opm/parser/eclipse/Deck/tests/DeckStringItemTests.cpp
View File

@ -69,3 +69,13 @@ BOOST_AUTO_TEST_CASE(size_variouspushes_sizecorrect) {
deckStringItem.push_back("WELL-5");
BOOST_CHECK_EQUAL(3U, deckStringItem.size());
}
BOOST_AUTO_TEST_CASE(DefaultApplied) {
DeckStringItem deckStringItem("TEST");
BOOST_CHECK_EQUAL( false , deckStringItem.defaultApplied() );
deckStringItem.push_backDefault( "1" );
BOOST_CHECK_EQUAL( true , deckStringItem.defaultApplied() );
}