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, thofmann/clips-executive-exog-actions has been updated to fe3ba2a9d6805bed801a52848061eaf8ac2ae6ee (commit) via a6bce362c09c8065a8df06cdd65d72f33594eb5c (commit) from c7377326ecc199de24aab7826123996c4cbd040e (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-exog-actions 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 a6bce362c09c8065a8df06cdd65d72f33594eb5c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sat Apr 21 18:42:12 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sat Apr 21 18:42:12 2018 +0200 clips-pddl-parser: also parse disjunctive preconditions http://git.fawkesrobotics.org/fawkes.git/commit/a6bce36 http://trac.fawkesrobotics.org/changeset/a6bce36 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit fe3ba2a9d6805bed801a52848061eaf8ac2ae6ee Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sat Apr 21 18:43:24 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sat Apr 21 18:43:24 2018 +0200 lib pddl parser: mention disjunctions in the documentation We don't actually need to add any code to support disjunctions in the parser, but mention it in the documentation. http://git.fawkesrobotics.org/fawkes.git/commit/fe3ba2a http://trac.fawkesrobotics.org/changeset/fe3ba2a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/libs/pddl_parser/pddl_ast.h | 2 +- .../clips-pddl-parser/precondition_visitor.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* a6bce362c09c8065a8df06cdd65d72f33594eb5c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sat Apr 21 18:42:12 2018 +0200 Subject: clips-pddl-parser: also parse disjunctive preconditions .../clips-pddl-parser/precondition_visitor.cpp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-pddl-parser/precondition_visitor.cpp b/src/plugins/clips-pddl-parser/precondition_visitor.cpp index 29ea91d..6fb7f54 100644 --- a/src/plugins/clips-pddl-parser/precondition_visitor.cpp +++ b/src/plugins/clips-pddl-parser/precondition_visitor.cpp @@ -67,10 +67,12 @@ PreconditionToCLIPSFactVisitor::operator()(Predicate &p) const { stringstream namestream; namestream << parent_ << sub_counter_; string name = namestream.str(); - if (p.function == "and" || p.function == "not") { + if (p.function == "and" || p.function == "not" || p.function == "or") { string type; if (p.function == "and") { type = "conjunction"; + } else if (p.function == "or") { + type = "disjunction"; } else if (p.function == "not") { type = "negation"; } - *commit* fe3ba2a9d6805bed801a52848061eaf8ac2ae6ee - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sat Apr 21 18:43:24 2018 +0200 Subject: lib pddl parser: mention disjunctions in the documentation src/libs/pddl_parser/pddl_ast.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/libs/pddl_parser/pddl_ast.h b/src/libs/pddl_parser/pddl_ast.h index 56087ee..3ead9fd 100644 --- a/src/libs/pddl_parser/pddl_ast.h +++ b/src/libs/pddl_parser/pddl_ast.h @@ -59,7 +59,7 @@ namespace pddl_parser { struct Predicate { /** The name of the predicate for atomic formulae, 'and' for a conjunction, - * 'not' for a negation. + * 'or' for a disjunction, 'not' for a negation. */ Atom function; /** The arguments of the predicate or the subformulae of the compound -- 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
