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, thofmann/clips-executive-pddl has been updated to f5161226b2af48ae0d54d99e6e099ddec6253f73 (commit) from f45c12972fdc98e653a34ebff1aafb25ec3d68b1 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-pddl 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 f5161226b2af48ae0d54d99e6e099ddec6253f73 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Feb 19 09:45:53 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon Feb 19 16:19:30 2018 +0100 clips: split clips-pddl-parser into a separate plugin The feature is now provided by a separate plugin, so we only need to load it if we actually need it. Also rename the feature from pddl to pddl-parser to distinguish it from the PDDL planning code. http://git.fawkesrobotics.org/fawkes.git/commit/f516122 http://trac.fawkesrobotics.org/changeset/f516122 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *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} | 33 ++++++++----------- .../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, 70 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/{skiller/skiller_feature.h => clips-pddl-parser/clips_pddl_parser_thread.h} (59%) 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* f5161226b2af48ae0d54d99e6e099ddec6253f73 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon Feb 19 09:45:53 2018 +0100 Subject: clips: split clips-pddl-parser into a separate plugin 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} | 33 ++++++++----------- .../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, 70 insertions(+), 95 deletions(-) _Diff for modified files_: diff --git a/src/plugins/Makefile b/src/plugins/Makefile index 39c624f..ec3b722 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -24,8 +24,9 @@ SUBDIRS = bbsync bblogger webview ttmainloop rrd rrdweb \ 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 \ robot_state_publisher gazebo dynamixel navgraph-interactive \ @@ -39,7 +40,7 @@ katana jaco: openrave amcl colli laser-lines navgraph navgraph-generator navgraph-interactive perception robotino: ros mongodb_log: mongodb mongodb: rrd -clips-navgraph clips-agent clips-protobuf clips-tf clips-robot-memory: clips +clips-navgraph clips-agent clips-pddl-parser clips-protobuf clips-tf clips-robot-memory: clips clips-navgraph navgraph-clusters: navgraph clips-webview: clips webview clips-ros: clips ros diff --git a/src/plugins/clips-executive/clips/init.clp b/src/plugins/clips-executive/clips/init.clp index ff9d29e..87339ac 100644 --- a/src/plugins/clips-executive/clips/init.clp +++ b/src/plugins/clips-executive/clips/init.clp @@ -84,7 +84,7 @@ (executive-init) => (printout t "PDDL feature" crlf) - (ff-feature-request "pddl") + (ff-feature-request "pddl-parser") (printout t "Blackboard feature and skill exec init" crlf) (ff-feature-request "blackboard") ) diff --git a/src/plugins/clips/Makefile b/src/plugins/clips/Makefile index 71b27c2..54d7a47 100644 --- a/src/plugins/clips/Makefile +++ b/src/plugins/clips/Makefile @@ -18,10 +18,9 @@ include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDSYSDIR)/clips.mk LIBS_clips = fawkescore fawkesutils fawkesaspects fawkesblackboard \ - fawkesinterface fawkesclipsaspect fawkespddl_parser + fawkesinterface fawkesclipsaspect OBJS_clips = clips_plugin.o clips_thread.o \ - feature_blackboard.o feature_config.o feature_redefine_warning.o \ - feature_pddl.o pddl/precondition_visitor.o pddl/effect_visitor.o + feature_blackboard.o feature_config.o feature_redefine_warning.o OBJS_all = $(OBJS_clips) diff --git a/src/plugins/clips/clips_thread.cpp b/src/plugins/clips/clips_thread.cpp index 2f75647..5f871e5 100644 --- a/src/plugins/clips/clips_thread.cpp +++ b/src/plugins/clips/clips_thread.cpp @@ -23,7 +23,6 @@ #include "clips_thread.h" #include "feature_blackboard.h" #include "feature_config.h" -#include "feature_pddl.h" #include "feature_redefine_warning.h" #include <plugins/clips/aspect/clips_env_manager.h> @@ -73,7 +72,6 @@ CLIPSThread::init() features_.push_back(new BlackboardCLIPSFeature(logger, blackboard, cfg_retract_early)); features_.push_back(new ConfigCLIPSFeature(logger, config)); features_.push_back(new RedefineWarningCLIPSFeature(logger)); - features_.push_back(new PDDLCLIPSFeature(logger)); clips_env_mgr_->add_features(features_); } -- 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
