Joakim Hove
47d29cc804
Added parser->size() and parser->loadKeywordFromFile()
2013-08-19 22:37:48 +02:00
Joakim Hove
7c30145435
Added testdata with single keyword files
2013-08-19 22:37:24 +02:00
Joakim Hove
75de3033f9
Renamed variables related keyword inferring size from other keyword
2013-08-14 08:43:54 +02:00
Joakim Hove
134e4be5cf
Removed references to RawDeck
2013-08-14 08:40:07 +02:00
Joakim Hove
e2fd83e731
Removed cout msg
2013-08-14 08:22:14 +02:00
Joakim Hove
a0a20425f6
Updated tests to reflect that RawDeck has been removed
2013-08-13 14:51:33 +02:00
Joakim Hove
765ade785a
Added Deck::size()
2013-08-13 14:49:58 +02:00
Joakim Hove
7786f296d8
Removed RawKeyword::lineContainsData() and RawKeyword::lineTerminatesKeyword()
2013-08-13 14:49:01 +02:00
Joakim Hove
c1ff0a6eb0
Removed RawDeckTests from CMakeLists.txt
2013-08-13 14:47:42 +02:00
Joakim Hove
d5705d131e
Removed RawDeck class
2013-08-13 14:46:41 +02:00
Joakim Hove
54b8299897
Changed testdata to exclude invalid keywords
2013-08-13 14:44:59 +02:00
Joakim Hove
b0363d9659
Added keyword defintions to the parser_config
2013-08-13 14:44:38 +02:00
Joakim Hove
5ab04d4b17
Removed old Parser::parse() and replaced with new implementation
2013-08-12 14:39:11 +02:00
Joakim Hove
5c3de27077
1. Implemented support for inferring size from another kewyord - i.e EQLDIMS + EQUIL.
...
2. Cleaned up the main parser loop considerably; the RawKeyword instance now itself knows whether it is complete or not.
2013-08-11 12:36:16 +02:00
Joakim Hove
4e531778f6
Merge branch 'master' into parse-EQUIL
2013-08-09 09:22:53 +02:00
Joakim Hove
fe070640ad
Added test for ParserDoubleItem
2013-08-09 09:12:55 +02:00
Joakim Hove
b190d74df6
Changed typo defaultInt() -> defaultDouble()
2013-08-09 08:49:14 +02:00
Joakim Hove
299eaf0a48
Minor rename
2013-08-06 16:30:48 +02:00
Joakim Hove
c864576424
Added FAILING: IntegrationTest to parse EQUIL
2013-08-06 16:28:48 +02:00
Joakim Hove
946485e2b4
Added parsing support for sizeType OTHER
2013-08-06 16:28:12 +02:00
Joakim Hove
c046fb0bde
Added support for keywords getting size from other keywords ~ EQUIL style
2013-08-06 16:26:49 +02:00
Joakim Hove
5dc350c735
Changed single -> SINGLE
2013-08-06 16:25:56 +02:00
Joakim Hove
a214098db3
Added EQUIL and EQUILDIMS to parser config
2013-08-06 14:40:43 +02:00
Joakim Hove
475b607faf
Can now parse file with several WCONHIST keywords
2013-08-01 12:50:42 +02:00
Joakim Hove
75954575d5
Changed Deck::getKeyword() to take an additional inde argument
2013-08-01 10:57:25 +02:00
Roland Kaufmann
e38548ebf6
Convert cubic interpolator to use Boost::UnitTest
2013-08-01 10:40:55 +02:00
Roland Kaufmann
e542fd6104
Graduate these tests to unit tests
...
Although they don't use Boost::UnitTest, they can at least pass, so we
can use them to detect simple compilation and runtime errors, although
we miss the semantic check.
(If you have time, please make them proper unit tests)
2013-08-01 10:40:55 +02:00
Joakim Hove
3bd3c7a306
Can parse one isolated WCONHIST keyword
2013-08-01 10:05:13 +02:00
Joakim Hove
a8d4a22894
Renamed DeckRecord::get() -> DeckRecord::getItem()
2013-08-01 09:52:49 +02:00
Joakim Hove
15c4874ee0
Added parsing support for float (i.e. double) items
2013-08-01 09:31:27 +02:00
Joakim Hove
797125463c
Added class wide default double value
2013-08-01 09:31:06 +02:00
Joakim Hove
ab3fb002d6
Added WCONHIST config to parser json config object
2013-08-01 09:30:11 +02:00
Joakim Hove
6d407ba73d
Added as_double() acces to JsonObject
2013-08-01 09:26:21 +02:00
Joakim Hove
8bc176d63e
Added full(?) Parser configuration from json
2013-07-31 17:58:05 +02:00
Joakim Hove
8dc8781c12
Added ValueType enum
2013-07-31 16:52:24 +02:00
Joakim Hove
7b9206f675
Added Json config to ParserStringItem
2013-07-31 16:24:26 +02:00
Joakim Hove
6c582a4b82
Added JsonConfig constructor to ParserIntItem
2013-07-31 16:15:22 +02:00
Joakim Hove
20a283e5d0
Added 2String and FromString methods to the Enums
2013-07-31 15:48:15 +02:00
Joakim Hove
db60ee2b56
Removed setRecord() method ParserKeyword. Instead ParserRecord is created during ParserKeyword construction
2013-07-31 15:02:00 +02:00
Joakim Hove
b7397ca502
Parser instantiated with json config file
2013-07-31 11:30:52 +02:00
Joakim Hove
b3d9fb51a0
Parser object can be constructed with config file as input argument
2013-07-31 11:30:21 +02:00
Joakim Hove
dd5e0b7b9c
Added throw() if JsonObject does not have name:
2013-07-31 11:29:16 +02:00
Joakim Hove
6ecad6b4e8
Improvements to JsonObject
2013-07-31 11:28:07 +02:00
Joakim Hove
17f440d6eb
Added more json config files
2013-07-31 11:27:01 +02:00
Joakim Hove
d8a74a1d3d
Typo in working directory of tests
2013-07-31 08:30:03 +02:00
Joakim Hove
e0995814f6
More JSON integration in Parser and ParserKeyword
2013-07-30 14:10:07 +02:00
Joakim Hove
269686a2f5
Extended the JsonObject() class
2013-07-30 14:08:42 +02:00
Joakim Hove
66cbb1a5cb
Added Boost_LIBARIES to opm-json link target
2013-07-30 14:07:57 +02:00
Joakim Hove
c829bf0b66
Added (const char * inline_json) constructor
2013-07-30 09:21:54 +02:00
Joakim Hove
42e7333392
Added JsonObject as thin wrapper around the cJSON source
2013-07-29 21:55:57 +02:00