Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/stn-generator-rebased has been updated to 230f677683868a9c064089dbc2c0d5589be3106b (commit) via 6076bc8f44abf24c64ccc7258ef82c6d2e979478 (commit) from b5d2db6b0748679d4e214b2ec9c63f01128d59f9 (commit) http://git.fawkesrobotics.org/fawkes.git/common/stn-generator-rebased Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit 6076bc8f44abf24c64ccc7258ef82c6d2e979478 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Oct 13 17:48:23 2017 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Oct 13 17:48:23 2017 +0200 pddl parser: also allow non-durative actions We just treat non-durative actions the same as we treat durative actions, i.e., an action can have a duration even though that's not part of the PDDL specs. http://git.fawkesrobotics.org/fawkes.git/commit/6076bc8 http://trac.fawkesrobotics.org/changeset/6076bc8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 230f677683868a9c064089dbc2c0d5589be3106b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Oct 13 17:49:59 2017 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Oct 13 17:52:39 2017 +0200 pddl parser: allow closing parenthesis in the domain Domains have a closing parenthesis at the end, which the parser did not support until now. To stay backwards compatible with old domains, make the closing parenthesis optional. http://git.fawkesrobotics.org/fawkes.git/commit/230f677 http://trac.fawkesrobotics.org/changeset/230f677 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/libs/pddl_parser/pddl_grammar.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 6076bc8f44abf24c64ccc7258ef82c6d2e979478 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Oct 13 17:48:23 2017 +0200 Subject: pddl parser: also allow non-durative actions src/libs/pddl_parser/pddl_grammar.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/libs/pddl_parser/pddl_grammar.h b/src/libs/pddl_parser/pddl_grammar.h index 851a884..ca8c7d9 100644 --- a/src/libs/pddl_parser/pddl_grammar.h +++ b/src/libs/pddl_parser/pddl_grammar.h @@ -75,7 +75,7 @@ namespace pddl_parser { duration = lit(":duration") >> '(' >> '=' >> lit("?duration") >> uint_ >> ')'; action_params = lit(":parameters") >> '(' >> +param_pair >> ')'; - action = '(' >> lit(":durative-action") + action = '(' >> (lit(":durative-action") | lit(":action")) >> name_type >> action_params >> -duration - *commit* 230f677683868a9c064089dbc2c0d5589be3106b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Oct 13 17:49:59 2017 +0200 Subject: pddl parser: allow closing parenthesis in the domain src/libs/pddl_parser/pddl_grammar.h | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/libs/pddl_parser/pddl_grammar.h b/src/libs/pddl_parser/pddl_grammar.h index ca8c7d9..b14894d 100644 --- a/src/libs/pddl_parser/pddl_grammar.h +++ b/src/libs/pddl_parser/pddl_grammar.h @@ -47,7 +47,7 @@ namespace pddl_parser { name_type = lexeme[ alnum >> *(alnum|char_('-')|char_('_')) ]; - domain_name = '(' >> lit("define") + domain_name = lit("define") >> '(' >> lit("domain") >> +(char_ - ')') >> ')'; requirements = '(' >> lit(":requirements") @@ -87,14 +87,15 @@ namespace pddl_parser { actions = +action; domain = - domain_name + '(' + >> domain_name >> requirements >> -types >> -constants >> predicates >> actions - // There should be a closing paranthes here, but parsing will - // fail if it is included + // make closing parenthesis optional to stay backwards compatible + >> -lit(")") ; } -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
