Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, thofmann/skiller-execution-time-estimators has been updated discards e4eb5efe9c46558dbd5587fcfce30c1c8257af03 (commit) discards 7d0f676ef134c0636852de51cc19dc0868dd4a84 (commit) to 75dff5e493640e5b0447fdd67741c2d686b6a26d (commit) via cbd8084b4e69d3e831e7b2fc2d660f6decfbd532 (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 (e4eb5efe9c46558dbd5587fcfce30c1c8257af03) \ N -- N -- N (75dff5e493640e5b0447fdd67741c2d686b6a26d) 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. https://github.com/fawkesrobotics/fawkes/tree/thofmann/skiller-execution-time-estimators 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 cbd8084b4e69d3e831e7b2fc2d660f6decfbd532 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Jan 7 15:17:37 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Jan 7 15:28:41 2020 +0100 skiller-simulator: add a simple time estimator reading from the config The ConfigExecutionTimeEstimator simply reads the execution time from the config. It ignores the skill's arguments and only checks the skill name. https://github.com/fawkesrobotics/fawkes/commit/cbd8084b4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 75dff5e493640e5b0447fdd67741c2d686b6a26d Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Jan 7 15:23:01 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Jan 7 15:28:41 2020 +0100 skiller-simulator: unify config parameter names Move the default execution time into the execution-times sub-path, which is also used by the ConfigExecutionTimeEstimator. https://github.com/fawkesrobotics/fawkes/commit/75dff5e49 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/skiller-simulator/estimators/config_estimator.cpp | 3 +++ 1 file changed, 3 insertions(+) - *Diffs* ------------------------------------------------------------- - *commit* cbd8084b4e69d3e831e7b2fc2d660f6decfbd532 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Jan 7 15:17:37 2020 +0100 Subject: skiller-simulator: add a simple time estimator reading from the config src/plugins/skiller-simulator/Makefile | 3 +- .../config_estimator.cpp} | 54 +++++++++++----------- .../config_estimator.h} | 22 ++++----- src/plugins/skiller-simulator/exec_thread.cpp | 4 ++ 4 files changed, 43 insertions(+), 40 deletions(-) _Diff for modified files_: diff --git a/src/plugins/skiller-simulator/Makefile b/src/plugins/skiller-simulator/Makefile index 8cba7f9b1..781fec8f4 100644 --- a/src/plugins/skiller-simulator/Makefile +++ b/src/plugins/skiller-simulator/Makefile @@ -28,7 +28,8 @@ CFLAGS += $(CFLAGS_CPP17) OBJS_skiller_simulator = skiller_simulator_plugin.o exec_thread.o \ execution_time_estimator_aspect/execution_time_estimator_aspect.o \ - execution_time_estimator_aspect/execution_time_estimator_aspect_inifin.o + execution_time_estimator_aspect/execution_time_estimator_aspect_inifin.o \ + estimators/config_estimator.o OBJS_libfawkes_skiller_time_estimator = execution_time_estimator.o OBJS_all = $(OBJS_skiller_simulator) $(OBJS_libfawkes_skiller_time_estimator) diff --git a/src/plugins/skiller-simulator/exec_thread.cpp b/src/plugins/skiller-simulator/exec_thread.cpp index df7b57d99..83dc92e01 100644 --- a/src/plugins/skiller-simulator/exec_thread.cpp +++ b/src/plugins/skiller-simulator/exec_thread.cpp @@ -20,6 +20,8 @@ #include "exec_thread.h" +#include "estimators/config_estimator.h" + using namespace std; using namespace fawkes; @@ -47,6 +49,8 @@ SkillerSimulatorExecutionThread::init() default_skill_runtime_ = config->get_float_or_default("/plugins/skiller-simulation/skill-runtime", 1); skill_starttime_ = Time(); + execution_time_estimator_manager_.register_provider( + std::make_shared<skiller_simulator::ConfigExecutionTimeEstimator>(config)); } void - *commit* 75dff5e493640e5b0447fdd67741c2d686b6a26d - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Jan 7 15:23:01 2020 +0100 Subject: skiller-simulator: unify config parameter names src/plugins/skiller-simulator/exec_thread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/skiller-simulator/exec_thread.cpp b/src/plugins/skiller-simulator/exec_thread.cpp index 83dc92e01..aa130585c 100644 --- a/src/plugins/skiller-simulator/exec_thread.cpp +++ b/src/plugins/skiller-simulator/exec_thread.cpp @@ -47,7 +47,7 @@ SkillerSimulatorExecutionThread::init() { skiller_if_ = blackboard->open_for_writing<SkillerInterface>("Skiller"); default_skill_runtime_ = - config->get_float_or_default("/plugins/skiller-simulation/skill-runtime", 1); + config->get_float_or_default("/plugins/skiller-simulation/execution-times/default", 1); skill_starttime_ = Time(); execution_time_estimator_manager_.register_provider( std::make_shared<skiller_simulator::ConfigExecutionTimeEstimator>(config)); _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
