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-example-without-pddl has been updated discards 4fd386e22509ca08ab07b66259f5861e01919476 (commit) discards 016b821432c19d30c9564e13197d25c875f4736c (commit) to 837a0d0ddf806e8cf639be7c0baf8a32fcc1cc03 (commit) via 50fde735c294efdc82c6eecd269aec3da96aeef6 (commit) via 93381b569a8cd2d6e0f8046333807ed4d7af7f11 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (4fd386e22509ca08ab07b66259f5861e01919476) \ N -- N -- N (837a0d0ddf806e8cf639be7c0baf8a32fcc1cc03) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-example-without-pddl 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 93381b569a8cd2d6e0f8046333807ed4d7af7f11 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 6 17:29:31 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:26:12 2018 +0100 clips-executive: copy PDDL test scenario to a separate scenario We want a test scenario without PDDL as default. Copy the existing PDDL test scenario so we can still use it later. http://git.fawkesrobotics.org/fawkes.git/commit/93381b5 http://trac.fawkesrobotics.org/changeset/93381b5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 50fde735c294efdc82c6eecd269aec3da96aeef6 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 6 17:40:17 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:26:12 2018 +0100 clips-executive: adapt default test scenario to not use PDDL Instead of creating a plan with PDDL, use the fixed action sequence from the example. This also removes the dependency on robot memory. http://git.fawkesrobotics.org/fawkes.git/commit/50fde73 http://trac.fawkesrobotics.org/changeset/50fde73 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 837a0d0ddf806e8cf639be7c0baf8a32fcc1cc03 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Mar 7 19:22:34 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:26:12 2018 +0100 clips-executive: add spec for the test scenario with PDDL The PDDL test scenario was moved to test-scenario-pddl, add a clips-executive spec for the scenario and adapt the config accordingly. http://git.fawkesrobotics.org/fawkes.git/commit/837a0d0 http://trac.fawkesrobotics.org/changeset/837a0d0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/clips-executive.yaml | 18 ++++++++++ cfg/conf.d/pddl-planner.yaml | 2 +- cfg/conf.d/pddl-robot-memory.yaml | 4 +- .../clips/test-scenario-pddl/problem.pddl | 35 -------------------- .../clips/test-scenario-pddl/problem.pddl.soln | 3 -- 5 files changed, 21 insertions(+), 41 deletions(-) delete mode 100644 src/plugins/clips-executive/clips/test-scenario-pddl/problem.pddl delete mode 100644 src/plugins/clips-executive/clips/test-scenario-pddl/problem.pddl.soln - *Diffs* ------------------------------------------------------------- - *commit* 93381b569a8cd2d6e0f8046333807ed4d7af7f11 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Mar 6 17:29:31 2018 +0100 Subject: clips-executive: copy PDDL test scenario to a separate scenario .../action-selection.clp | 0 .../domain.pddl | 0 .../execution-monitoring.clp | 0 .../fixed-sequence.clp | 0 .../goal-expander-pddl.clp | 0 .../goal-reasoner.clp | 0 .../print-action.clp | 0 .../problem-template.pddl | 0 .../state-estimation.clp | 0 .../test-domain.clp | 0 .../worldmodel-facts.clp | 0 11 files changed, 0 insertions(+), 0 deletions(-) - *commit* 50fde735c294efdc82c6eecd269aec3da96aeef6 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Mar 6 17:40:17 2018 +0100 Subject: clips-executive: adapt default test scenario to not use PDDL cfg/conf.d/clips-executive.yaml | 6 ++-- .../clips/test-scenario/goal-expander-pddl.clp | 26 -------------- .../clips/test-scenario/problem-template.pddl | 35 -------------------- 3 files changed, 3 insertions(+), 64 deletions(-) _Diff for modified files_: diff --git a/cfg/conf.d/clips-executive.yaml b/cfg/conf.d/clips-executive.yaml index f21c6c9..74b77bd 100644 --- a/cfg/conf.d/clips-executive.yaml +++ b/cfg/conf.d/clips-executive.yaml @@ -49,15 +49,15 @@ clips-executive: # Agent name. On startup the clips-agent will try to resolve a file named # <agent name>.clp. It must be in the CLIPS path directories. spec: test - use_pddl: true - sync_domain_facts: true + use_pddl: false + sync_domain_facts: false specs: test: domain: test-scenario/test-domain.clp worldmodel: test-scenario/worldmodel-facts.clp goal-reasoner: test-scenario/goal-reasoner.clp - goal-expander: test-scenario/goal-expander-pddl.clp + goal-expander: test-scenario/fixed-sequence.clp action-selection: test-scenario/action-selection.clp #macro-expansion: test-scenario/action-selection.clp action-execution: ["skills-actions.clp", "test-scenario/print-action.clp"] - *commit* 837a0d0ddf806e8cf639be7c0baf8a32fcc1cc03 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Mar 7 19:22:34 2018 +0100 Subject: clips-executive: add spec for the test scenario with PDDL cfg/conf.d/clips-executive.yaml | 18 ++++++++++++++++++ cfg/conf.d/pddl-planner.yaml | 2 +- cfg/conf.d/pddl-robot-memory.yaml | 4 ++-- 3 files changed, 21 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/cfg/conf.d/clips-executive.yaml b/cfg/conf.d/clips-executive.yaml index 74b77bd..4fdfe03 100644 --- a/cfg/conf.d/clips-executive.yaml +++ b/cfg/conf.d/clips-executive.yaml @@ -117,3 +117,21 @@ clips-executive: # Example: /clips-executive/specs/test/parameters/home-pos -> /config/home-pos parameters: example: value + + test-pddl: + domain: test-scenario-pddl/test-domain.clp + worldmodel: test-scenario-pddl/worldmodel-facts.clp + goal-reasoner: test-scenario-pddl/goal-reasoner.clp + goal-expander: test-scenario-pddl/goal-expander-pddl.clp + action-selection: test-scenario-pddl/action-selection.clp + action-execution: ["skills-actions.clp", "test-scenario-pddl/print-action.clp"] + execution-monitoring: test-scenario-pddl/execution-monitoring.clp + state-estimation: test-scenario-pddl/state-estimation.clp + + # Map plan actions to skill strings. + action-mapping: + say: say{text=?(text)s, wait=true} + say-hello: say{text="Hello ?(name)y", wait=true} + say-hello-again: say{text="Hello again ?(name)y", wait=true} + say-goodbye: say{text="Good bye", wait=true} + say-cleanup: say{text="Cleaning up", wait=true} diff --git a/cfg/conf.d/pddl-planner.yaml b/cfg/conf.d/pddl-planner.yaml index b5e64b6..3a09114 100644 --- a/cfg/conf.d/pddl-planner.yaml +++ b/cfg/conf.d/pddl-planner.yaml @@ -11,7 +11,7 @@ plugins/pddl-planner: # Domain and problem description and location # Folder path needs a trailing / - description-folder: "@BASEDIR@/src/plugins/clips-executive/clips/test-scenario/" + description-folder: "@BASEDIR@/src/plugins/clips-executive/clips/test-scenario-pddl/" domain-description: domain.pddl problem-description: problem.pddl # File for intermediate results from planners diff --git a/cfg/conf.d/pddl-robot-memory.yaml b/cfg/conf.d/pddl-robot-memory.yaml index 2dd7bb7..aee1d12 100644 --- a/cfg/conf.d/pddl-robot-memory.yaml +++ b/cfg/conf.d/pddl-robot-memory.yaml @@ -8,9 +8,9 @@ plugins/pddl-robot-memory: # Which collection contains the worldmodel collection: "robmem.clipswm" # Where is the problem file to use as teplate (in src/agents) - input-problem-description: clips-executive/test-scenario/problem-template.pddl + input-problem-description: clips-executive/test-scenario-pddl/problem-template.pddl # Where to put the generated problem file (in src/agents) - output-problem-description: clips-executive/test-scenario/problem.pddl + output-problem-description: clips-executive/test-scenario-pddl/problem.pddl # Interface used to start generation with message and show when its final interface-name: "pddl-gen" -- 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
