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/labHLAP2019-new-syntax has been updated to 3ab950e273782d5d3fe85d22e17d8d9e31a90a1a (commit) via d97c97d8e74cdf299229a99359b5be93437d9d14 (commit) via 50341f807a5e4f855cfc1c22181482067645fd8c (commit) via 197f856933a6ee0b47fb25d1e0b0cb510e63999f (commit) via ba3dd5a8482ffa91d72b7497d540d05bd7e1c792 (commit) via 08bcde51f207a3e39daeb634c4f0a3bc07a07bc7 (commit) via a7299280ee7daefcbc676c2130e4d801df229d27 (commit) via c2393db498f83d0064bac3bed3c5324748f448ea (commit) via b67d867abc33feecec823788fcf032885cd2b9f6 (commit) via 5b8faec1573525451b1e21a835b468d0fd56df30 (commit) via 4178d7f28fa00b706eb2327550d3ce5b6af413eb (commit) via fc0b2f8cd2eed0c0d707d195ae83050adf6d864c (commit) via c486df11f38d9500339fde818ff16b114d354d21 (commit) via f0bda4ded5ba0fd62b75453723467d2b231b9c80 (commit) via 8574d9fb1f36319f492437e80f313a19bb30644b (commit) via eb6b01c5bb63af9a0a284134c39460c4a77c3666 (commit) via 959a7b076d85b69c696af061ed3512c8570f7caa (commit) via 699e0e1f1b6d95ed76b09b60d923d13520f2d5e8 (commit) via f194c12be9a6044970d3d9988cc763649dbc3c53 (commit) via 81d34ba5e85525a449778dd590ff4dc63643d348 (commit) via 906b3e8292b52d0f51e86314775a72b7005f4a9d (commit) via b4c7d6b23bc7e7b731bd5f9a1fb9279a29834788 (commit) via e6e3305ede081509e0bed3383661f22395a11ee0 (commit) via 144f72a290f7a266915e00f53accf0b5e81886a9 (commit) via 9059d2a92e48ad234518d18cbd5b3baf62bc9669 (commit) via 8d7b8bc32d672f693e0a53f6095382a7acffc514 (commit) via 54a4d14cddc0e83646007008d46a80c398e7e0d4 (commit) via 7d9a1858b86e951fa13f16027fe33ba2f9a8f728 (commit) via e67483b067dffe70def2fcc4f724a6976968a6a6 (commit) via cd4189d3bbbea1f1dca1d1c8acf7dbd97e30bdd6 (commit) via 02c04d7e2ff84ec5f4d66782320d763202387474 (commit) via 75dff5e493640e5b0447fdd67741c2d686b6a26d (commit) via cbd8084b4e69d3e831e7b2fc2d660f6decfbd532 (commit) via b781023012fca10fe9bcc346beeb0ecbcf897250 (commit) via 1633b14f6da421244fc0b4d7959ab142f4117911 (commit) via bc8d780f9d55447c1a95182acc22ea2a5292adce (commit) via b279e0e681f41fbaf195d58c4b3d95df1b32da58 (commit) via bf7166d557edca847c005f9901bfb744ccc79697 (commit) via 778a081ae902511161c4e83460ea7e34adf740b7 (commit) via d3e10c832ea9179317cb4390141138e7ee313303 (commit) via 407fdc755e830068776fd0e4a0050d90fccce90c (commit) from d0c238b9905a1183e5f631a6711bc6ccd01ee499 (commit) https://github.com/fawkesrobotics/fawkes/tree/common/labHLAP2019-new-syntax 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 d97c97d8e74cdf299229a99359b5be93437d9d14 Merge: d0c238b99 197f85693 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 3 14:02:53 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Mar 3 14:02:53 2020 +0100 Merge remote-tracking branch 'origin/master' into common/labHLAP2019-new-syntax https://github.com/fawkesrobotics/fawkes/commit/d97c97d8e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3ab950e273782d5d3fe85d22e17d8d9e31a90a1a Merge: d97c97d8e 50341f807 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 3 14:02:57 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Mar 3 14:02:57 2020 +0100 Merge remote-tracking branch 'origin/vmatare/iface-auto-timestamp-on-write' into common/labHLAP2019-new-syntax https://github.com/fawkesrobotics/fawkes/commit/3ab950e27 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/skiller-simulator.yaml | 12 +++ src/libs/interface/interface.cpp | 20 ++--- src/plugins/Makefile | 3 +- src/plugins/navgraph/visualization_thread.cpp | 35 +++++--- src/plugins/navgraph/visualization_thread.h | 6 ++ src/plugins/robot-memory/Makefile | 12 +-- src/plugins/robot-memory/robot_memory.cpp | 76 ++++++++-------- src/plugins/robot-memory/robot_memory.h | 7 +- src/plugins/skiller-simulator-navgraph/Makefile | 45 ++++++++++ .../navgraph_estimator.cpp | 68 ++++++++++++++ .../navgraph_estimator.h | 50 +++++++++++ .../skiller_simulator_navgraph_plugin.cpp} | 29 +++--- .../skiller_simulator_navgraph_thread.cpp | 43 +++++++++ .../skiller_simulator_navgraph_thread.h} | 40 ++++----- src/plugins/skiller-simulator/Makefile | 32 ++++++- .../estimators/config_estimator.cpp | 53 +++++++++++ .../estimators/config_estimator.h} | 29 +++--- src/plugins/skiller-simulator/exec_thread.cpp | 40 ++++++++- src/plugins/skiller-simulator/exec_thread.h | 13 ++- .../skiller-simulator/execution_time_estimator.cpp | 100 +++++++++++++++++++++ .../execution_time_estimator.h} | 51 ++++++----- .../execution_time_estimator_aspect.cpp | 90 +++++++++++++++++++ .../execution_time_estimator_aspect.h} | 39 ++++---- .../execution_time_estimator_aspect_inifin.cpp | 76 ++++++++++++++++ .../execution_time_estimator_aspect_inifin.h} | 25 +++--- src/plugins/skiller-simulator/tests/Makefile | 46 ++++++++++ .../skiller-simulator/tests/test_skill_parser.cpp | 76 ++++++++++++++++ 27 files changed, 927 insertions(+), 189 deletions(-) create mode 100644 cfg/conf.d/skiller-simulator.yaml create mode 100644 src/plugins/skiller-simulator-navgraph/Makefile create mode 100644 src/plugins/skiller-simulator-navgraph/navgraph_estimator.cpp create mode 100644 src/plugins/skiller-simulator-navgraph/navgraph_estimator.h copy src/plugins/{attic/webview-ptzcam/webview-ptzcam-plugin.cpp => skiller-simulator-navgraph/skiller_simulator_navgraph_plugin.cpp} (53%) create mode 100644 src/plugins/skiller-simulator-navgraph/skiller_simulator_navgraph_thread.cpp copy src/plugins/{plexil/navgraph_access_thread.h => skiller-simulator-navgraph/skiller_simulator_navgraph_thread.h} (55%) create mode 100644 src/plugins/skiller-simulator/estimators/config_estimator.cpp copy src/plugins/{gologpp/print_action_executor.h => skiller-simulator/estimators/config_estimator.h} (59%) create mode 100644 src/plugins/skiller-simulator/execution_time_estimator.cpp copy src/plugins/{gologpp/action_executor.h => skiller-simulator/execution_time_estimator.h} (50%) create mode 100644 src/plugins/skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect.cpp copy src/plugins/{gologpp/aspect/action_executor_dispatcher.h => skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect.h} (51%) create mode 100644 src/plugins/skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect_inifin.cpp copy src/plugins/{gologpp/aspect/action_executor_dispatcher_inifin.h => skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect_inifin.h} (61%) create mode 100644 src/plugins/skiller-simulator/tests/Makefile create mode 100644 src/plugins/skiller-simulator/tests/test_skill_parser.cpp - *Diffs* ------------------------------------------------------------- - *commit* d97c97d8e74cdf299229a99359b5be93437d9d14 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Mar 3 14:02:53 2020 +0100 Subject: Merge remote-tracking branch 'origin/master' into common/labHLAP2019-new-syntax cfg/conf.d/skiller-simulator.yaml | 12 +++ src/plugins/Makefile | 3 +- src/plugins/navgraph/visualization_thread.cpp | 35 +++++--- src/plugins/navgraph/visualization_thread.h | 6 ++ src/plugins/robot-memory/Makefile | 12 +-- src/plugins/robot-memory/robot_memory.cpp | 76 ++++++++-------- src/plugins/robot-memory/robot_memory.h | 7 +- src/plugins/skiller-simulator-navgraph/Makefile | 45 ++++++++++ .../navgraph_estimator.cpp | 68 ++++++++++++++ .../navgraph_estimator.h | 50 +++++++++++ .../skiller_simulator_navgraph_plugin.cpp} | 29 +++--- .../skiller_simulator_navgraph_thread.cpp | 43 +++++++++ .../skiller_simulator_navgraph_thread.h} | 40 ++++----- src/plugins/skiller-simulator/Makefile | 32 ++++++- .../estimators/config_estimator.cpp | 53 +++++++++++ .../estimators/config_estimator.h} | 29 +++--- src/plugins/skiller-simulator/exec_thread.cpp | 40 ++++++++- src/plugins/skiller-simulator/exec_thread.h | 13 ++- .../skiller-simulator/execution_time_estimator.cpp | 100 +++++++++++++++++++++ .../execution_time_estimator.h} | 51 ++++++----- .../execution_time_estimator_aspect.cpp | 90 +++++++++++++++++++ .../execution_time_estimator_aspect.h} | 39 ++++---- .../execution_time_estimator_aspect_inifin.cpp | 76 ++++++++++++++++ .../execution_time_estimator_aspect_inifin.h} | 25 +++--- src/plugins/skiller-simulator/tests/Makefile | 46 ++++++++++ .../skiller-simulator/tests/test_skill_parser.cpp | 76 ++++++++++++++++ 26 files changed, 917 insertions(+), 179 deletions(-) _Diff for modified files_: - *commit* 3ab950e273782d5d3fe85d22e17d8d9e31a90a1a - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Mar 3 14:02:57 2020 +0100 Subject: Merge remote-tracking branch 'origin/vmatare/iface-auto-timestamp-on-write' into common/labHLAP2019-new-syntax src/libs/interface/interface.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) _Diff for modified files_: _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits