patrick
/
plasp
Archived
1
0
Fork 0
Commit Graph

262 Commits

Author SHA1 Message Date
Patrick Lühne fd5416c94e Removed template from LogStream. 2016-06-14 16:09:47 +02:00
Patrick Lühne 48137ec24d Fixed an issue with gcc 5. 2016-06-14 15:59:16 +02:00
Patrick Lühne febef4bed4 Made output and error streams members of the logger. 2016-06-14 15:56:35 +02:00
Patrick Lühne b599670572 Added LogStream class for uniform color output handling. 2016-06-14 15:53:53 +02:00
Patrick Lühne 57e9de6b05 Renamed method to »logWarning.« 2016-06-14 15:12:45 +02:00
Patrick Lühne 9679706a08 Removed ParserWarning class. 2016-06-14 15:09:39 +02:00
Patrick Lühne 777c9839a1 Removed error message prefixes. 2016-06-14 15:06:43 +02:00
Patrick Lühne fd77b65226 Merge branch 'master' of github.com:potassco/plasp into colored-output 2016-06-14 14:59:23 +02:00
Patrick Lühne 39a32a6e0a Handling untyped variables correctly in the PDDL translator. 2016-06-14 13:21:41 +02:00
Patrick Lühne 342a346fce Started implementing colored output. 2016-06-14 12:47:39 +02:00
Patrick Lühne e0dd9833a3 Made unsupported expressions a separate type for disambiguation to fix issues with unsupported features. 2016-06-14 01:31:22 +02:00
Patrick Lühne 22f294493e Removed bloated translation feature support checks and replaced them with inline ones. 2016-06-13 19:20:00 +02:00
Patrick Lühne 5d3496fa41 Fixed missing assignment of member variable in At expression parser. 2016-06-13 19:19:17 +02:00
Patrick Lühne 4b500e4bf6 Implemented At expressions. 2016-06-13 19:02:15 +02:00
Patrick Lühne 5c3ea28e48 Added command-line option for treating warnings as errors or completely ignoring them. 2016-06-13 14:45:31 +02:00
Patrick Lühne fdbcb261df Avoiding empty arguments in n-ary expressions. 2016-06-13 14:04:12 +02:00
Patrick Lühne 23f6f9b26b Added translation of a PDDL problem’s goal. 2016-06-13 03:19:24 +02:00
Patrick Lühne e9c464b319 Added translation of a PDDL problem’s initial state. 2016-06-13 02:59:43 +02:00
Patrick Lühne d3dc9101dd Added translation of objects in PDDL problems. 2016-06-13 02:48:16 +02:00
Patrick Lühne e2b8fd2880 Added translation for preconditions of PDDL actions. 2016-06-13 02:38:56 +02:00
Patrick Lühne 680206b40b Removed Reference expressions. 2016-06-13 01:38:56 +02:00
Patrick Lühne 1c8af793c2 Made PDDL action preconditions and effects optional. 2016-06-12 23:51:45 +02:00
Patrick Lühne 0756d63769 Put translation of PDDL variable lists into separate method. 2016-06-12 22:55:35 +02:00
Patrick Lühne 87ca54a253 Translating names of PDDL actions. 2016-06-12 22:47:39 +02:00
Patrick Lühne 9c2f49e4a0 Put PDDL translation sections into separate methods. 2016-06-12 22:39:04 +02:00
Patrick Lühne 49002ac52d Made output stream a member of the SAS translator for convenience. 2016-06-12 22:35:31 +02:00
Patrick Lühne b70e62ff3b Made output stream a member of the PDDL translator for convenience. 2016-06-12 22:31:31 +02:00
Patrick Lühne 639b7646c9 Making sure that PDDL predicates contain only primitive types for the time being. 2016-06-12 22:19:55 +02:00
Patrick Lühne 979d9509c1 Added function for escaping ASP variables. 2016-06-12 22:12:43 +02:00
Patrick Lühne e9d48bcb7d Removing visitor pattern and replacing it with CRTP. 2016-06-12 22:12:09 +02:00
Patrick Lühne 8f0f4bfa65 Implemented translation of PDDL domain types. 2016-06-10 17:40:32 +02:00
Patrick Lühne da71d4947b Added method for checking whether PDDL description contains problem. 2016-06-10 17:26:36 +02:00
Patrick Lühne 6a83147ac0 Moved TranslatorException class to utils directory. 2016-06-10 17:21:56 +02:00
Patrick Lühne 9f0e784a4a Implemented recognition of comments in PDDL. 2016-06-10 16:40:43 +02:00
Patrick Lühne 2e1a011dcf Implemented automatic language detection for plasp application. 2016-06-10 01:23:41 +02:00
Patrick Lühne 8bb25e9b90 Implemented construction of SAS and PDDL Descriptions from Parser object. 2016-06-10 00:46:40 +02:00
Patrick Lühne 85444f235b Parsing goal section of PDDL problem specifications. 2016-06-09 22:54:39 +02:00
Patrick Lühne d138e869fc Fixed further white space issue with empty n-ary predicates. 2016-06-09 18:46:06 +02:00
Patrick Lühne 9506dcb31e Refactored parsing of expressions, all classes parse from opening to closing parenthesis now. 2016-06-09 17:51:10 +02:00
Patrick Lühne 04aac10f1d Allowing empty and expressions for compatibility and added a warning if used. 2016-06-09 15:56:14 +02:00
Patrick Lühne bbb6379907 Added goal-utilities requirement with a warning if used for compatibility. 2016-06-09 15:52:57 +02:00
Patrick Lühne 26d7e216a6 Fixed issue with invalid suffixes on section names. 2016-06-09 15:33:09 +02:00
Patrick Lühne 87889f5efe Implemented two-pass parsing for PDDL problems. 2016-06-09 14:39:03 +02:00
Patrick Lühne 8428c20bd4 Parsing domains in two passes and continued working on parsing the initial state. 2016-06-09 01:25:18 +02:00
Patrick Lühne d23ec14e9d Started testing PDDL problem parsing for a Blocks World problem. 2016-06-08 13:52:36 +02:00
Patrick Lühne ad23c89266 Refactored PDDL tests. 2016-06-08 13:41:17 +02:00
Patrick Lühne 75e51c856e Implemented early checking for typing requirement in Variables and Constants. 2016-06-08 12:51:39 +02:00
Patrick Lühne e60af33f75 Added functions for checking PDDL requirements. 2016-06-08 12:22:31 +02:00
Patrick Lühne 993d14d409 Implemented type requirement checking for problem objects. 2016-06-08 01:51:45 +02:00
Patrick Lühne 42559fd601 Minor refactoring removing unnecessary temporary variable. 2016-06-08 01:31:14 +02:00
Patrick Lühne 069ad4ca99 To-dos and formatting. 2016-06-08 01:19:49 +02:00
Patrick Lühne 8db4b5a53e Implemented constant type checking. 2016-06-08 01:14:39 +02:00
Patrick Lühne 9b3f78559e Implemented primitive type declaration check. 2016-06-08 01:08:22 +02:00
Patrick Lühne 7bd2782fc8 Implemented variable type requirement checking. 2016-06-08 01:05:36 +02:00
Patrick Lühne af2f9290c6 Removed obsolete functionality. 2016-06-08 00:36:48 +02:00
Patrick Lühne 31fb8ba79b Started parsing in a two-pass approach. 2016-06-08 00:34:59 +02:00
Patrick Lühne ee9626e4d2 Made the section skipping function a proper function. 2016-06-08 00:14:43 +02:00
Patrick Lühne 9360f4295a Extracted function for skipping entire sections. 2016-06-08 00:13:53 +02:00
Patrick Lühne 69ff84eecc Added efficient probing functions to Parser. 2016-06-08 00:02:40 +02:00
Patrick Lühne eea3272c56 Made Parser seekable for easier maintenance. 2016-06-07 18:41:01 +02:00
Patrick Lühne 27e76fc035 Added check that typing requirement is not added by PDDL problem. 2016-06-07 16:34:15 +02:00
Patrick Lühne 4228ca01dc Implemented multi-file input. 2016-06-07 15:54:01 +02:00
Patrick Lühne c489c7fd5a Added tests for PDDL actions. 2016-06-07 14:00:29 +02:00
Patrick Lühne b612122180 Refactoring to make parsing expressions consistent across PDDL domains and problems. 2016-06-07 13:26:19 +02:00
Patrick Lühne d5fa00a4a4 Started parsing initial state and object sections. 2016-06-06 15:18:06 +02:00
Patrick Lühne e607ca4e8e Refactored PDDL parser to make all input case-insensitive. 2016-06-04 18:28:43 +02:00
Patrick Lühne 0e739755b7 Making References transparent by forwarding visitors to their referee. 2016-06-04 18:08:34 +02:00
Patrick Lühne f8eab1cbb6 Removed unnecessary includes. 2016-06-04 18:07:57 +02:00
Patrick Lühne e481732fae Started implementation of PDDL problem parser. 2016-06-04 17:53:42 +02:00
Patrick Lühne 2870bc6434 Made section identifier parsing case-insensitive. 2016-06-04 17:47:41 +02:00
Patrick Lühne 21af7e9983 Removed unnecessary include. 2016-06-04 17:22:57 +02:00
Patrick Lühne 4ae37603f4 Added support for Imply expression. 2016-06-04 17:20:25 +02:00
Patrick Lühne 30b4a1f614 Made include guards consistent. 2016-06-04 17:10:50 +02:00
Patrick Lühne 2797b58646 Added missing ParserWarning file. 2016-06-04 16:45:14 +02:00
Patrick Lühne 837612bb8d Made type warnings non-fatal by default. 2016-06-04 16:42:41 +02:00
Patrick Lühne 813fecbf15 Removed now unnecessary Parser function arguments. 2016-06-04 16:24:10 +02:00
Patrick Lühne a776fc9e06 Put Parser into Context. 2016-06-04 16:10:11 +02:00
Patrick Lühne 08eb14e400 Made section parsing function names consistent. 2016-06-04 15:07:18 +02:00
Patrick Lühne 60c072a2b3 Clean-up. 2016-06-04 15:06:04 +02:00
Patrick Lühne feedb95295 Turned exception about undeclared types into a consistency warning. 2016-06-04 15:04:18 +02:00
Patrick Lühne c93661f44e Finished refactoring of expressions. 2016-06-04 14:46:05 +02:00
Patrick Lühne daa063c338 Big refactoring (build still broken). 2016-06-03 17:12:39 +02:00
Patrick Lühne 5abf1f8a84 Removed obsolete Variable class. 2016-06-03 13:37:23 +02:00
Patrick Lühne 133aa051eb Shortened Expression class names. 2016-06-03 13:33:05 +02:00
Patrick Lühne d334b4150b Started refactoring Variables as expressions. 2016-06-03 13:21:02 +02:00
Patrick Lühne fcde9c9b6b Finished basic support for action parsing. 2016-06-02 22:31:02 +02:00
Patrick Lühne fb5a5a71a5 Removed unnecessary include. 2016-06-02 21:56:40 +02:00
Patrick Lühne 8134c6af80 Started parsing action effects. 2016-06-02 21:53:10 +02:00
Patrick Lühne 7271a5e52b Implemented predicate expressions. 2016-06-02 18:31:47 +02:00
Patrick Lühne 7baf15d9f0 Implemented And expressions. 2016-06-02 17:35:01 +02:00
Patrick Lühne d070b5be9e Added expression visitor base class. 2016-06-02 16:29:17 +02:00
Patrick Lühne a07019801c Refactored expressions to inherit from base class. 2016-06-02 16:28:08 +02:00
Patrick Lühne 97ab22461c Started implementing parsing of action preconditions. 2016-06-02 16:06:11 +02:00
Patrick Lühne 0a4541a401 Put parsing of typed variables into Variables class. 2016-06-01 17:20:34 +02:00
Patrick Lühne 79773ba634 Removed unnecessary include. 2016-06-01 17:06:23 +02:00
Patrick Lühne b249e1cbf8 Put generic Type parsing in separate function. 2016-06-01 17:02:35 +02:00
Patrick Lühne 25cf7c8ae8 Implemented parsing of PDDL constants. 2016-06-01 16:47:34 +02:00
Patrick Lühne 3c97ced486 Implemented predicate parsing and refactored context storage. 2016-06-01 14:11:13 +02:00
Patrick Lühne 44482ae438 Renamed TypePrimitive to PrimitiveType and made Type hash map contain PrimitiveTypes only. 2016-06-01 01:54:43 +02:00
Patrick Lühne f597b3ab80 Moved include to the right location. 2016-06-01 01:32:49 +02:00
Patrick Lühne ced1fd0038 Started refactoring Types with variants. 2016-06-01 01:29:46 +02:00
Patrick Lühne 2654a6ff23 Started implementing predicate parsing. 2016-05-31 16:43:25 +02:00
Patrick Lühne 5f763e90fc Refactored Requirement to be a proper class. 2016-05-31 14:11:21 +02:00
Patrick Lühne cf1c66a085 Refactored interface for parsing Types. 2016-05-31 14:01:18 +02:00
Patrick Lühne 1395b62e60 Added checks that used types are correctly declared previously. 2016-05-31 13:50:30 +02:00
Patrick Lühne 85da5024ea Refactored type parsing. 2016-05-31 01:06:57 +02:00
Patrick Lühne a989f5f86e Started implementing PDDL type parsing. 2016-05-30 20:43:36 +02:00
Patrick Lühne d26ff2df77 Implemented computation of derived requirements. 2016-05-30 15:44:13 +02:00
Patrick Lühne 5c37026ec7 Parsing PDDL requirements. 2016-05-30 15:06:04 +02:00
Patrick Lühne 8aa419b5c2 Implemented requirement parsing. 2016-05-30 14:34:17 +02:00
Patrick Lühne c191b418f2 Added PDDL requirements enum. 2016-05-30 13:36:47 +02:00
Patrick Lühne 4d984d32c3 Refactoring of Parser class with std::istreambuf_iterator. 2016-05-30 12:54:56 +02:00
Patrick Lühne 67c9e2148d Started implementing PDDL domain parser. 2016-05-29 16:55:43 +02:00
Patrick Lühne 42fda5925d Simplified Parser interface. 2016-05-29 15:08:10 +02:00
Patrick Lühne 2c564f47d3 Refactored predicate argument parsing. 2016-05-28 14:21:05 +02:00
Patrick Lühne f81fd1a1b4 Introduced alias for parser’s underlying character type. 2016-05-27 19:25:59 +02:00
Patrick Lühne a1b334a302 Made Parser constructor explicit. 2016-05-27 19:08:31 +02:00
Patrick Lühne ff420fbe57 Minor formatting. 2016-05-27 18:39:43 +02:00
Patrick Lühne 07eb23b312 Refactored basic parsing. 2016-05-27 03:58:59 +02:00
Patrick Lühne 8eb0a4847f Refactoring of TranslatorASP class. 2016-05-26 12:59:18 +02:00
Patrick Lühne 045239b620 Fixed wrong operator in debug output. 2016-05-25 23:22:25 +02:00
Patrick Lühne c6676e5a07 Made include guards plasp-specific to avoid potential naming conflicts. 2016-05-24 16:03:08 +02:00
Patrick Lühne bf6300f36b Made SAS translator output format contain less IDs. 2016-05-24 01:42:15 +02:00
Patrick Lühne 3a2dfd97b8 Added conditional effect support for SAS translator output. 2016-05-23 18:16:44 +02:00
Patrick Lühne 05058c149e Added axiom rule support for SAS translator output. 2016-05-23 17:13:11 +02:00
Patrick Lühne 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
Patrick Lühne 03ae0dc301 Changed SAS translator output format to be closer to the SAS representation. 2016-05-23 14:20:11 +02:00
Patrick Lühne d118788142 Parsing <none of those> values in SAS files. 2016-05-23 01:27:28 +02:00
Patrick Lühne 401c4069bd Enforcing variables to have exactly (and not at most) one value. 2016-05-23 01:02:45 +02:00
Patrick Lühne 5db8af9ffc Fixed meta encoding for sequential, incremental planning. 2016-05-23 00:24:48 +02:00
Patrick Lühne d8b87c7bfa Finished SAS-to-ASP translation with limited support. 2016-05-22 22:45:33 +02:00
Patrick Lühne d8d6998936 Escaping predicates containing hyphens for ASP output. 2016-05-22 20:19:45 +02:00
Patrick Lühne 4258dfcfd0 Added constraints derived from SAS variables to ASP output and fixed mutex group constraints. 2016-05-22 16:35:57 +02:00
Patrick Lühne 1e47173d17 Made Predicate a proper class. 2016-05-22 16:00:58 +02:00
Patrick Lühne 6677ded33e Made Effect a proper class. 2016-05-22 15:46:41 +02:00
Patrick Lühne 37af6d5127 Made AxiomRule a proper class. 2016-05-22 15:00:54 +02:00
Patrick Lühne 9fce86ffaf Made Operator constructor private. 2016-05-22 14:45:31 +02:00
Patrick Lühne 5a12953f34 Minor formatting. 2016-05-22 14:43:57 +02:00
Patrick Lühne c23ba5312b Outsourced debug output into a separate header. 2016-05-22 14:40:52 +02:00
Patrick Lühne 21237ecac7 Made Operator a proper class. 2016-05-22 14:35:53 +02:00
Patrick Lühne c13e3539f2 Introduced consistent aliases for vector types. 2016-05-22 14:24:38 +02:00
Patrick Lühne 90dfa302a9 Made Goal a proper class. 2016-05-22 14:04:58 +02:00
Patrick Lühne beef3aca60 Made InitialState a proper class. 2016-05-22 13:58:05 +02:00
Patrick Lühne c7c7a93eba Outsourced SAS value parsing. 2016-05-21 17:09:55 +02:00
Patrick Lühne d219ef0388 Removing trailing () at the end of 0-ary values for ASP output. 2016-05-21 16:27:30 +02:00
Patrick Lühne 273e310c60 Made Value a proper class. 2016-05-21 16:22:40 +02:00
Patrick Lühne 5e016d2d79 Made Variable a proper class. 2016-05-21 15:54:03 +02:00
Patrick Lühne bac8d5c842 Outsourced SAS variable parsing. 2016-05-21 15:45:01 +02:00
Patrick Lühne b2e4d3329a Added to-do. 2016-05-21 15:44:06 +02:00
Patrick Lühne 20c2af5f7d Implemented common function for parsing expected values. 2016-05-21 15:40:19 +02:00