e884b0664c
Tune the makefile according to new principles, which adds a few bells
and whistles and for clarity.
Synopsis:
* The dependency on opm-common is completely gone. This is reflected in
travis and appveyor as well. No non-kitware cmake modules are used.
* Directories are flattened, quite a bit - source code is located in the
lib/ directory if it belongs to opm-parser, and external/ if third
party.
* The sibling build feature is implemented through cmake's
export(PACKAGE) rather than implicitly looking through source files.
* Targets explicitly set required public and private include
directories, compile options and definitions, which cmake will handle
and propagate
* opm-parser-config.cmake for downstream users is now provided.
* Dependencies are set up using targets. In the future, when cmake 3.x+
can be used, these should be either targets from newer Find modules,
or interface libraries.
* Fewer system specific assumptions are coded in, instead we assume
cmake or users set up system specific details.
* All module wide configuration and looking up libraries is handled in
the root makefile - all sub directories only set up libraries and
compile options for the module in question.
* Targets are defined and links handled transitively because cmake now
is told about them. ${module_LIBRARIES} variables are gone.
This is largely guided by the principles outlined in
https://rix0r.nl/blog/2015/08/13/cmake-guide/
Most source files are just moved - if they have some content change then
it's nothing more than include fixes or similar in order to make them
compile.
88 lines
2.8 KiB
C++
88 lines
2.8 KiB
C++
/*
|
|
Copyright (C) 2015 by Statoil ASA
|
|
|
|
This file is part of the Open Porous Media project (OPM).
|
|
|
|
OPM is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OPM is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#define BOOST_TEST_MODULE SimpleTableTests
|
|
|
|
#include <boost/test/unit_test.hpp>
|
|
|
|
|
|
#include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp>
|
|
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
|
|
#include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp>
|
|
#include <opm/parser/eclipse/EclipseState/Tables/TableIndex.hpp>
|
|
#include <opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp>
|
|
|
|
using namespace Opm;
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE( CreateTest ) {
|
|
TableSchema schema;
|
|
|
|
{
|
|
ColumnSchema col1("Name1" , Table::INCREASING , Table::DEFAULT_NONE);
|
|
ColumnSchema col2("Name2" , Table::INCREASING , Table::DEFAULT_NONE);
|
|
schema.addColumn( col1 );
|
|
schema.addColumn( col2 );
|
|
}
|
|
|
|
SimpleTable table(schema);
|
|
|
|
BOOST_CHECK_THROW( table.addRow( {1,2,3} ), std::invalid_argument);
|
|
table.addRow( {1,2} );
|
|
table.addRow( {3,4} );
|
|
|
|
{
|
|
const auto& col1 = table.getColumn( 0 );
|
|
const auto& col2 = table.getColumn( 1 );
|
|
|
|
|
|
BOOST_CHECK_EQUAL( col1[0] , 1 );
|
|
BOOST_CHECK_EQUAL( col2[0] , 2 );
|
|
BOOST_CHECK_EQUAL( col1[1] , 3 );
|
|
BOOST_CHECK_EQUAL( col2[1] , 4 );
|
|
}
|
|
|
|
BOOST_CHECK_THROW( table.get("NameX" , 0) , std::invalid_argument);
|
|
BOOST_CHECK_THROW( table.get(3 , 0) , std::invalid_argument);
|
|
|
|
BOOST_CHECK_THROW( table.get("Name1" , 3) , std::invalid_argument);
|
|
BOOST_CHECK_THROW( table.get(0 , 3) , std::invalid_argument);
|
|
|
|
|
|
BOOST_CHECK_EQUAL( table.get("Name1" , 0) , 1 );
|
|
BOOST_CHECK_EQUAL( table.get("Name1" , 1) , 3 );
|
|
BOOST_CHECK_EQUAL( table.get(0 , 0) , 1 );
|
|
BOOST_CHECK_EQUAL( table.get(0 , 1) , 3 );
|
|
|
|
BOOST_CHECK_EQUAL( table.get("Name2" , 0) , 2 );
|
|
BOOST_CHECK_EQUAL( table.get("Name2" , 1) , 4 );
|
|
BOOST_CHECK_EQUAL( table.get(1 , 0) , 2 );
|
|
BOOST_CHECK_EQUAL( table.get(1 , 1) , 4 );
|
|
|
|
{
|
|
const auto& col = table.getColumn("Name1");
|
|
auto exportCol = col.vectorCopy();
|
|
|
|
BOOST_CHECK_EQUAL( col.size() , exportCol.size());
|
|
for (size_t i = 0; i < col.size(); i++)
|
|
BOOST_CHECK_EQUAL( col[i] , exportCol[i]);
|
|
}
|
|
}
|
|
|