Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to 4f1c14b661bb3b51997f5f98bb2eed37eed97a4d (commit) via f5161226b2af48ae0d54d99e6e099ddec6253f73 (commit) from d4dae4ef1ea664d20db1482f77a4647a34f3cb2c (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll 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 4f1c14b661bb3b51997f5f98bb2eed37eed97a4d Merge: d4dae4e f516122 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Feb 22 13:00:12 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Feb 22 13:00:12 2018 +0100 Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/4f1c14b http://trac.fawkesrobotics.org/changeset/4f1c14b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/Makefile | 7 ++-- src/plugins/clips-executive/clips/init.clp | 2 +- .../{clips-agent => clips-pddl-parser}/Makefile | 30 +++++++----------- .../clips_pddl_parser_feature.cpp} | 10 +++--- .../clips_pddl_parser_feature.h} | 8 ++-- .../clips_pddl_parser_plugin.cpp} | 29 +++++++++--------- .../clips_pddl_parser_thread.cpp} | 27 +++++------------ .../clips_pddl_parser_thread.h} | 31 +++++++------------ .../pddl => clips-pddl-parser}/effect_visitor.cpp | 0 .../pddl => clips-pddl-parser}/effect_visitor.h | 6 ++-- .../precondition_visitor.cpp | 0 .../precondition_visitor.h | 6 ++-- src/plugins/clips/Makefile | 5 +-- src/plugins/clips/clips_thread.cpp | 2 - 14 files changed, 68 insertions(+), 95 deletions(-) copy src/plugins/{clips-agent => clips-pddl-parser}/Makefile (51%) rename src/plugins/{clips/feature_pddl.cpp => clips-pddl-parser/clips_pddl_parser_feature.cpp} (95%) rename src/plugins/{clips/feature_pddl.h => clips-pddl-parser/clips_pddl_parser_feature.h} (87%) copy src/plugins/{amcl/map_lasergen_plugin.cpp => clips-pddl-parser/clips_pddl_parser_plugin.cpp} (58%) copy src/{tools/ffinfo/ffinfo.cpp => plugins/clips-pddl-parser/clips_pddl_parser_thread.cpp} (63%) copy src/plugins/{syncpoint-test/test_thread.h => clips-pddl-parser/clips_pddl_parser_thread.h} (62%) rename src/plugins/{clips/pddl => clips-pddl-parser}/effect_visitor.cpp (100%) rename src/plugins/{clips/pddl => clips-pddl-parser}/effect_visitor.h (89%) rename src/plugins/{clips/pddl => clips-pddl-parser}/precondition_visitor.cpp (100%) rename src/plugins/{clips/pddl => clips-pddl-parser}/precondition_visitor.h (88%) - *Diffs* ------------------------------------------------------------- - *commit* 4f1c14b661bb3b51997f5f98bb2eed37eed97a4d - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Feb 22 13:00:12 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll src/plugins/Makefile | 7 ++-- src/plugins/clips-executive/clips/init.clp | 2 +- .../{clips-agent => clips-pddl-parser}/Makefile | 30 +++++++----------- .../clips_pddl_parser_feature.cpp} | 10 +++--- .../clips_pddl_parser_feature.h} | 8 ++-- .../clips_pddl_parser_plugin.cpp} | 29 +++++++++--------- .../clips_pddl_parser_thread.cpp} | 27 +++++------------ .../clips_pddl_parser_thread.h} | 31 +++++++------------ .../pddl => clips-pddl-parser}/effect_visitor.cpp | 0 .../pddl => clips-pddl-parser}/effect_visitor.h | 6 ++-- .../precondition_visitor.cpp | 0 .../precondition_visitor.h | 6 ++-- src/plugins/clips/Makefile | 5 +-- src/plugins/clips/clips_thread.cpp | 2 - 14 files changed, 68 insertions(+), 95 deletions(-) _Diff for modified files_: diff --cc src/plugins/Makefile index 557aa44,ec3b722..6ab4767 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@@ -24,13 -24,12 +24,14 @@@ SUBDIRS = bbsync bblogger webview ttmai skiller luaagent \ laser-filter laser-lines laser-cluster laser-pointclouds \ static_transforms navgraph navgraph-clusters navgraph-generator colli \ - clips clips-agent clips-protobuf clips-webview clips-navgraph clips-ros \ - clips-tf openprs openprs-agent eclipse-clp \ + clips clips-agent clips-protobuf clips-webview clips-navgraph \ + clips-pddl-parser clips-ros clips-tf \ - openprs openprs-agent eclipse-clp \ - mongodb mongodb_log robot-memory clips-robot-memory pddl-robot-memory \ - openrave-robot-memory openni refboxcomm ros player xmlrpc gossip \ ++ openprs openprs-agent eclipse-clp \ + mongodb mongodb_log \ + robot-memory clips-robot-memory pddl-robot-memory openrave-robot-memory \ + openni refboxcomm ros player xmlrpc gossip \ robot_state_publisher gazebo dynamixel navgraph-interactive \ + syncpoint-test \ pddl-planner stn-generator clips-executive include $(BUILDSYSDIR)/rules.mk -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
