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 updated
        to  f9bfe876daf6b5cf562da31b7b3c950fda6fbee1 (commit)
       via  f768e7ddba929cf354c7e71f646c17233f5344fc (commit)
       via  0c578f53763afea4bf9ef222b054f1b5cfa0a8e3 (commit)
       via  559b56aa233d8a8480f0736fa3eab9f39727c203 (commit)
       via  2cf4dc4bb25b6779444375df78550ed4b6e90e67 (commit)
       via  d87b61b714a9c77eea8697d053b42fd9b14c25c2 (commit)
       via  ac7cf879b77533cdc706afe79a17496a169c9694 (commit)
       via  7dc316b0a922ca18e24d632b834cc1060fa45546 (commit)
       via  dce07be9146ffbc0d9e88e5a438462decd7fd5c1 (commit)
       via  0bd5b96d1753dbf5b8414ceac7422ed4eda6ba2b (commit)
       via  7041c4e002a9b2adc3c97e813124e3edfc4f980f (commit)
       via  273fb8a22e4405802e7eebb1e34d140e40260e1c (commit)
       via  2d9deb88f21c8aa27c2b8d9f10b74d6617e46816 (commit)
       via  903a772eb9e57c66896d10b79d77348702884a71 (commit)
       via  e570dcea0de2b155604638f626ff724d523a58a4 (commit)
       via  2a80e6e1514bb310afc31fdaf2a6c8fc90b07042 (commit)
      from  dacfdf2dd3beb9b45fc52638f5d612eabd8f5220 (commit)

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

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 f768e7ddba929cf354c7e71f646c17233f5344fc
Merge: dacfdf2 0c578f5
Author:     Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de>
AuthorDate: Thu Dec 1 20:39:03 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de>
CommitDate: Thu Dec 1 20:39:03 2016 +0100

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

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit f9bfe876daf6b5cf562da31b7b3c950fda6fbee1
Merge: f768e7d ac7cf87
Author:     Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de>
AuthorDate: Thu Dec 1 20:39:17 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de>
CommitDate: Thu Dec 1 20:39:17 2016 +0100

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

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

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


- *Summary* -----------------------------------------------------------
 .../interfaces/OpenraveRobotMemoryInterface.cpp    |  199 +++++++++++++++++
 ...rInterface.h => OpenraveRobotMemoryInterface.h} |   46 ++--
 ...ce.tolua => OpenraveRobotMemoryInterface.tolua} |   25 +--
 .../interfaces/OpenraveRobotMemoryInterface.xml    |   18 ++
 ...lipseDebuggerInterface.h => PddlGenInterface.h} |   52 +++--
 src/plugins/Makefile                               |    2 +-
 src/plugins/asp/aspect/Makefile                    |    2 +-
 src/plugins/asp/aspect/clingo_access.cpp           |  108 +++++++---
 src/plugins/asp/aspect/clingo_access.h             |   14 +-
 .../clips_robot_memory_thread.cpp                  |   18 ++
 .../clips-robot-memory/clips_robot_memory_thread.h |    1 +
 src/plugins/openrave-robot-memory/Makefile         |   53 +++++
 .../openrave-robot-memory_plugin.cpp}              |   24 +-
 .../openrave-robot-memory_thread.cpp               |   97 ++++++++
 .../openrave-robot-memory_thread.h}                |   38 ++--
 .../interfaces/PddlGenInterface.cpp                |  235 ++++++++++++++++++++
 .../interfaces/PddlGenInterface.h_ext}             |   52 +++--
 .../interfaces/PddlGenInterface.tolua}             |   28 ++--
 .../robot-memory/computables/computable.cpp        |   11 +-
 src/plugins/robot-memory/computables/computable.h  |    3 +-
 .../computables/computables_manager.cpp            |   53 +++--
 .../robot-memory/computables/computables_manager.h |   16 +-
 .../computables/transform_computable.cpp           |   16 +-
 src/plugins/robot-memory/event_trigger_manager.cpp |    6 +-
 src/plugins/robot-memory/event_trigger_manager.h   |   11 +-
 src/plugins/robot-memory/robot_memory.cpp          |   41 ++++-
 src/plugins/robot-memory/robot_memory.h            |    6 +-
 27 files changed, 965 insertions(+), 210 deletions(-)
 create mode 100644 src/libs/interfaces/OpenraveRobotMemoryInterface.cpp
 copy src/libs/interfaces/{EclipseDebuggerInterface.h => 
OpenraveRobotMemoryInterface.h} (68%)
 copy src/libs/interfaces/{EclipseDebuggerInterface.tolua => 
OpenraveRobotMemoryInterface.tolua} (78%)
 create mode 100644 src/libs/interfaces/OpenraveRobotMemoryInterface.xml
 copy src/libs/interfaces/{EclipseDebuggerInterface.h => PddlGenInterface.h} 
