Commit Graph

334 Commits

Author SHA1 Message Date
31fb8ba79b Started parsing in a two-pass approach. 2016-06-08 00:34:59 +02:00
9360f4295a Extracted function for skipping entire sections. 2016-06-08 00:13:53 +02:00
69ff84eecc Added efficient probing functions to Parser. 2016-06-08 00:02:40 +02:00
eea3272c56 Made Parser seekable for easier maintenance. 2016-06-07 18:41:01 +02:00
27e76fc035 Added check that typing requirement is not added by PDDL problem. 2016-06-07 16:34:15 +02:00
188165bc4d Added fix for gcc. 2016-06-07 16:14:35 +02:00
e6ddad5960 Checking that all variables in predicates have types if and only if typing is enabled. 2016-06-07 16:11:12 +02:00
4228ca01dc Implemented multi-file input. 2016-06-07 15:54:01 +02:00
c489c7fd5a Added tests for PDDL actions. 2016-06-07 14:00:29 +02:00
b612122180 Refactoring to make parsing expressions consistent across PDDL domains and problems. 2016-06-07 13:26:19 +02:00
d5fa00a4a4 Started parsing initial state and object sections. 2016-06-06 15:18:06 +02:00
e607ca4e8e Refactored PDDL parser to make all input case-insensitive. 2016-06-04 18:28:43 +02:00
d64c68f754 Improved error message. 2016-06-04 18:21:42 +02:00
e5bf7d754f Refactored expression parsing. 2016-06-04 18:12:41 +02:00
f8eab1cbb6 Removed unnecessary includes. 2016-06-04 18:07:57 +02:00
0f2c81f894 Added to-dos. 2016-06-04 17:55:17 +02:00
e481732fae Started implementation of PDDL problem parser. 2016-06-04 17:53:42 +02:00
ee597c805e Added to-do. 2016-06-04 17:52:37 +02:00
e561c55f73 Made Action section parsing case-insensitive. 2016-06-04 17:51:21 +02:00
2870bc6434 Made section identifier parsing case-insensitive. 2016-06-04 17:47:41 +02:00
7e60631840 Refactored Requirement parsing. 2016-06-04 17:47:01 +02:00
f2a1528ea9 Fixed determination of default requirement (STRIPS). 2016-06-04 17:28:52 +02:00
4ae37603f4 Added support for Imply expression. 2016-06-04 17:20:25 +02:00
837612bb8d Made type warnings non-fatal by default. 2016-06-04 16:42:41 +02:00
813fecbf15 Removed now unnecessary Parser function arguments. 2016-06-04 16:24:10 +02:00
a776fc9e06 Put Parser into Context. 2016-06-04 16:10:11 +02:00
08eb14e400 Made section parsing function names consistent. 2016-06-04 15:07:18 +02:00
60c072a2b3 Clean-up. 2016-06-04 15:06:04 +02:00
feedb95295 Turned exception about undeclared types into a consistency warning. 2016-06-04 15:04:18 +02:00
c93661f44e Finished refactoring of expressions. 2016-06-04 14:46:05 +02:00
daa063c338 Big refactoring (build still broken). 2016-06-03 17:12:39 +02:00
5abf1f8a84 Removed obsolete Variable class. 2016-06-03 13:37:23 +02:00
133aa051eb Shortened Expression class names. 2016-06-03 13:33:05 +02:00
d334b4150b Started refactoring Variables as expressions. 2016-06-03 13:21:02 +02:00
50315f5fae Relaxing white space requirements. 2016-06-02 23:41:40 +02:00
8817a3f226 Fixed whitespace parsing issue. 2016-06-02 22:47:25 +02:00
fcde9c9b6b Finished basic support for action parsing. 2016-06-02 22:31:02 +02:00
8134c6af80 Started parsing action effects. 2016-06-02 21:53:10 +02:00
7271a5e52b Implemented predicate expressions. 2016-06-02 18:31:47 +02:00
7baf15d9f0 Implemented And expressions. 2016-06-02 17:35:01 +02:00
a07019801c Refactored expressions to inherit from base class. 2016-06-02 16:28:08 +02:00
97ab22461c Started implementing parsing of action preconditions. 2016-06-02 16:06:11 +02:00
7e4a05e1db Assuming parent types to be declared properly. 2016-06-01 18:09:40 +02:00
0a4541a401 Put parsing of typed variables into Variables class. 2016-06-01 17:20:34 +02:00
b249e1cbf8 Put generic Type parsing in separate function. 2016-06-01 17:02:35 +02:00
25cf7c8ae8 Implemented parsing of PDDL constants. 2016-06-01 16:47:34 +02:00
3c97ced486 Implemented predicate parsing and refactored context storage. 2016-06-01 14:11:13 +02:00
44482ae438 Renamed TypePrimitive to PrimitiveType and made Type hash map contain PrimitiveTypes only. 2016-06-01 01:54:43 +02:00
b8223b42bd Removed unnecessary include. 2016-06-01 01:31:14 +02:00
ced1fd0038 Started refactoring Types with variants. 2016-06-01 01:29:46 +02:00
2654a6ff23 Started implementing predicate parsing. 2016-05-31 16:43:25 +02:00
5f763e90fc Refactored Requirement to be a proper class. 2016-05-31 14:11:21 +02:00
cf1c66a085 Refactored interface for parsing Types. 2016-05-31 14:01:18 +02:00
1395b62e60 Added checks that used types are correctly declared previously. 2016-05-31 13:50:30 +02:00
85da5024ea Refactored type parsing. 2016-05-31 01:06:57 +02:00
a989f5f86e Started implementing PDDL type parsing. 2016-05-30 20:43:36 +02:00
d26ff2df77 Implemented computation of derived requirements. 2016-05-30 15:44:13 +02:00
5c37026ec7 Parsing PDDL requirements. 2016-05-30 15:06:04 +02:00
8aa419b5c2 Implemented requirement parsing. 2016-05-30 14:34:17 +02:00
0eb2714c9e Removed incorrect parentheses check. 2016-05-30 13:22:17 +02:00
0b33ac0e7d Minor formatting. 2016-05-30 13:06:10 +02:00
f55e366b17 Removed unnecessary statement. 2016-05-30 13:03:18 +02:00
4d984d32c3 Refactoring of Parser class with std::istreambuf_iterator. 2016-05-30 12:54:56 +02:00
40547691a0 Started implementing PDDL domain parser. 2016-05-30 12:51:00 +02:00
42fda5925d Simplified Parser interface. 2016-05-29 15:08:10 +02:00
2c564f47d3 Refactored predicate argument parsing. 2016-05-28 14:21:05 +02:00
f81fd1a1b4 Introduced alias for parser’s underlying character type. 2016-05-27 19:25:59 +02:00
07eb23b312 Refactored basic parsing. 2016-05-27 03:58:59 +02:00
8eb0a4847f Refactoring of TranslatorASP class. 2016-05-26 12:59:18 +02:00
045239b620 Fixed wrong operator in debug output. 2016-05-25 23:22:25 +02:00
082235eaaf Minor refactoring. 2016-05-24 16:31:05 +02:00
ee0b446230 Showing action cost predicates unconditionally for easier handling in meta encodings. 2016-05-24 01:54:57 +02:00
ac354d512c Treating <none of those> as a normal value in SAS translator output. 2016-05-24 01:48:59 +02:00
bf6300f36b Made SAS translator output format contain less IDs. 2016-05-24 01:42:15 +02:00
3a2dfd97b8 Added conditional effect support for SAS translator output. 2016-05-23 18:16:44 +02:00
bc5f8edb67 Hiding action cost output if feature not required. 2016-05-23 17:15:22 +02:00
05058c149e Added axiom rule support for SAS translator output. 2016-05-23 17:13:11 +02:00
a5fd698888 Added action costs support for SAS translator output. 2016-05-23 16:57:12 +02:00
4c6c739060 Changed SAS translator output format once more to make it even closer to the SAS format. 2016-05-23 16:28:06 +02:00
02a5b11884 Switching SAS translator output format to multi-valued variable representation. 2016-05-23 15:36:23 +02:00
6e37721243 Minor formatting. 2016-05-23 14:24:00 +02:00
0724963c32 Removed fluents section (to be derived from variables instead). 2016-05-23 14:22:33 +02:00
03ae0dc301 Changed SAS translator output format to be closer to the SAS representation. 2016-05-23 14:20:11 +02:00
2ef710642b Fixed unescaped fluent names. 2016-05-23 02:03:52 +02:00
3ff20da97e Handling <none of those> values in ASP translator. 2016-05-23 01:53:42 +02:00
d118788142 Parsing <none of those> values in SAS files. 2016-05-23 01:27:28 +02:00
401c4069bd Enforcing variables to have exactly (and not at most) one value. 2016-05-23 01:02:45 +02:00
ea1dcef788 Reordered ASP output. 2016-05-23 00:25:13 +02:00
5db8af9ffc Fixed meta encoding for sequential, incremental planning. 2016-05-23 00:24:48 +02:00
d8b87c7bfa Finished SAS-to-ASP translation with limited support. 2016-05-22 22:45:33 +02:00
eed215871a Minor formatting. 2016-05-22 20:22:48 +02:00
1dd55715f1 Reordered ASP output. 2016-05-22 20:21:31 +02:00
d8d6998936 Escaping predicates containing hyphens for ASP output. 2016-05-22 20:19:45 +02:00
4258dfcfd0 Added constraints derived from SAS variables to ASP output and fixed mutex group constraints. 2016-05-22 16:35:57 +02:00
97eaff0535 Removed done to-do. 2016-05-22 16:04:22 +02:00
d9e5b5826b Added exception for currently unsupported action costs. 2016-05-22 16:03:37 +02:00
1e47173d17 Made Predicate a proper class. 2016-05-22 16:00:58 +02:00
6677ded33e Made Effect a proper class. 2016-05-22 15:46:41 +02:00
342672063e Minor formatting. 2016-05-22 15:04:23 +02:00
37af6d5127 Made AxiomRule a proper class. 2016-05-22 15:00:54 +02:00
d97b45ddcd Removed pointless comment. 2016-05-22 14:42:34 +02:00
c23ba5312b Outsourced debug output into a separate header. 2016-05-22 14:40:52 +02:00
21237ecac7 Made Operator a proper class. 2016-05-22 14:35:53 +02:00
c13e3539f2 Introduced consistent aliases for vector types. 2016-05-22 14:24:38 +02:00
90dfa302a9 Made Goal a proper class. 2016-05-22 14:04:58 +02:00
beef3aca60 Made InitialState a proper class. 2016-05-22 13:58:05 +02:00
c7c7a93eba Outsourced SAS value parsing. 2016-05-21 17:09:55 +02:00
d219ef0388 Removing trailing () at the end of 0-ary values for ASP output. 2016-05-21 16:27:30 +02:00
273e310c60 Made Value a proper class. 2016-05-21 16:22:40 +02:00
5e016d2d79 Made Variable a proper class. 2016-05-21 15:54:03 +02:00
bac8d5c842 Outsourced SAS variable parsing. 2016-05-21 15:45:01 +02:00
20c2af5f7d Implemented common function for parsing expected values. 2016-05-21 15:40:19 +02:00
081f0eb70f Moved parsing utilities to separate namespace. 2016-05-21 14:14:14 +02:00
1840b200d5 Added to-do. 2016-05-21 03:03:00 +02:00
cac555ea42 Correctly aggregating fluent names now. 2016-05-21 03:02:12 +02:00
17685b68fb Started implementing SAS to ASP translator. 2016-05-21 02:43:07 +02:00
57a64f3af9 Fixed output of 0-ary predicates. 2016-05-21 02:31:47 +02:00
6e36fc128e Implemented parsing the operator predicates. 2016-05-21 02:03:45 +02:00
15289a0c8c Implemented parsing the signs of values. 2016-05-21 01:17:17 +02:00
b09906495a Included missing header file. 2016-05-20 21:34:36 +02:00
fb04b5fb11 Added accessor for action costs usage. 2016-05-20 18:26:42 +02:00
b083d77ad4 Added accessors to parsed SAS information. 2016-05-20 18:18:30 +02:00
2d3760b774 Implemented SAS parsing directly from streams. 2016-05-20 18:02:52 +02:00
e899bd7aec Removed unintended debug output. 2016-05-20 17:05:49 +02:00
eee7a3da4d Minor formatting. 2016-05-20 17:03:56 +02:00
48bd3c77ad Handling further parser exceptions. 2016-05-20 17:01:48 +02:00
c61bdfd9f1 Unified parsing of Boolean variable. 2016-05-20 16:53:14 +02:00
8883613d18 Minor formatting. 2016-05-20 16:49:44 +02:00
440d90a28e Renamed parseVariableValue to parseValue. 2016-05-20 16:48:46 +02:00
44e7535e64 Simplified parsing of primitive types. 2016-05-20 16:45:15 +02:00
59661621cd Enhanced exception output for number parsing. 2016-05-20 16:26:24 +02:00
6d7954e661 Better handling of number parsing exceptions. 2016-05-20 16:20:51 +02:00
d7984e9b3a Moved exception catching from parser to application. 2016-05-20 16:16:56 +02:00
3ddf942a12 Initial commit. 2016-05-20 15:29:24 +02:00