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/current-clips-executive-rcll has been updated to 56b91740f8cb78b6ac6ac93f72424e0f53d3affd (commit) via d9670b4da4bd474b2e71bac71473a7e46b08ac55 (commit) via 2e0027273f350d954828bfb01f5f87ce8000a473 (commit) via 16c88a7b9207c5209b8b8bb3fad971e3662d96b9 (commit) via c1a370b227d25bac27e37500fae9460a441abcc1 (commit) via 8ee8320d89d61311d097e27b437eb7dcd84d6a07 (commit) via b84b65cba765a5452fcd3cc0700d9970f5fb8ca2 (commit) via 510a8f736b78934fb9dd5bdd30c03a90b5db553b (commit) via 26a16b68cf6b55ea4e18586134c31aff743fc0df (commit) via 473aab477ebf5f1aa8681cde2e1f77231a96fb37 (commit) via f7a87d25ff863cd516c9e192d82c14f1bf3d0dfa (commit) via d85f0f6d730a612403ac87970986eaf04a498352 (commit) via 133672adcad800d3a2ce81ce8a3e329519326ae2 (commit) from 3f1d0651cbd7a1cc626c96e3b8431b831a5e344b (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll 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 56b91740f8cb78b6ac6ac93f72424e0f53d3affd Merge: 3f1d065 d9670b4 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 16:57:18 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 16:57:18 2018 +0100 Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/56b9174 http://trac.fawkesrobotics.org/changeset/56b9174 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/Makefile | 1 + src/plugins/clips-executive/clips/domain.clp | 200 +++++++++++++++----- src/plugins/clips-executive/clips/plan.clp | 2 +- .../clips-executive/clips/robot-memory-sync.clp | 1 + .../clips-executive/clips/skills-actions.clp | 2 +- .../clips/test-scenario/action-selection.clp | 2 +- .../clips/test-scenario/goal-reasoner.clp | 1 + .../clips/test-scenario/test-domain.clp | 22 +++ .../clips-executive/clips/tests/blocksworld.clp | 4 +- .../conditional_say.clp} | 38 +++-- .../clips-executive/clips/tests/test_domain.cpp | 45 +++++ src/plugins/clips/pddl/precondition_visitor.cpp | 2 +- 12 files changed, 249 insertions(+), 71 deletions(-) copy src/plugins/clips-executive/clips/{test-scenario/problem-template.pddl => tests/conditional_say.clp} (50%) - *Diffs* ------------------------------------------------------------- - *commit* 56b91740f8cb78b6ac6ac93f72424e0f53d3affd - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Jan 11 16:57:18 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll src/plugins/Makefile | 1 + src/plugins/clips-executive/clips/domain.clp | 200 +++++++++++++++----- src/plugins/clips-executive/clips/plan.clp | 2 +- .../clips-executive/clips/robot-memory-sync.clp | 1 + .../clips-executive/clips/skills-actions.clp | 2 +- .../clips/test-scenario/action-selection.clp | 2 +- .../clips/test-scenario/goal-reasoner.clp | 1 + .../clips/test-scenario/test-domain.clp | 22 +++ .../clips-executive/clips/tests/blocksworld.clp | 4 +- .../conditional_say.clp} | 38 +++-- .../clips-executive/clips/tests/test_domain.cpp | 45 +++++ src/plugins/clips/pddl/precondition_visitor.cpp | 2 +- 12 files changed, 249 insertions(+), 71 deletions(-) _Diff for modified files_: diff --cc src/plugins/clips-executive/clips/domain.clp index 215417c,de5d7ee..559871c --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@@ -22,6 -22,10 +22,9 @@@ (deftemplate domain-predicate "Representation of a predicate specification." (slot name (type SYMBOL) (default ?NONE)) - (slot wm-key-pattern (type STRING)) + ; If the predicate is sensed, it is not directly changed by an action effect. + ; Instead, we expect the predicate to be changed externally. + (slot sensed (type SYMBOL) (allowed-values TRUE FALSE) (default FALSE)) (multislot param-names (type SYMBOL)) (multislot param-types (type SYMBOL)) ) diff --cc src/plugins/clips-executive/clips/test-scenario/goal-reasoner.clp index 40a933c,2c9b34a..52a531c --- a/src/plugins/clips-executive/clips/test-scenario/goal-reasoner.clp +++ b/src/plugins/clips-executive/clips/test-scenario/goal-reasoner.clp @@@ -10,9 -10,9 +10,10 @@@ ; # Goal Creation (defrule goal-reasoner-create + (domain-loaded) (not (goal)) (not (goal-already-tried)) + (domain-facts-loaded) => (assert (goal (id TESTGOAL))) ; This is just to make sure we formulate the goal only once. -- 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
