Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, common/gologpp has been updated to f0b609f4374699b4f23471911ba9ab5a6f56666c (commit) via b11355f48e6d107436f7dd83cf18ce19e56a31d8 (commit) via 63b1ea1c50b7389ea85d0fbf3d38821cba5bf27b (commit) via 231550c66753d5953ac51011b750b0cd24ec6a18 (commit) via 902421ac093c95ede981017bcd8a006024c40bd0 (commit) via cc92706776fd1e884eb6d0db0b07abbc117057be (commit) from 69cde23cc62b64ac2baec417e30442cf60d3d78b (commit) https://github.com/fawkesrobotics/fawkes/tree/common/gologpp 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 cc92706776fd1e884eb6d0db0b07abbc117057be Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 5 15:45:03 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 26 13:42:12 2019 +0100 gologpp: add print action executor to print messages The action executor simply passes the message to the Fawkes logger. https://github.com/fawkesrobotics/fawkes/commit/cc9270677 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 902421ac093c95ede981017bcd8a006024c40bd0 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 5 15:55:26 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 26 13:42:12 2019 +0100 gologpp: extend test scenario with a simple print message https://github.com/fawkesrobotics/fawkes/commit/902421ac0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 231550c66753d5953ac51011b750b0cd24ec6a18 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 5 16:58:37 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 26 13:42:12 2019 +0100 gologpp: do not require blackboard config If we cannot find any blackboard configuration for gologpp, do not initialize any watchers or observers. https://github.com/fawkesrobotics/fawkes/commit/231550c66 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 63b1ea1c50b7389ea85d0fbf3d38821cba5bf27b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 26 13:48:38 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 26 13:48:38 2019 +0100 gologpp: update activity state in print action executor https://github.com/fawkesrobotics/fawkes/commit/63b1ea1c5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b11355f48e6d107436f7dd83cf18ce19e56a31d8 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 26 13:49:00 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 26 13:49:00 2019 +0100 gologpp: fix typo in action definition of `msg` https://github.com/fawkesrobotics/fawkes/commit/b11355f48 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f0b609f4374699b4f23471911ba9ab5a6f56666c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 26 13:49:17 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 26 13:49:17 2019 +0100 gologpp: also print a variable in the example domain https://github.com/fawkesrobotics/fawkes/commit/f0b609f43 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/gologpp/Makefile | 2 +- src/plugins/gologpp/exog_manager.cpp | 8 ++- src/plugins/gologpp/gologpp_fawkes_backend.cpp | 2 + src/plugins/gologpp/print_action_executor.cpp | 69 ++++++++++++++++++++++ ...p_action_executor.h => print_action_executor.h} | 25 +++----- .../test-scenarios/blocksworld/blocksworld.gpp | 12 +++- 6 files changed, 98 insertions(+), 20 deletions(-) create mode 100644 src/plugins/gologpp/print_action_executor.cpp copy src/plugins/gologpp/{sleep_action_executor.h => print_action_executor.h} (72%) - *Diffs* ------------------------------------------------------------- - *commit* cc92706776fd1e884eb6d0db0b07abbc117057be - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 5 15:45:03 2019 +0100 Subject: gologpp: add print action executor to print messages src/plugins/gologpp/Makefile | 2 +- src/plugins/gologpp/gologpp_fawkes_backend.cpp | 2 + src/plugins/gologpp/print_action_executor.cpp | 67 ++++++++++++++++++++++ ...p_action_executor.h => print_action_executor.h} | 25 +++----- 4 files changed, 79 insertions(+), 17 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/Makefile b/src/plugins/gologpp/Makefile index 05561c03b..d37c530b0 100644 --- a/src/plugins/gologpp/Makefile +++ b/src/plugins/gologpp/Makefile @@ -20,7 +20,7 @@ LIBS_gologpp = fawkescore fawkesutils fawkesblackboard \ OBJS_gologpp = plugin.o execution_thread.o gologpp_fawkes_backend.o exog_manager.o \ action_executor.o skiller_action_executor.o \ aspect/action_executor_dispatcher.o aspect/action_executor_dispatcher_inifin.o \ - utils.o message_action_executor.o sleep_action_executor.o + utils.o message_action_executor.o sleep_action_executor.o print_action_executor.o OBJS_all = $(OBJS_gologpp) PLUGINS_all = $(PLUGINDIR)/gologpp.so diff --git a/src/plugins/gologpp/gologpp_fawkes_backend.cpp b/src/plugins/gologpp/gologpp_fawkes_backend.cpp index 6c01fd502..3bb607391 100644 --- a/src/plugins/gologpp/gologpp_fawkes_backend.cpp +++ b/src/plugins/gologpp/gologpp_fawkes_backend.cpp @@ -22,6 +22,7 @@ #include "gologpp_fawkes_backend.h" #include "message_action_executor.h" +#include "print_action_executor.h" #include "skiller_action_executor.h" #include "sleep_action_executor.h" @@ -56,6 +57,7 @@ GologppFawkesBackend::GologppFawkesBackend(Configuration *config, action_dispatcher_.register_executor( std::make_shared<BBMessageActionExecutor>(logger, blackboard, config, cfg_prefix)); action_dispatcher_.register_executor(std::make_shared<SleepActionExecutor>(logger)); + action_dispatcher_.register_executor(std::make_shared<PrintActionExecutor>(logger)); } GologppFawkesBackend::~GologppFawkesBackend() - *commit* 902421ac093c95ede981017bcd8a006024c40bd0 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 5 15:55:26 2019 +0100 Subject: gologpp: extend test scenario with a simple print message .../gologpp/test-scenarios/blocksworld/blocksworld.gpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp b/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp index 6d07e4a19..b8b25b07c 100644 --- a/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp +++ b/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp @@ -70,13 +70,22 @@ number function reward() { return -1; } +action msg(string msg) { +mapping: + "print" { + message = msg, + } +} + { - solve(20, reward()) + solve(20, reward()) { + msg("hello"); while (!goal()) pick (symbol x in {a, b, c}) pick(symbol y in {table, a, b, c}) { unstack(x); stack(x, y); } + } } - *commit* 231550c66753d5953ac51011b750b0cd24ec6a18 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 5 16:58:37 2019 +0100 Subject: gologpp: do not require blackboard config src/plugins/gologpp/exog_manager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/exog_manager.cpp b/src/plugins/gologpp/exog_manager.cpp index 5e7c26e41..ae2636c1f 100644 --- a/src/plugins/gologpp/exog_manager.cpp +++ b/src/plugins/gologpp/exog_manager.cpp @@ -93,12 +93,16 @@ ExogManager::ExogManager(GologppThread * exec_thread, // Register an InterfaceWatcher and a PatternObserver for each // watched/observed interface (pattern). These also implement the event // handlers. - for (const string &id : config->get_strings((cfg_prefix + "/blackboard/watch").c_str())) { + for (const string &id : + config->get_strings_or_defaults((cfg_prefix + "/blackboard/watch").c_str(), + std::vector<std::string>{})) { shared_ptr<ExogAction> exog = find_mapped_exog(id); watchers_.push_back(std::make_unique<InterfaceWatcher>(blackboard, id, exog, *this)); } - for (const string &pattern : config->get_strings((cfg_prefix + "/blackboard/observe").c_str())) { + for (const string &pattern : + config->get_strings_or_defaults((cfg_prefix + "/blackboard/observe").c_str(), + std::vector<std::string>{})) { shared_ptr<ExogAction> exog = find_mapped_exog(pattern); observers_.push_back(std::make_unique<PatternObserver>(blackboard, pattern, exog, *this)); } - *commit* 63b1ea1c50b7389ea85d0fbf3d38821cba5bf27b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 26 13:48:38 2019 +0100 Subject: gologpp: update activity state in print action executor src/plugins/gologpp/print_action_executor.cpp | 2 ++ 1 file changed, 2 insertions(+) _Diff for modified files_: diff --git a/src/plugins/gologpp/print_action_executor.cpp b/src/plugins/gologpp/print_action_executor.cpp index 53b64be90..1bf700dd8 100644 --- a/src/plugins/gologpp/print_action_executor.cpp +++ b/src/plugins/gologpp/print_action_executor.cpp @@ -53,9 +53,11 @@ PrintActionExecutor::can_execute_activity(std::shared_ptr<gologpp::Activity> act void PrintActionExecutor::start(std::shared_ptr<gologpp::Activity> activity) { + activity->update(gologpp::Transition::Hook::START); logger_->log_info("Golog++", "%s", static_cast<std::string>(activity->mapped_arg_value("message")).c_str()); + activity->update(gologpp::Transition::Hook::FINISH); } void - *commit* b11355f48e6d107436f7dd83cf18ce19e56a31d8 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 26 13:49:00 2019 +0100 Subject: gologpp: fix typo in action definition of `msg` src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp b/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp index b8b25b07c..09d2d9c02 100644 --- a/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp +++ b/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp @@ -73,7 +73,7 @@ number function reward() { action msg(string msg) { mapping: "print" { - message = msg, + message = msg } } - *commit* f0b609f4374699b4f23471911ba9ab5a6f56666c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 26 13:49:17 2019 +0100 Subject: gologpp: also print a variable in the example domain src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp | 1 + 1 file changed, 1 insertion(+) _Diff for modified files_: diff --git a/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp b/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp index 09d2d9c02..14cfa4f50 100644 --- a/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp +++ b/src/plugins/gologpp/test-scenarios/blocksworld/blocksworld.gpp @@ -84,6 +84,7 @@ mapping: while (!goal()) pick (symbol x in {a, b, c}) pick(symbol y in {table, a, b, c}) { + msg("Unstacking " + to_string(x)); unstack(x); stack(x, y); } _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
