[Fawkes Git] branch/bschaepers/asp-aspect-rm: created (0.5.0-3455-gc4f28dd)

Bjoern Schaepers bjoern.schaepers at rwth-aachen.de
Wed Nov 9 17:26:30 CET 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, bschaepers/asp-aspect-rm has been created
        at  c4f28dd825f3c9ed9110f854e0b9468f27aeb591 (commit)

http://git.fawkesrobotics.org/fawkes.git/bschaepers/asp-aspect-rm

- *Log* ---------------------------------------------------------------
commit 9526d2bf3d6c60ef7c791e27d458e73553bf1333
Merge: 16df52d b5129eb
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 9 17:25:51 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:25:51 2016 +0100

    Merge remote-tracking branch 'origin/fzwilling/sub_process' into bschaepers/asp-aspect-rm

http://git.fawkesrobotics.org/fawkes.git/commit/9526d2b
http://trac.fawkesrobotics.org/changeset/9526d2b

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit c4f28dd825f3c9ed9110f854e0b9468f27aeb591
Merge: 9526d2b 7814803
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 9 17:26:00 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:26:00 2016 +0100

    Merge remote-tracking branch 'origin/fzwilling/robot-memory' into bschaepers/asp-aspect-rm

http://git.fawkesrobotics.org/fawkes.git/commit/c4f28dd
http://trac.fawkesrobotics.org/changeset/c4f28dd

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 cfg/conf.d/robot-memory.yaml                       |   13 +
 src/libs/interfaces/RobotMemoryInterface.h         |  206 ++++++
 src/libs/utils/misc/string_conversions.cpp         |    1 +
 src/plugins/Makefile                               |    6 +-
 src/plugins/clips-robot-memory/Makefile            |   60 ++
 .../clips-robot-memory/clips_rm_trigger.cpp        |   84 +++
 src/plugins/clips-robot-memory/clips_rm_trigger.h  |   52 ++
 .../clips_robot_memory_plugin.cpp                  |   48 ++
 .../clips_robot_memory_thread.cpp                  |  718 +++++++++++++++++++
 .../clips-robot-memory/clips_robot_memory_thread.h |  103 +++
 src/plugins/clips-robot-memory/robot-memory.clp    |   90 +++
 src/plugins/mongodb/mongodb_thread.cpp             |    2 +-
 src/plugins/pddl-robot-memory/Makefile             |   62 ++
 src/plugins/pddl-robot-memory/ctemplate.mk         |   33 +
 src/plugins/pddl-robot-memory/interfaces/Makefile  |   24 +
 .../interfaces/PddlGenInterface.xml                |   21 +
 .../pddl-robot-memory/pddl_robot_memory_plugin.cpp |   48 ++
 .../pddl-robot-memory/pddl_robot_memory_thread.cpp |  243 +++++++
 .../pddl-robot-memory/pddl_robot_memory_thread.h   |   76 ++
 src/plugins/robot-memory/Makefile                  |   66 ++
 src/plugins/robot-memory/aspect/Makefile           |   46 ++
 .../robot-memory/aspect/robot_memory_aspect.cpp    |   53 ++
 .../robot-memory/aspect/robot_memory_aspect.h      |   55 ++
 .../robot-memory/aspect/robot_memory_inifin.cpp    |   79 +++
 .../robot-memory/aspect/robot_memory_inifin.h      |   47 ++
 .../computables/blackboard_computable.cpp          |  122 ++++
 .../computables/blackboard_computable.h            |   50 ++
 .../robot-memory/computables/computable.cpp        |   84 +++
 src/plugins/robot-memory/computables/computable.h  |   44 ++
 .../computables/computables_manager.cpp            |  118 ++++
 .../robot-memory/computables/computables_manager.h |   73 ++
 src/plugins/robot-memory/event_trigger.cpp         |   33 +
 src/plugins/robot-memory/event_trigger.h           |   51 ++
 src/plugins/robot-memory/event_trigger_manager.cpp |  102 +++
 src/plugins/robot-memory/event_trigger_manager.h   |  110 +++
 src/plugins/robot-memory/interfaces/Makefile       |   24 +
 .../interfaces/RobotMemoryInterface.cpp            |  732 ++++++++++++++++++++
 .../interfaces/RobotMemoryInterface.h_ext          |  206 ++++++
 .../interfaces/RobotMemoryInterface.tolua          |  194 ++++++
 .../interfaces/RobotMemoryInterface.xml            |   43 ++
 src/plugins/robot-memory/robot_memory.cpp          |  506 ++++++++++++++
 src/plugins/robot-memory/robot_memory.h            |  142 ++++
 src/plugins/robot-memory/robot_memory_plugin.cpp   |   66 ++
 src/plugins/robot-memory/robot_memory_setup.cpp    |  250 +++++++
 src/plugins/robot-memory/robot_memory_setup.h      |   61 ++
 src/plugins/robot-memory/robot_memory_thread.cpp   |  112 +++
 src/plugins/robot-memory/robot_memory_thread.h     |   73 ++
 src/plugins/robot-memory/test-plugin/Makefile      |   47 ++
 .../robot-memory/test-plugin/robot_memory_test.cpp |  319 +++++++++
 .../robot-memory/test-plugin/robot_memory_test.h   |  121 ++++
 .../test-plugin/robot_memory_test_plugin.cpp       |   48 ++
 .../test-plugin/robot_memory_test_thread.cpp       |   67 ++
 .../test-plugin/robot_memory_test_thread.h         |   65 ++
 src/tools/gtest/Makefile                           |   48 ++
 src/tools/gtest/gtest_fawkes.cpp                   |   74 ++
 55 files changed, 6218 insertions(+), 3 deletions(-)
 create mode 100644 cfg/conf.d/robot-memory.yaml
 create mode 100644 src/libs/interfaces/RobotMemoryInterface.h
 create mode 100644 src/plugins/clips-robot-memory/Makefile
 create mode 100644 src/plugins/clips-robot-memory/clips_rm_trigger.cpp
 create mode 100644 src/plugins/clips-robot-memory/clips_rm_trigger.h
 create mode 100644 src/plugins/clips-robot-memory/clips_robot_memory_plugin.cpp
 create mode 100644 src/plugins/clips-robot-memory/clips_robot_memory_thread.cpp
 create mode 100644 src/plugins/clips-robot-memory/clips_robot_memory_thread.h
 create mode 100644 src/plugins/clips-robot-memory/robot-memory.clp
 create mode 100644 src/plugins/pddl-robot-memory/Makefile
 create mode 100644 src/plugins/pddl-robot-memory/ctemplate.mk
 create mode 100644 src/plugins/pddl-robot-memory/interfaces/Makefile
 create mode 100644 src/plugins/pddl-robot-memory/interfaces/PddlGenInterface.xml
 create mode 100644 src/plugins/pddl-robot-memory/pddl_robot_memory_plugin.cpp
 create mode 100644 src/plugins/pddl-robot-memory/pddl_robot_memory_thread.cpp
 create mode 100644 src/plugins/pddl-robot-memory/pddl_robot_memory_thread.h
 create mode 100644 src/plugins/robot-memory/Makefile
 create mode 100644 src/plugins/robot-memory/aspect/Makefile
 create mode 100644 src/plugins/robot-memory/aspect/robot_memory_aspect.cpp
 create mode 100644 src/plugins/robot-memory/aspect/robot_memory_aspect.h
 create mode 100644 src/plugins/robot-memory/aspect/robot_memory_inifin.cpp
 create mode 100644 src/plugins/robot-memory/aspect/robot_memory_inifin.h
 create mode 100644 src/plugins/robot-memory/computables/blackboard_computable.cpp
 create mode 100644 src/plugins/robot-memory/computables/blackboard_computable.h
 create mode 100644 src/plugins/robot-memory/computables/computable.cpp
 create mode 100644 src/plugins/robot-memory/computables/computable.h
 create mode 100644 src/plugins/robot-memory/computables/computables_manager.cpp
 create mode 100644 src/plugins/robot-memory/computables/computables_manager.h
 create mode 100644 src/plugins/robot-memory/event_trigger.cpp
 create mode 100644 src/plugins/robot-memory/event_trigger.h
 create mode 100644 src/plugins/robot-memory/event_trigger_manager.cpp
 create mode 100644 src/plugins/robot-memory/event_trigger_manager.h
 create mode 100644 src/plugins/robot-memory/interfaces/Makefile
 create mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.cpp
 create mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.h_ext
 create mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.tolua
 create mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.xml
 create mode 100644 src/plugins/robot-memory/robot_memory.cpp
 create mode 100644 src/plugins/robot-memory/robot_memory.h
 create mode 100644 src/plugins/robot-memory/robot_memory_plugin.cpp
 create mode 100644 src/plugins/robot-memory/robot_memory_setup.cpp
 create mode 100644 src/plugins/robot-memory/robot_memory_setup.h
 create mode 100644 src/plugins/robot-memory/robot_memory_thread.cpp
 create mode 100644 src/plugins/robot-memory/robot_memory_thread.h
 create mode 100644 src/plugins/robot-memory/test-plugin/Makefile
 create mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test.cpp
 create mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test.h
 create mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test_plugin.cpp
 create mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test_thread.cpp
 create mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test_thread.h
 create mode 100644 src/tools/gtest/Makefile
 create mode 100644 src/tools/gtest/gtest_fawkes.cpp