(68%)
 create mode 100644 src/plugins/openrave-robot-memory/Makefile
 copy src/plugins/{clips-robot-memory/clips_robot_memory_plugin.cpp => 
openrave-robot-memory/openrave-robot-memory_plugin.cpp} (61%)
 create mode 100644 
src/plugins/openrave-robot-memory/openrave-robot-memory_thread.cpp
 copy src/plugins/{robot-memory/test-plugin/robot_memory_test_thread.h => 
openrave-robot-memory/openrave-robot-memory_thread.h} (62%)
 create mode 100644 
src/plugins/pddl-robot-memory/interfaces/PddlGenInterface.cpp
 copy src/{libs/interfaces/EclipseDebuggerInterface.h => 
plugins/pddl-robot-memory/interfaces/PddlGenInterface.h_ext} (68%)
 copy src/{libs/interfaces/EclipseDebuggerInterface.tolua => 
plugins/pddl-robot-memory/interfaces/PddlGenInterface.tolua} (78%)


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

- *commit* f768e7ddba929cf354c7e71f646c17233f5344fc - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de>
Date:    Thu Dec 1 20:39:03 2016 +0100
Subject: Merge remote-tracking branch 'origin/bschaepers/asp-aspect' into 
bschaepers/asp-aspect-rm

 src/plugins/asp/aspect/Makefile          |    2 +-
 src/plugins/asp/aspect/clingo_access.cpp |  108 ++++++++++++++++++++++-------
 src/plugins/asp/aspect/clingo_access.h   |   14 +++-
 3 files changed, 94 insertions(+), 30 deletions(-)

_Diff for modified files_:

- *commit* f9bfe876daf6b5cf562da31b7b3c950fda6fbee1 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de>
Date:    Thu Dec 1 20:39:17 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/robot-memory' into 
bschaepers/asp-aspect-rm

 .../interfaces/OpenraveRobotMemoryInterface.cpp    |  199 +++++++++++++++++
 ...rInterface.h => OpenraveRobotMemoryInterface.h} |   46 ++--
 ...ce.tolua => OpenraveRobotMemoryInterface.tolua} |   25 +--
 .../interfaces/OpenraveRobotMemoryInterface.xml    |   18 ++
 ...lipseDebuggerInterface.h => PddlGenInterface.h} |   52 +++--
 src/plugins/Makefile                               |    2 +-
 .../clips_robot_memory_thread.cpp                  |   18 ++
 .../clips-robot-memory/clips_robot_memory_thread.h |    1 +
 src/plugins/openrave-robot-memory/Makefile         |   53 +++++
 .../openrave-robot-memory_plugin.cpp}              |   24 +-
 .../openrave-robot-memory_thread.cpp               |   97 ++++++++
 .../openrave-robot-memory_thread.h}                |   38 ++--
 .../interfaces/PddlGenInterface.cpp                |  235 ++++++++++++++++++++
 .../interfaces/PddlGenInterface.h_ext}             |   52 +++--
 .../interfaces/PddlGenInterface.tolua}             |   28 ++--
 .../robot-memory/computables/computable.cpp        |   11 +-
 src/plugins/robot-memory/computables/computable.h  |    3 +-
 .../computables/computables_manager.cpp            |   53 +++--
 .../robot-memory/computables/computables_manager.h |   16 +-
 .../computables/transform_computable.cpp           |   16 +-
 src/plugins/robot-memory/event_trigger_manager.cpp |    6 +-
 src/plugins/robot-memory/event_trigger_manager.h   |   11 +-
 src/plugins/robot-memory/robot_memory.cpp          |   41 ++++-
 src/plugins/robot-memory/robot_memory.h            |    6 +-
 24 files changed, 871 insertions(+), 180 deletions(-)

_Diff for modified files_:




-- 
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

Reply via email to