From 356958309c766fe7aedd984cdca2c474dac60827 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Mon, 4 Jan 2016 19:31:42 +0100 Subject: [PATCH] Added hasColumn() method. --- opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp | 3 +++ opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp | 1 + opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp | 4 ++++ opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp | 1 + 4 files changed, 9 insertions(+) diff --git a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp index 9ee42853d..d5cc5cbcb 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp @@ -129,6 +129,9 @@ size_t SimpleTable::numRows() const { } + bool SimpleTable::hasColumn(const std::string& name) const { + return m_schema->hasColumn( name ); + } double SimpleTable::evaluate(const std::string& columnName, double xPos) const { diff --git a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp index ed437853a..4bdfc7cea 100644 --- a/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp @@ -46,6 +46,7 @@ namespace Opm { void addRow( const std::vector& row); const TableColumn& getColumn(const std::string &name) const; const TableColumn& getColumn(size_t colIdx) const; + bool hasColumn(const std::string& name) const; TableColumn& getColumn(const std::string &name); TableColumn& getColumn(size_t colIdx); diff --git a/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp b/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp index c7d5585eb..164b32ccb 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableSchema.cpp @@ -44,6 +44,10 @@ namespace Opm { return m_columns.size(); } + bool TableSchema::hasColumn(const std::string& name) const { + return m_columns.hasKey( name ); + } + } diff --git a/opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp b/opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp index 375d27e91..4ab214055 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp @@ -36,6 +36,7 @@ namespace Opm { void addColumn(const ColumnSchema& column); const ColumnSchema&& getColumn( const std::string& name ) const; const ColumnSchema&& getColumn( size_t columnIndex ) const; + bool hasColumn(const std::string&) const; /* Number of columns */ size_t size() const;