- *Diffs* -------------------------------------------------------------

- *commit* 9526d2bf3d6c60ef7c791e27d458e73553bf1333 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 9 17:25:51 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/sub_process' into bschaepers/asp-aspect-rm

 src/libs/utils/Makefile                            |   40 ++++++++++++++++++--
 .../utils/misc/string_commands.cpp}                |    3 +-
 .../string.h => libs/utils/misc/string_commands.h} |    6 +-
 .../utils => libs/utils/sub_process}/proc.cpp      |    0
 .../utils => libs/utils/sub_process}/proc.h        |    0
 src/plugins/colli/search/astar.cpp                 |   20 +++++-----
 src/plugins/colli/search/astar.h                   |    6 +-
 src/plugins/colli/search/astar_search.cpp          |    2 +-
 src/plugins/colli/search/astar_search.h            |    4 +-
 .../openprs/aspect/openprs_kernel_manager.cpp      |    4 +-
 10 files changed, 59 insertions(+), 26 deletions(-)

_Diff for modified files_:

- *commit* c4f28dd825f3c9ed9110f854e0b9468f27aeb591 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 9 17:26:00 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/robot-memory' into bschaepers/asp-aspect-rm

 cfg/conf.d/robot-memory.yaml                       |   13 +
 src/libs/interfaces/RobotMemoryInterface.h         |  206 ++++++
 src/libs/utils/misc/string_conversions.cpp         |    1 +
 src/plugins/Makefile                               |    6 +-
 src/plugins/clips-robot-memory/Makefile            |   60 ++
 .../clips-robot-memory/clips_rm_trigger.cpp        |   84 +++
 src/plugins/clips-robot-memory/clips_rm_trigger.h  |   52 ++
 .../clips_robot_memory_plugin.cpp                  |   48 ++
 .../clips_robot_memory_thread.cpp                  |  718 +++++++++++++++++++
 .../clips-robot-memory/clips_robot_memory_thread.h |  103 +++
 src/plugins/clips-robot-memory/robot-memory.clp    |   90 +++
 src/plugins/mongodb/mongodb_thread.cpp             |    2 +-
 src/plugins/pddl-robot-memory/Makefile             |   62 ++
 src/plugins/pddl-robot-memory/ctemplate.mk         |   33 +
 src/plugins/pddl-robot-memory/interfaces/Makefile  |   24 +
 .../interfaces/PddlGenInterface.xml                |   21 +
 .../pddl-robot-memory/pddl_robot_memory_plugin.cpp |   48 ++
 .../pddl-robot-memory/pddl_robot_memory_thread.cpp |  243 +++++++
 .../pddl-robot-memory/pddl_robot_memory_thread.h   |   76 ++
 src/plugins/robot-memory/Makefile                  |   66 ++
 src/plugins/robot-memory/aspect/Makefile           |   46 ++
 .../robot-memory/aspect/robot_memory_aspect.cpp    |   53 ++
 .../robot-memory/aspect/robot_memory_aspect.h      |   55 ++
 .../robot-memory/aspect/robot_memory_inifin.cpp    |   79 +++
 .../robot-memory/aspect/robot_memory_inifin.h      |   47 ++
 .../computables/blackboard_computable.cpp          |  122 ++++
 .../computables/blackboard_computable.h            |   50 ++
 .../robot-memory/computables/computable.cpp        |   84 +++
 src/plugins/robot-memory/computables/computable.h  |   44 ++
 .../computables/computables_manager.cpp            |  118 ++++
 .../robot-memory/computables/computables_manager.h |   73 ++
 src/plugins/robot-memory/event_trigger.cpp         |   33 +
 src/plugins/robot-memory/event_trigger.h           |   51 ++
 src/plugins/robot-memory/event_trigger_manager.cpp |  102 +++
 src/plugins/robot-memory/event_trigger_manager.h   |  110 +++
 src/plugins/robot-memory/interfaces/Makefile       |   24 +
 .../interfaces/RobotMemoryInterface.cpp            |  732 ++++++++++++++++++++
 .../interfaces/RobotMemoryInterface.h_ext          |  206 ++++++
 .../interfaces/RobotMemoryInterface.tolua          |  194 ++++++
 .../interfaces/RobotMemoryInterface.xml            |   43 ++
 src/plugins/robot-memory/robot_memory.cpp          |  506 ++++++++++++++
 src/plugins/robot-memory/robot_memory.h            |  142 ++++
 src/plugins/robot-memory/robot_memory_plugin.cpp   |   66 ++
 src/plugins/robot-memory/robot_memory_setup.cpp    |  250 +++++++
 src/plugins/robot-memory/robot_memory_setup.h      |   61 ++
 src/plugins/robot-memory/robot_memory_thread.cpp   |  112 +++
 src/plugins/robot-memory/robot_memory_thread.h     |   73 ++
 src/plugins/robot-memory/test-plugin/Makefile      |   47 ++
 .../robot-memory/test-plugin/robot_memory_test.cpp |  319 +++++++++
 .../robot-memory/test-plugin/robot_memory_test.h   |  121 ++++
 .../test-plugin/robot_memory_test_plugin.cpp       |   48 ++
 .../test-plugin/robot_memory_test_thread.cpp       |   67 ++
 .../test-plugin/robot_memory_test_thread.h         |   65 ++
 src/tools/gtest/Makefile                           |   48 ++
 src/tools/gtest/gtest_fawkes.cpp                   |   74 ++
 55 files changed, 6218 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --cc src/plugins/Makefile
index 0a56ea9,b0e0275..850ce5c
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@@ -26,10 -26,9 +26,10 @@@ SUBDIRS	= bbsync bblogger webview ttmai
  	  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 \
- 	  mongodb mongodb_log \
+ 	  mongodb mongodb_log robot-memory clips-robot-memory pddl-robot-memory \
  	  openni refboxcomm ros player xmlrpc gossip \
 -	  robot_state_publisher gazebo dynamixel navgraph-interactive
 +	  robot_state_publisher gazebo dynamixel navgraph-interactive \
 +	  asp
  
  include $(BUILDSYSDIR)/rules.mk
  




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list