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 311edfa9a308610443e6a67c206308f02fb23097 (commit) via 61f70650c5560ccc561f5ecad893bdab3f133ff9 (commit) via 016288b466b0227ef935454809ef7ae7c79fff89 (commit) from 4c692ee5f52bffd9286c7c98078c234f75feafee (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 016288b466b0227ef935454809ef7ae7c79fff89 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 12 15:30:03 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 12 16:03:50 2019 +0100 gologpp: add SleepActionExecutor The executor executes the action `sleep` and just waits for the given number of seconds before it sets the activity to finished. https://github.com/fawkesrobotics/fawkes/commit/016288b46 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 61f70650c5560ccc561f5ecad893bdab3f133ff9 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 12 15:30:57 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 12 16:03:50 2019 +0100 gologpp: document value-to-field conversion https://github.com/fawkesrobotics/fawkes/commit/61f70650c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 311edfa9a308610443e6a67c206308f02fb23097 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Nov 12 15:32:24 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Nov 12 16:03:50 2019 +0100 gologpp: document InvalidArgumentException used by SkillerActionExecutor https://github.com/fawkesrobotics/fawkes/commit/311edfa9a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/gologpp/Makefile | 2 +- src/plugins/gologpp/gologpp_fawkes_backend.cpp | 2 + src/plugins/gologpp/skiller_action_executor.cpp | 7 ++ src/plugins/gologpp/sleep_action_executor.cpp | 94 ++++++++++++++++++++++ ...e_action_executor.h => sleep_action_executor.h} | 35 ++++---- src/plugins/gologpp/utils.cpp | 44 +++++++++- 6 files changed, 159 insertions(+), 25 deletions(-) create mode 100644 src/plugins/gologpp/sleep_action_executor.cpp copy src/plugins/gologpp/{message_action_executor.h => sleep_action_executor.h} (58%) - *Diffs* ------------------------------------------------------------- - *commit* 016288b466b0227ef935454809ef7ae7c79fff89 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 12 15:30:03 2019 +0100 Subject: gologpp: add SleepActionExecutor src/plugins/gologpp/Makefile | 2 +- src/plugins/gologpp/gologpp_fawkes_backend.cpp | 2 + src/plugins/gologpp/sleep_action_executor.cpp | 94 ++++++++++++++++++++++ ...e_action_executor.h => sleep_action_executor.h} | 35 ++++---- 4 files changed, 111 insertions(+), 22 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/Makefile b/src/plugins/gologpp/Makefile index ab28553a3..05561c03b 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 + utils.o message_action_executor.o sleep_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 d1c0b0959..6c01fd502 100644 --- a/src/plugins/gologpp/gologpp_fawkes_backend.cpp +++ b/src/plugins/gologpp/gologpp_fawkes_backend.cpp @@ -23,6 +23,7 @@ #include "message_action_executor.h" #include "skiller_action_executor.h" +#include "sleep_action_executor.h" #include <golog++/model/activity.h> #include <golog++/model/transition.h> @@ -54,6 +55,7 @@ GologppFawkesBackend::GologppFawkesBackend(Configuration *config, std::make_shared<SkillerActionExecutor>(logger, blackboard, config, cfg_prefix)); action_dispatcher_.register_executor( std::make_shared<BBMessageActionExecutor>(logger, blackboard, config, cfg_prefix)); + action_dispatcher_.register_executor(std::make_shared<SleepActionExecutor>(logger)); } GologppFawkesBackend::~GologppFawkesBackend() - *commit* 61f70650c5560ccc561f5ecad893bdab3f133ff9 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 12 15:30:57 2019 +0100 Subject: gologpp: document value-to-field conversion src/plugins/gologpp/utils.cpp | 44 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/utils.cpp b/src/plugins/gologpp/utils.cpp index e59ba4325..1407216f2 100644 --- a/src/plugins/gologpp/utils.cpp +++ b/src/plugins/gologpp/utils.cpp @@ -26,10 +26,23 @@ namespace fawkes { namespace gpp { +/** @class ValueToFieldVisitor + * A visitor that converts a gologpp::Value to an interface field value. + * The visitor checks the types of the input gologpp::Value and the ouput + * InterfaceFieldIterator. If they match, the field is set. Otherwise, an + * exception is thrown. + */ + +/** Constructor. + * @param field The field to set. + */ ValueToFieldVisitor::ValueToFieldVisitor(InterfaceFieldIterator *field) : field(field) { } +/** Convert the given value and set the field accordingly. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(unsigned int v) { @@ -43,6 +56,9 @@ ValueToFieldVisitor::operator()(unsigned int v) } } +/** Convert the given value and set the field accordingly. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(int v) { @@ -53,6 +69,9 @@ ValueToFieldVisitor::operator()(int v) } } +/** Convert the given value and set the field accordingly. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(unsigned long v) { @@ -64,6 +83,9 @@ ValueToFieldVisitor::operator()(unsigned long v) } } +/** Convert the given value and set the field accordingly. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(long v) { @@ -74,6 +96,9 @@ ValueToFieldVisitor::operator()(long v) } } +/** Convert the given value and set the field accordingly. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(double v) { @@ -83,19 +108,23 @@ ValueToFieldVisitor::operator()(double v) } } +/** Convert the given value and set the field accordingly. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(std::string v) { switch (field->get_type()) { - case IFT_STRING: - field->set_string(v.c_str()); - break; + case IFT_STRING: field->set_string(v.c_str()); break; // TODO: check that the given string is a valid enum case IFT_ENUM: field->set_enum_string(v.c_str()); break; default: throw Exception("Invalid cast from string to %s", field->get_typename()); } } +/** Convert the given value and set the field accordingly. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(bool v) { @@ -105,6 +134,9 @@ ValueToFieldVisitor::operator()(bool v) } } +/** Golog++ does not support void* types. Thus, this always throws. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(void *v) { @@ -113,6 +145,9 @@ ValueToFieldVisitor::operator()(void *v) } } +/** Not implemented yet. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(gologpp::CompoundType::Representation v) { @@ -121,6 +156,9 @@ ValueToFieldVisitor::operator()(gologpp::CompoundType::Representation v) } } +/** Not implemented yet. + * @param v The value to set the field to. + */ void ValueToFieldVisitor::operator()(gologpp::ListType::Representation v) { - *commit* 311edfa9a308610443e6a67c206308f02fb23097 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Nov 12 15:32:24 2019 +0100 Subject: gologpp: document InvalidArgumentException used by SkillerActionExecutor src/plugins/gologpp/skiller_action_executor.cpp | 7 +++++++ 1 file changed, 7 insertions(+) _Diff for modified files_: diff --git a/src/plugins/gologpp/skiller_action_executor.cpp b/src/plugins/gologpp/skiller_action_executor.cpp index 1015d5de6..e151af130 100644 --- a/src/plugins/gologpp/skiller_action_executor.cpp +++ b/src/plugins/gologpp/skiller_action_executor.cpp @@ -31,6 +31,13 @@ namespace gpp { using gologpp::Transition; +/** @class InvalidArgumentException + * An exception that is thrown if the given arguments do not match the skill's arguments. + */ + +/** Constructor. + * @param format A format string for the format message + */ InvalidArgumentException::InvalidArgumentException(const char *format, ...) : Exception() { va_list args; _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
