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
Joakim Hove
bf73449736
Added external files for cjson
2013-07-29 21:50:29 +02:00
Júlio Hoffimann
f4244e9382
Remove trailing whitespaces
2013-07-28 08:34:13 -03:00
Joakim Hove
8d6d9fd0a4
Merge pull request #4 from flikka/replace-RawParserKeywords
...
Replacing the RawParserKeywords with ParserKeyword with size
2013-06-24 06:13:15 -07:00
Kristian Flikka
31b3031c1a
Removed class ParserKeywordSize, and accompanying tests. Put info into ParserKeyword. Changed tests to expose same constraints.
2013-06-24 14:08:53 +02:00
Kristian Flikka
881adc2d40
Renamed template variable from intValue to value
2013-06-24 11:15:34 +02:00
Kristian Flikka
573b39b9ba
Renamed fixedSize to getFixedSize for consistency
2013-06-24 10:05:51 +02:00
Kristian Flikka
c905a8e65a
Merged cmake, was the same..
2013-06-21 15:37:56 +02:00
Kristian Flikka
951ce6ac4d
Changed from using RawParserKeywords to equivalent functionality now in Parser and ParserKeywordSize
2013-06-21 15:34:45 +02:00
Kristian Flikka
50ec3e0244
Changed from using RawParserKeywords to equivalent functionality now in Parser and ParserKeywordSize
2013-06-21 15:34:06 +02:00
Kristian Flikka
01abb91959
Renamed ParserRecordSize to ParserKeywordSize, because it is more consistent with ParserItemSize
2013-06-21 10:23:24 +02:00
Kristian Flikka
be06dee465
Fixed error in CMakeLists, renaming not completed...
2013-06-21 09:51:18 +02:00
Bård Skaflestad
ba2df2d25b
Disable build kluge that is no longer pertinent
...
The <have_boost_redef.hpp> header was introduced (commit 82369f9) as
a work-around for a particular interaction in the Autotools-based
setup of OPM-Core and the Dune core modules. Notably, Dune's
"Enable" trick for Boost failed on some older Autoconf systems. Now
that we're using CMake, however, that kluge is no longer needed
because we (OPM-Core) always
#define HAVE_BOOST 1
i.e., as an explict true/false value.
Therefore, we need no longer include <have_boost_redef.hpp> . The
header will be removed at a later time.
2013-06-20 23:14:39 +02:00
Bård Skaflestad
78bed975ed
Disable build kluge that is no longer pertinent
...
The <have_boost_redef.hpp> header was introduced (commit 82369f9) as
a work-around for a particular interaction in the Autotools-based
setup of OPM-Core and the Dune core modules. Notably, Dune's
"Enable" trick for Boost failed on some older Autoconf systems. Now
that we're using CMake, however, that kluge is no longer needed
because we (OPM-Core) always
#define HAVE_BOOST 1
i.e., as an explict true/false value.
Therefore, we need no longer include <have_boost_redef.hpp> . The
header will be removed at a later time.
2013-06-20 23:14:39 +02:00
Kristian Flikka
d79745ce4f
Changed some KEYWORD->Keyword instances, search and replace hickup
2013-06-20 15:40:45 +02:00
Kristian Flikka
f1660460dc
Replaced all instances of KW with Keyword. We can afford it.
2013-06-20 15:30:37 +02:00
Kristian Flikka
abcde19716
Removed unused import
2013-06-20 14:40:12 +02:00
Kristian Flikka
5fa04e5377
Added/implemented XStringItem for Parser and Deck, with tests. Added integration test for WWCT keyword. Moved DeckItem tests into type-specific files. Removed unused file.
2013-06-20 13:56:11 +02:00
Kristian Flikka
17dde28c49
Expanded ParserTest to test int based record with 1 to many records and items
2013-06-18 14:12:00 +02:00
Kristian Flikka
de1983807d
Added single parser test to test raw to deck parsing of int
2013-06-18 13:47:07 +02:00
Kristian Flikka
2cce97f115
Split parser function, to make more modular and testable. Moved integrationtests from ParserTests into Integration tests.
2013-06-18 10:28:30 +02:00
Kristian Flikka
a312360c8e
Corrected the label-setting
2013-06-06 14:06:20 +02:00
Kristian Flikka
fbb468342d
Finished up the last pieces for a simple BPR keyword vertical.
2013-06-04 14:32:30 +02:00
Kristian Flikka
18db675f71
Added some temporary code to make it build. WIP
2013-06-03 15:58:47 +02:00
Kristian Flikka
b43d95c5a2
Starting to wrap up from the top, added the missing DeckKW, and refactored a bit in some of the Raw classes that returned the internal structure
2013-06-03 15:54:16 +02:00
Joakim Hove
f9ae0680eb
Added DeckTests.cpp
2013-06-03 10:25:26 +02:00
Joakim Hove
c596b086c8
Started integration testing
2013-05-30 10:11:12 +02:00
Kristian Flikka
082978fc2e
Functionality to read from RawRecord into DeckRecord, based on ParserRecord.
2013-05-27 14:28:23 +02:00
Kristian Flikka
6e20bfda09
Added Deck class (empty), and some integration tests. WIP
2013-05-27 14:27:22 +02:00
Kristian Flikka
7998a84b81
Made the ParserIntItem's scan return DeckItem, and put a virtual scan in ParserItem. The ParserRecord now has a simple, but functioning parse method
2013-05-24 10:09:59 +02:00
Kristian Flikka
7bfe185998
Started working on the flow RawRecord->ParserRecord->DeckRecord. DeckRecord has some containers now.
2013-05-23 12:42:59 +02:00
Joakim Hove
3de7e988b7
Moved template code from header -> include file
2013-05-14 21:27:32 +02:00
Joakim Hove
d313827627
Added simple ParserRecord implementation
2013-05-14 21:26:42 +02:00
