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 |
|
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 |
|
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 |
|
Joakim Hove
|
d69784c59d
|
Added namespace Opm{} to DeckItem
|
2013-05-14 21:25:24 +02:00 |
|
Joakim Hove
|
6b338d09e7
|
Added skeleton implementation of DeckRecord
|
2013-05-14 21:23:34 +02:00 |
|
Joakim Hove
|
17f8ae7428
|
Added DeckDoubleItem implementation
|
2013-05-13 17:03:44 +02:00 |
|
Joakim Hove
|
b6c1da8c17
|
Rewritten scan functionality to the BaseClass and template functions
|
2013-05-13 16:41:09 +02:00 |
|
Joakim Hove
|
a1cfec5879
|
Changed ItemSizeEnum: SCALAR -> SINGLE
|
2013-05-13 16:40:25 +02:00 |
|
Joakim Hove
|
0524ac040f
|
ParserIntItem can handle sizeType == ALL
|
2013-05-12 21:38:14 +02:00 |
|
Joakim Hove
|
f178691831
|
Added size() method to the RawRecord class
|
2013-05-12 21:37:22 +02:00 |
|
Joakim Hove
|
9e1b00ef63
|
The ParserIntItem::scan() function will push unused values back on the front of the RawRecord.
|
2013-05-10 13:56:41 +02:00 |
|
Joakim Hove
|
a9cd24f628
|
Added operator[] and method push_front() to RawDeck
|
2013-05-10 13:55:00 +02:00 |
|
Joakim Hove
|
f516cc6833
|
Added default value to Parser. Rewrote the ParserIntItem::scan() method to use homemade C-sscanf obscurity from h..l
|
2013-05-09 14:18:36 +02:00 |
|
Joakim Hove
|
c963c7d768
|
Changed to use only enum for ItemSize. FIXED -> SCALAR with value 1
|
2013-05-09 12:17:00 +02:00 |
|
Joakim Hove
|
6f86bebf78
|
Removed ParserItemSize class; will just use plain enum
|
2013-05-09 12:16:15 +02:00 |
|
Joakim Hove
|
7dbc4f0d2b
|
Added size() method on DeckIntItem
|
2013-05-09 12:14:52 +02:00 |
|
Kristian Flikka
|
a874d667db
|
Added some tests
|
2013-05-08 15:50:20 +02:00 |
|
Kristian Flikka
|
2a331e1a3a
|
ParserIntItem's scan function now supports ITEM_FIXED parsing
|
2013-05-08 15:29:58 +02:00 |
|
Kristian Flikka
|
2088c3e96d
|
Simple scan implementation in ParserIntItem added. DeckIntItem now support push_back
|
2013-05-08 14:31:20 +02:00 |
|
Kristian Flikka
|
2d6e6842d6
|
Changed ParserItem from template based to a base-inheritance based system. Corresponds to and creates DeckItem objects
|
2013-05-07 21:55:49 +02:00 |
|