[Fawkes Git] branch/bschaepers/asp-aspect-rm: 15 revs updated. (0.5.0-3470-gbcd6c4b)

Bjoern Schaepers bjoern.schaepers at rwth-aachen.de
Wed Nov 23 19:27:51 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 updated
        to  bcd6c4b6a05df9e137db5647d413ddb8d5a75b79 (commit)
       via  7eb017e889f811111fb497084f62486be07b8081 (commit)
       via  2d2427904bcf3ce87ee43a25405e178704dd3683 (commit)
       via  3457738aea5417e69eae233c75936e1b5322bfcb (commit)
       via  78dcd9dcc6ae8ef57e0b68585584b24297aeadb1 (commit)
       via  c909ed2f6a3ada8913d2b8eba7359de2b97ab122 (commit)
       via  56f59c110451cefa6fe710c81fdd70c21be2ae98 (commit)
       via  e8cf33dae85c18bc0355e526c62801f76799ec25 (commit)
       via  e13a374860b10df30609adae6bf45a233f7f1925 (commit)
       via  245423ecb8eb908f6586ff3a5658b7df08beaaa5 (commit)
       via  1e06162eb22da1b7715c7684968c8ff0a77b3237 (commit)
       via  07f7e5cf910ae74eddc6ff63be9ce99d19c56a09 (commit)
       via  ccb31729db73b7f7b75ab477466e35760d92c02b (commit)
       via  899cf264ac4bfcc5125896d26ef30150de1822e9 (commit)
       via  633dee11eaa1fa70cbecb793b4bd7cb9cb73949e (commit)
      from  c4f28dd825f3c9ed9110f854e0b9468f27aeb591 (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 1e06162eb22da1b7715c7684968c8ff0a77b3237
Merge: c4f28dd 07f7e5c
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Tue Nov 15 11:55:17 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Tue Nov 15 11:55:17 2016 +0100

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

http://git.fawkesrobotics.org/fawkes.git/commit/1e06162
http://trac.fawkesrobotics.org/changeset/1e06162

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit e13a374860b10df30609adae6bf45a233f7f1925
Merge: 1e06162 245423e
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Mon Nov 21 18:03:35 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Mon Nov 21 18:03:35 2016 +0100

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

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 7eb017e889f811111fb497084f62486be07b8081
Merge: e13a374 c909ed2
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 23 19:27:35 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 23 19:27:35 2016 +0100

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

http://git.fawkesrobotics.org/fawkes.git/commit/7eb017e
http://trac.fawkesrobotics.org/changeset/7eb017e

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit bcd6c4b6a05df9e137db5647d413ddb8d5a75b79
Merge: 7eb017e 2d24279
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 23 19:27:44 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 23 19:27:44 2016 +0100

    Merge branch 'bschaepers/asp-aspect' into bschaepers/asp-aspect-rm

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

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


- *Summary* -----------------------------------------------------------
 src/plugins/asp/Makefile                           |    2 +-
 src/plugins/asp/aspect/clingo_access.cpp           |    4 +-
 .../clips_robot_memory_thread.cpp                  |    5 +-
 src/plugins/clips-robot-memory/robot-memory.clp    |   15 ++-
 .../computables/blackboard_computable.cpp          |    4 +-
 .../computables/blackboard_computable.h            |    2 +-
 .../robot-memory/computables/computable.cpp        |    4 +-
 src/plugins/robot-memory/computables/computable.h  |    4 +-
 .../robot-memory/computables/computables_manager.h |    4 +-
 .../computables/transform_computable.cpp           |  112 ++++++++++++++++++++
 ...ckboard_computable.h => transform_computable.h} |   34 +++---
 src/plugins/robot-memory/event_trigger_manager.cpp |   28 ++++--
 src/plugins/robot-memory/event_trigger_manager.h   |    6 +-
 src/plugins/robot-memory/robot_memory.cpp          |    6 +-
 src/plugins/robot-memory/robot_memory.h            |    4 +-
 src/plugins/robot-memory/robot_memory_setup.cpp    |   12 +-
 src/plugins/robot-memory/robot_memory_setup.h      |    2 +
 src/plugins/robot-memory/robot_memory_thread.cpp   |    4 +-
 src/plugins/robot-memory/robot_memory_thread.h     |    4 +
 .../robot-memory/test-plugin/robot_memory_test.cpp |   19 +++-
 .../robot-memory/test-plugin/robot_memory_test.h   |    6 +-
 src/tools/gtest/gtest_fawkes.cpp                   |    2 +-
 22 files changed, 218 insertions(+), 65 deletions(-)
 create mode 100644 src/plugins/robot-memory/computables/transform_computable.cpp
 copy src/plugins/robot-memory/computables/{blackboard_computable.h => transform_computable.h} (51%)


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

- *commit* 1e06162eb22da1b7715c7684968c8ff0a77b3237 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Tue Nov 15 11:55:17 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/robot-memory' into bschaepers/asp-aspect-rm

 .../clips_robot_memory_thread.cpp                  |    5 +++--
 src/plugins/clips-robot-memory/robot-memory.clp    |   15 ++++++++++-----
 src/plugins/robot-memory/robot_memory_setup.cpp    |   12 ++++++------
 src/plugins/robot-memory/robot_memory_setup.h      |    2 ++
 4 files changed, 21 insertions(+), 13 deletions(-)

_Diff for modified files_:

- *commit* e13a374860b10df30609adae6bf45a233f7f1925 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Mon Nov 21 18:03:35 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/robot-memory' into bschaepers/asp-aspect-rm

 src/plugins/robot-memory/event_trigger_manager.cpp |   28 +++++++++++++++-----
 src/plugins/robot-memory/event_trigger_manager.h   |    6 +++-
 2 files changed, 25 insertions(+), 9 deletions(-)

_Diff for modified files_:

- *commit* 7eb017e889f811111fb497084f62486be07b8081 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 23 19:27:35 2016 +0100
Subject: Merge remote-tracking branch 'origin/fzwilling/robot-memory' into bschaepers/asp-aspect-rm

 .../computables/blackboard_computable.cpp          |    4 +-
 .../computables/blackboard_computable.h            |    2 +-
 .../robot-memory/computables/computable.cpp        |    4 +-
 src/plugins/robot-memory/computables/computable.h  |    4 +-
 .../robot-memory/computables/computables_manager.h |    4 +-
 .../computables/transform_computable.cpp           |  112 ++++++++++++++++++++
 ...ckboard_computable.h => transform_computable.h} |   34 +++---
 src/plugins/robot-memory/robot_memory.cpp          |    6 +-
 src/plugins/robot-memory/robot_memory.h            |    4 +-
 src/plugins/robot-memory/robot_memory_thread.cpp   |    4 +-
 src/plugins/robot-memory/robot_memory_thread.h     |    4 +
 .../robot-memory/test-plugin/robot_memory_test.cpp |   19 +++-
 .../robot-memory/test-plugin/robot_memory_test.h   |    6 +-
 src/tools/gtest/gtest_fawkes.cpp                   |    2 +-
 14 files changed, 169 insertions(+), 40 deletions(-)

_Diff for modified files_:

- *commit* bcd6c4b6a05df9e137db5647d413ddb8d5a75b79 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 23 19:27:44 2016 +0100
Subject: Merge branch 'bschaepers/asp-aspect' into bschaepers/asp-aspect-rm

 src/plugins/asp/Makefile                 |    2 +-
 src/plugins/asp/aspect/clingo_access.cpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

_Diff for modified files_:




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


More information about the fawkes-commits mailing list