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 3fac7f4c666cb5ab9b0cd74bedd275404be49887 (commit) via 1e512be61e93538686dee5da578e754d398ffd4e (commit) from acaf44e6b8e8e422f199717b9477b027da8f63e4 (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 1e512be61e93538686dee5da578e754d398ffd4e Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Oct 30 12:11:10 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Oct 30 12:11:10 2019 +0100 gologpp: pass cfg_prefix by const reference Suggested by Codacy. https://github.com/fawkesrobotics/fawkes/commit/1e512be61 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3fac7f4c666cb5ab9b0cd74bedd275404be49887 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Oct 30 12:13:34 2019 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Oct 30 12:13:34 2019 +0100 gologpp: catch exception and print error if we cannot create exog event The function is declared not to throw exceptions, so we should catch the exception and print an error. The error is also not fatal, we only skip the event but can continue. Found by Codacy. https://github.com/fawkesrobotics/fawkes/commit/3fac7f4c6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/gologpp/exog_manager.cpp | 18 ++++++++++++------ src/plugins/gologpp/exog_manager.h | 2 +- src/plugins/gologpp/skiller_action_executor.cpp | 8 ++++---- src/plugins/gologpp/skiller_action_executor.h | 8 ++++---- 4 files changed, 21 insertions(+), 15 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 1e512be61e93538686dee5da578e754d398ffd4e - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Oct 30 12:11:10 2019 +0100 Subject: gologpp: pass cfg_prefix by const reference src/plugins/gologpp/exog_manager.cpp | 10 +++++----- src/plugins/gologpp/exog_manager.h | 2 +- src/plugins/gologpp/skiller_action_executor.cpp | 8 ++++---- src/plugins/gologpp/skiller_action_executor.h | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/exog_manager.cpp b/src/plugins/gologpp/exog_manager.cpp index f28495201..0300c37b1 100644 --- a/src/plugins/gologpp/exog_manager.cpp +++ b/src/plugins/gologpp/exog_manager.cpp @@ -59,11 +59,11 @@ ConfigError::ConfigError(const std::string &msg) : Exception(msg.c_str()) * @param blackboard The blackboard to use to read data from * @param logger A logger instance to use for logging messages */ -ExogManager::ExogManager(GologppThread *exec_thread, - Configuration *config, - std::string cfg_prefix, - BlackBoard * blackboard, - Logger * logger) +ExogManager::ExogManager(GologppThread * exec_thread, + Configuration * config, + const std::string &cfg_prefix, + BlackBoard * blackboard, + Logger * logger) : exec_thread_(exec_thread), config_(config), blackboard_(blackboard), logger_(logger) { // Build a map to lookup all exog actions by their mapped name (i.e. the diff --git a/src/plugins/gologpp/exog_manager.h b/src/plugins/gologpp/exog_manager.h index 0bf9abc0f..dc4d3584c 100644 --- a/src/plugins/gologpp/exog_manager.h +++ b/src/plugins/gologpp/exog_manager.h @@ -52,7 +52,7 @@ class ExogManager public: ExogManager(GologppThread *exec_thread, Configuration *, - std::string cfg_prefix, + const std::string &cfg_prefix, BlackBoard *, Logger *); diff --git a/src/plugins/gologpp/skiller_action_executor.cpp b/src/plugins/gologpp/skiller_action_executor.cpp index 90d4b4aa8..c94c7e8f9 100644 --- a/src/plugins/gologpp/skiller_action_executor.cpp +++ b/src/plugins/gologpp/skiller_action_executor.cpp @@ -47,10 +47,10 @@ using gologpp::Transition; * @param config The config to read the skill mapping from * @param cfg_prefix The spec-specific config prefix to use */ -SkillerActionExecutor::SkillerActionExecutor(Logger * logger, - BlackBoard * blackboard, - Configuration *config, - std::string cfg_prefix) +SkillerActionExecutor::SkillerActionExecutor(Logger * logger, + BlackBoard * blackboard, + Configuration * config, + const std::string &cfg_prefix) : ActionExecutor(logger), BlackBoardInterfaceListener("Golog++SkillerActionExecutor"), blackboard_(blackboard), diff --git a/src/plugins/gologpp/skiller_action_executor.h b/src/plugins/gologpp/skiller_action_executor.h index 6bb61942b..00180b748 100644 --- a/src/plugins/gologpp/skiller_action_executor.h +++ b/src/plugins/gologpp/skiller_action_executor.h @@ -38,10 +38,10 @@ namespace gpp { class SkillerActionExecutor : public ActionExecutor, public BlackBoardInterfaceListener { public: - SkillerActionExecutor(Logger * logger, - BlackBoard * blackboard, - Configuration *config, - std::string cfg_prefix); + SkillerActionExecutor(Logger * logger, + BlackBoard * blackboard, + Configuration * config, + const std::string &cfg_prefix); virtual ~SkillerActionExecutor(); void start(std::shared_ptr<gologpp::Activity> activity) override; void stop(std::shared_ptr<gologpp::Grounding<gologpp::Action>> activity) override; - *commit* 3fac7f4c666cb5ab9b0cd74bedd275404be49887 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Oct 30 12:13:34 2019 +0100 Subject: gologpp: catch exception and print error if we cannot create exog event src/plugins/gologpp/exog_manager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/gologpp/exog_manager.cpp b/src/plugins/gologpp/exog_manager.cpp index 0300c37b1..eac43228b 100644 --- a/src/plugins/gologpp/exog_manager.cpp +++ b/src/plugins/gologpp/exog_manager.cpp @@ -219,7 +219,13 @@ ExogManager::BlackboardEventHandler::make_exog_event(Interface *iface) const void ExogManager::InterfaceWatcher::bb_interface_data_changed(Interface *iface) throw() { - exog_manager_.exog_queue_push(make_exog_event(iface)); + try { + exog_manager_.exog_queue_push(make_exog_event(iface)); + } catch (IllegalArgumentException &e) { + exog_manager_.logger_->log_error(exog_manager_.name(), + "Error when creating exogenous event: %s, ignoring event!", + e.what_no_backtrace()); + } } ExogManager::PatternObserver::PatternObserver(BlackBoard * bb, _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
