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-nonunique-action-ids has been updated to ddd314220879e32ab4e3fd58a302f663345594a7 (commit) from 6721a9095d76e5f50fc365ce2fa5c9bde90b608d (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-nonunique-action-ids 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 ddd314220879e32ab4e3fd58a302f663345594a7 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Mar 8 20:26:09 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 8 21:05:23 2018 +0100 clips-executive: fix test for nonunique action IDs The test expected unstack not to be executable, when in fact it was. The test is supposed to check that preconditions are properly matched to actions, even if actions have the same IDs but different goals/plans. Do the test with stack instead, as stack is in fact not executable in the given situation. http://git.fawkesrobotics.org/fawkes.git/commit/ddd3142 http://trac.fawkesrobotics.org/changeset/ddd3142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .../clips-executive/clips/tests/blocksworld.clp | 20 ++++++++++++++++++++ .../clips-executive/clips/tests/test_domain.cpp | 12 ++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* ddd314220879e32ab4e3fd58a302f663345594a7 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Mar 8 20:26:09 2018 +0100 Subject: clips-executive: fix test for nonunique action IDs .../clips-executive/clips/tests/blocksworld.clp | 20 ++++++++++++++++++++ .../clips-executive/clips/tests/test_domain.cpp | 12 ++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/tests/blocksworld.clp b/src/plugins/clips-executive/clips/tests/blocksworld.clp index 7b1915b..b31326e 100644 --- a/src/plugins/clips-executive/clips/tests/blocksworld.clp +++ b/src/plugins/clips-executive/clips/tests/blocksworld.clp @@ -51,6 +51,26 @@ (domain-effect (part-of unstack) (predicate on) (type NEGATIVE) (param-names x y)) + ; stack + (domain-operator (name stack)) + (domain-operator-parameter (operator stack) (type block) (name x)) + (domain-operator-parameter (operator stack) (type block) (name y)) + (domain-precondition + (part-of stack) (name stack-precond) (type conjunction)) + (domain-atomic-precondition + (part-of stack-precond) (param-names x) (predicate holding)) + (domain-atomic-precondition + (part-of stack-precond) (param-names y) (predicate clear)) + (domain-effect + (part-of stack) (predicate holding) (param-names x) (type NEGATIVE)) + (domain-effect + (part-of stack) (predicate clear) (param-names y) (type NEGATIVE)) + (domain-effect + (part-of stack) (predicate clear) (param-names x)) + (domain-effect + (part-of stack) (predicate handempty)) + (domain-effect + (part-of stack) (predicate on) (param-names x y)) ; world model (domain-fact (name handempty)) diff --git a/src/plugins/clips-executive/clips/tests/test_domain.cpp b/src/plugins/clips-executive/clips/tests/test_domain.cpp index dae8370..1961bdd 100644 --- a/src/plugins/clips-executive/clips/tests/test_domain.cpp +++ b/src/plugins/clips-executive/clips/tests/test_domain.cpp @@ -420,7 +420,10 @@ TEST_F(BlocksworldDomainTest, NonUniqueActionIDs) { env.reset(); env.assert_fact("(plan-action (id 1) (goal-id g0) (plan-id p1)" - " (action-name unstack)" + " (action-name stack)" + " (param-names x y) (param-values b1 b2))"); + env.assert_fact("(plan-action (id 1) (goal-id g1) (plan-id p0)" + " (action-name stack)" " (param-names x y) (param-values b1 b2))"); env.run(); // The action pick-up with ID 1 in plan p0 of goal g0. This should be @@ -434,9 +437,10 @@ TEST_F(BlocksworldDomainTest, NonUniqueActionIDs) "(and (eq ?a:id 1) (eq ?a:goal-id g0) (eq ?a:plan-id p1)" " (eq ?a:executable FALSE))" )); - env.assert_fact("(plan-action (id 1) (goal-id g1) (plan-id p0)" - " (action-name unstack)" - " (param-names x y) (param-values b1 b2))"); + EXPECT_TRUE(has_fact("((?a plan-action))", + "(and (eq ?a:id 1) (eq ?a:goal-id g0) (eq ?a:plan-id p0)" + " (eq ?a:executable TRUE))" + )); EXPECT_TRUE(has_fact("((?a plan-action))", "(and (eq ?a:id 1) (eq ?a:goal-id g1) (eq ?a:plan-id p0)" " (eq ?a:executable FALSE))" -- 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
