Commit Graph

351 Commits

Author SHA1 Message Date
eb28ed3938 Implemented variable stack for parsing nested variable lists (as within quantified expressions). 2016-09-06 17:34:07 +02:00
f4f0e07bc1 Started supporting quantified expressions. 2016-09-06 16:57:31 +02:00
ca6664feb2 Refactored parsing variable lists to reuse it with quantified expressions. 2016-09-06 16:28:38 +02:00
6f3769f364 Removed unnecessary includes. 2016-09-05 17:05:48 +02:00
263b611a7b Implemented simplification of directly nested n-ary expressions of the same type. 2016-09-05 00:37:43 +02:00
79d449d0df Renaming to not confuse expression simplification and reduction. 2016-09-05 00:06:09 +02:00
dd621fcd5c Minor clean-up. 2016-09-04 23:54:15 +02:00
c2af84a800 Removed redundant normalization statement. 2016-09-04 23:52:06 +02:00
3fa7b93d44 Fixed wrong recursive call. 2016-09-04 23:34:20 +02:00
4d72c20d9b Added separate simplification step to normalize in a single recursion. 2016-09-04 23:30:08 +02:00
97ad4268d7 Added second double negation elimination step after normalizing the argument of a “not” expression. 2016-09-04 22:45:37 +02:00
ed2d64c1c9 Added debug printing function to facilitate testing expression normalization. 2016-09-04 22:26:17 +02:00
c9ecd0c020 Implemented De Morgan’s rules for normalization purposes. 2016-09-04 20:49:22 +02:00
6aaf7c039d Refactored normalization because of recent changes to the pointer usage. 2016-09-04 19:29:05 +02:00
7aa20a5820 Refactored expressions thanks to intrusive pointers. 2016-09-04 18:48:46 +02:00
9afabacde3 Switched to intrusive pointers for much easier maintenance. 2016-09-04 18:26:02 +02:00
da88a8816c Fixed issue with multiple negations. 2016-09-03 00:25:58 +02:00
63de1891af Fixed missing normalization step of arguments to imply statements and extended test to cover the issue. 2016-09-02 19:25:25 +02:00
23e851ccef Normalizing problems’ goal descriptions. 2016-09-02 18:49:30 +02:00
4fb2c331f3 Added dummy expression to check that with removed double negations, expressions are still correctly normalized. 2016-09-02 18:32:13 +02:00
1a96c3ec72 Added test covering removal of double negations. 2016-09-02 18:27:00 +02:00
b084a1f727 Implemented removal of double negations. 2016-09-02 18:07:37 +02:00
56ce55677f Started implementing PDDL normalization. 2016-09-02 17:58:00 +02:00
c528626fe9 Preparing more general form of PDDL normalization. 2016-09-02 16:39:42 +02:00
be376a9ffb Hiding mutex group section in output if there are none. 2016-08-30 13:02:00 +02:00
76f8df13fc Fixed parsing issue with unexpected whitespaces in SAS files. 2016-08-30 13:01:22 +02:00
568945c7a8 Fixed incorrect output format of conditional effects with SAS. 2016-08-26 15:50:39 +02:00
e312740629 Fixed syntax error in output. 2016-08-18 14:39:40 +02:00
31d0a1fb38 Turned exception about unspecified requirements into a warning, now also for problems. 2016-08-18 14:30:47 +02:00
ca30f8a815 Turned exception about unspecified requirements into a warning. 2016-08-18 14:29:17 +02:00
21c337e0fa Removed now obsolete ASP variable handling for PDDL. 2016-08-18 00:25:47 +02:00
8251652445 Implemented parameter name normalization for PDDL to avoid escaping the names. 2016-08-18 00:24:10 +02:00
5e28dd046b Further simplified the output of the PDDL variable value facts. 2016-08-18 00:00:50 +02:00
363070b579 Replaced the two rules for the values of a PDDL variable with a single one. 2016-08-17 23:31:31 +02:00
7bd483cd7e Added rule to PDDL translator output to make all unspecified initial state variables false by default. 2016-08-17 19:02:51 +02:00
91019f52aa Fixed issue with unsupported expression negations. 2016-08-16 18:58:30 +02:00
69a26cb22f Fixed undetected issue with unsupported negations. 2016-08-16 18:43:37 +02:00
cdb06fa5bf Improved output format and highlighting. 2016-08-16 18:35:55 +02:00
b8a3019e5b Made unconditional effects a keyword. 2016-08-15 16:59:28 +02:00
ef57f27c6a Changed output format of axiom rules for consistency. 2016-08-15 16:33:33 +02:00
08113c961a Continuously incrementing effect IDs, with a special identifier for unconditional effects. 2016-08-14 17:21:41 +02:00
bdb6ac9fba Changed output format of axiom rules. 2016-08-14 16:02:28 +02:00
4037b339e4 Changed keyword for conditions of conditional effects. 2016-08-14 15:14:13 +02:00
0fb282d153 Changed output format of feature requirements. 2016-08-14 14:55:46 +02:00
c391a1f566 Removed unwanted newline in SAS output. 2016-08-13 18:44:18 +02:00
4fc7355fba Removed unwanted newline. 2016-08-13 13:21:00 +02:00
340db244f6 Fixed bug in output format. 2016-08-13 04:04:28 +02:00
8969364f73 Fixed syntax error in output format. 2016-08-13 03:27:37 +02:00
b67168134b Made initial state definition consistent with unified output format. 2016-08-13 03:22:25 +02:00
97d33da686 Added effect ID as a placeholder (for conditional effects) for consistency with unified output format. 2016-08-13 03:17:48 +02:00
1f35bda3d2 Wrapped translated PDDL action definitions for usability in meta encodings. 2016-08-13 03:11:38 +02:00
6960e8a8c7 Wrapped translated PDDL constant definitions for usability in meta encodings. 2016-08-13 03:09:14 +02:00
b30cecd297 Turning translated PDDL predicates into unified variable format in rest of output format. 2016-08-13 03:08:05 +02:00
99fc6988a3 Renamed heading to »variables«. 2016-08-13 02:50:07 +02:00
cf022f9959 Started turning translated PDDL predicates into unified variable format. 2016-08-13 02:48:30 +02:00
0a1044743e Renamed meta predicate for simplicity. 2016-08-13 02:33:28 +02:00
94b204615b Wrapped translated PDDL type definitions for usability in meta encodings. 2016-08-13 02:32:27 +02:00
230c6dfc15 Made order of sections of translated SAS more uniform with PDDL. 2016-08-13 02:29:48 +02:00
378b2ae673 Wrapped translated SAS axiom rule definitions for usability in meta encodings. 2016-08-13 01:44:45 +02:00
36e517bd80 Wrapped translated SAS mutex group definitions for usability in meta encodings. 2016-08-13 01:42:18 +02:00
569b3d0c97 Wrapped translated SAS action definitions for usability in meta encodings. 2016-08-13 01:40:31 +02:00
daf68d24ab Added highlighting of variable names. 2016-08-13 01:39:49 +02:00
8a82f52100 Wrapped translated SAS variable definitions for usability in meta encodings. 2016-08-13 01:36:08 +02:00
544d4e0635 Major refactoring of underlying Parser class. 2016-08-02 20:33:49 +02:00
73c9d6c1f3 Checking that Parser initially is case-sensitive. 2016-06-22 09:14:01 +01:00
234938349c Fixed incorrect seek positions. 2016-06-22 08:59:18 +01:00
9ed7277ec9 Fixed minor formatting issue with axiom rules. 2016-06-22 08:45:48 +01:00
d3039d55e5 Fixed typo in PDDL translation output. 2016-06-14 19:21:27 +02:00
3d661cd1f4 Fixed unescaped ASP identifier. 2016-06-14 18:53:50 +02:00
52fee6a4c1 Made the language command-line option lowercase for consistency. 2016-06-14 18:42:29 +02:00
eb3d91f085 Added command-line option to autodetect, enable, or disable color output. 2016-06-14 18:02:59 +02:00
aff396d919 Colorizing numbers in translated SAS output. 2016-06-14 17:41:41 +02:00
f7cd24b67a Colorized output for SAS translator. 2016-06-14 17:35:32 +02:00
1e21457efb Refactored color output of headings. 2016-06-14 17:11:45 +02:00
9969281b11 Refactored color output of variables and keywords. 2016-06-14 17:05:41 +02:00
6fec1cc409 Made all error and warning messages lowercase consistently. 2016-06-14 16:53:48 +02:00
2984da773d Fixed errors with gcc. 2016-06-14 16:47:11 +02:00
1b83708a6d Colorized PDDL translator output. 2016-06-14 16:38:41 +02:00
0de2489440 Using LogStreams in the PDDL translator. 2016-06-14 16:14:39 +02:00
fd5416c94e Removed template from LogStream. 2016-06-14 16:09:47 +02:00
febef4bed4 Made output and error streams members of the logger. 2016-06-14 15:56:35 +02:00
b599670572 Added LogStream class for uniform color output handling. 2016-06-14 15:53:53 +02:00
57e9de6b05 Renamed method to »logWarning.« 2016-06-14 15:12:45 +02:00
9679706a08 Removed ParserWarning class. 2016-06-14 15:09:39 +02:00
777c9839a1 Removed error message prefixes. 2016-06-14 15:06:43 +02:00
a6c9434590 Fixed missing error message prefix. 2016-06-14 15:00:56 +02:00
fd77b65226 Merge branch 'master' of github.com:potassco/plasp into colored-output 2016-06-14 14:59:23 +02:00
a7cf696357 Minor formatting. 2016-06-14 14:18:38 +02:00
94d448d438 Minor formatting. 2016-06-14 14:05:38 +02:00
c62f3f88f1 Handling untyped variables as variables of type »object« in PDDL translator for simplicity. 2016-06-14 13:53:09 +02:00
39a32a6e0a Handling untyped variables correctly in the PDDL translator. 2016-06-14 13:21:41 +02:00
342a346fce Started implementing colored output. 2016-06-14 12:47:39 +02:00
e0dd9833a3 Made unsupported expressions a separate type for disambiguation to fix issues with unsupported features. 2016-06-14 01:31:22 +02:00
22f294493e Removed bloated translation feature support checks and replaced them with inline ones. 2016-06-13 19:20:00 +02:00
4b500e4bf6 Implemented At expressions. 2016-06-13 19:02:15 +02:00
da85e5dd9b Checking whether variables have types before accessing them in the PDDL translator. 2016-06-13 16:37:35 +02:00
2b55d156ae Fixed performance issue caused by skipping over unsupported sections multiple times. 2016-06-13 16:17:55 +02:00
5c3ea28e48 Added command-line option for treating warnings as errors or completely ignoring them. 2016-06-13 14:45:31 +02:00
2c3481d027 Initializing PDDL problem description only if available. 2016-06-13 13:37:18 +02:00
421125fee6 Escaping PDDL identifiers for use with ASP. 2016-06-13 03:31:41 +02:00