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

remove accessors in TableColumn added for external serialization

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-13 08:20:12 +01:00
parent afd12dc1bd
commit 3575f88ee8
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp
View File

@ -39,11 +39,7 @@ namespace Opm {
const std::vector<bool>& defaults,
size_t defaultCount);
size_t size( ) const;
const ColumnSchema& schema() const;
const std::string& name() const;
const std::vector<double>& values() const;
const std::vector<bool>& defaults() const;
size_t defaultCount() const;
void assertOrder(double value1 , double value2) const;
void addValue(double);
void addDefault();

24
src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp
View File

@ -62,26 +62,10 @@ namespace Opm {
throw std::invalid_argument("Incorrect ordering of values in column: " + m_schema.name());
}
const ColumnSchema& TableColumn::schema() const {
return m_schema;
}
const std::string& TableColumn::name() const {
return m_name;
}
const std::vector<double>& TableColumn::values() const {
return m_values;
}
const std::vector<bool>& TableColumn::defaults() const {
return m_default;
}
size_t TableColumn::defaultCount() const {
return m_defaultCount;
}
void TableColumn::assertNext(size_t index , double value) const {
size_t nextIndex = index + 1;
if (nextIndex < m_values.size()) {
@ -359,11 +343,11 @@ namespace Opm {
}
bool TableColumn::operator==(const TableColumn& data) const {
return this->schema() == data.schema() &&
return this->m_schema == data.m_schema &&
this->name() == data.name() &&
this->values() == data.values() &&
this->defaults() == data.defaults() &&
this->defaultCount() == data.defaultCount();
this->m_values == data.m_values &&
this->m_default == data.m_default &&
this->m_defaultCount == data.m_defaultCount;
}
}