[Fawkes Git] branch/bschaepers/asp-aspect: 10 revs updated. (0.5.0-3377-g16df52d)

Bjoern Schaepers bjoern.schaepers at rwth-aachen.de
Wed Nov 9 17:25:26 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 has been updated
  discards  ba11c03fde668bd4032f410d40207d8be5b57bff (commit)
  discards  30df6e1ce34fe1d916bbe0b72aca5770da5d0c8f (commit)
  discards  1a65fac5858d004f250f7f8fb12eec4b18aa4ab9 (commit)
  discards  748f69bbfbc0786c9582c7155b1b7a49d08ff30a (commit)
  discards  a3d9f59247cb0ee73a36e5d1a5ebc3343da12d76 (commit)
  discards  a9e2d8b59531106c5f6b983af6582da67fb5b0f4 (commit)
  discards  42ff578e47ba3aa4ac7a8fd277489171fd346cfb (commit)
  discards  e12a79a33ecd6c77f606be97389793f30dd0d9ae (commit)
  discards  e9e72cbfd7c4d18b6da09b9ad2853c11140c8f65 (commit)
  discards  4be6453b104a252de0ad2b36b687b69acbbf2ae8 (commit)
  discards  0d9b7324776d159cbe24ee38e45357b514fabd80 (commit)
  discards  e2448185a39937f55f6af0ac83fe53d7f36d022d (commit)
  discards  3e99a68634599ec5edbc7be768a9f355cb3fe98d (commit)
  discards  c423af4fb1448469decbaa0881f541102aa6ef09 (commit)
  discards  090f5c8d016f74f4de337afc58b06df3d9053bb2 (commit)
  discards  8fdff7fd8afdc28f5b291075101d7d9d6edcbc84 (commit)
  discards  c20e3c16dd4b6000260133478430aac17c123ea3 (commit)
  discards  3d9c85898fbc6cc3b1b952ee1787b6c23930e733 (commit)
  discards  ed6a5cb70405c9de549f75590d3bb2bde81055ca (commit)
  discards  7814803c8ce13e0666c543396995a231d17c0445 (commit)
  discards  f64cfa12b704ecc677ce5b96a190c52e69669f72 (commit)
  discards  a0cafa1d28dabf7f1bf3971c23d33f8bd4265c5a (commit)
  discards  d7a9d81267efdd9de03b433771d9b6c406f80d7b (commit)
  discards  57d984fa1b912f98e5c9fd89d626a7f9e99ad93c (commit)
  discards  4c48028893519f687c05948383ab0f4ed9092f8d (commit)
  discards  60b435c6524e8d4411feca88d83007991ec2784e (commit)
  discards  be4214aee6d19210d3449972c9b04f4f2f94d465 (commit)
  discards  5c9f7492f882f64585825845aecd4adef3ec0f15 (commit)
  discards  158cbdefb42524f5a575b1797f96e5478fb345fd (commit)
  discards  d08ddcdd5271f7ea692462522711841cf6ca256f (commit)
  discards  55bcabed2dec2c073f34f7eb445e05a2c00d1742 (commit)
  discards  c7528c3032adb961f2714b0df4298a5bc3258189 (commit)
  discards  8d18688c45ea10aa3338cafa6d4227c11b5b9d0d (commit)
  discards  6eafa9c64e30efac5b8cfdf40f2ddc8bb583c548 (commit)
  discards  9f9428d0400c6adfb685415af6ac8e0bf6bd26be (commit)
  discards  4c3a6a6b87d41755bb9d383afae20b24dac70224 (commit)
  discards  5387a75bae1e0ce106f8c9e21a6226411d845621 (commit)
  discards  7c6cda7df994d2355c46debc88d29b906cf3f99d (commit)
  discards  e1e2264aa7bfe8ac10bf83dfc7e6eacd9bdd3431 (commit)
  discards  d3cafa435a8a919c85c087a0eed1dd79228d0146 (commit)
  discards  22e48fb6e702b0210210ed6032be870178eb64fe (commit)
  discards  ebb35b54b721f0e6479a2e600e8a89cb7d269560 (commit)
  discards  53d178b07bfcf2d3ebbfe7032c12cddb92c05439 (commit)
  discards  325821df6a31cb7702cf5a330e4910b1748921e0 (commit)
  discards  ef3d9a20b40ecd024a8143b6f603ac620ec70e43 (commit)
  discards  4270c488e8edeb250df1258dfd6a915e836174b3 (commit)
  discards  386a339d826b1bf9d0947d5f0879f8e53438c95c (commit)
  discards  5729d6f402028c886397bce50000dd9d44fd9d18 (commit)
  discards  5173577ed6812e699e22143881e221a09629e707 (commit)
  discards  19d0fbfafa5901603ac07a8dd13cc6021f0350a0 (commit)
  discards  d5cc3a8454a34cb3661f409dcfd67262fb5f5b0d (commit)
  discards  365c95966cad4aac69ea73323cec4f2098ab1531 (commit)
  discards  0ba989a955956994feb728db46859943183c089f (commit)
  discards  291d8475b466d01f1be661bcc8a5b1a96f923ef4 (commit)
  discards  a03d31e17ffb0d8a1d5ddb1a791c5d5f4dddab8b (commit)
  discards  67666871ebc5ba66f3b874a6448dfdac84d52435 (commit)
  discards  ae75a1bf012916533f7c608c5d61ed8b53e706c0 (commit)
  discards  553e17b178e18bd0dc814b99ed22a28331e248cd (commit)
  discards  04a3c63656cd488bbd7b3f06f976333f9db6e5d2 (commit)
  discards  69195c38a75ac601772b9cabd4dad09040d421eb (commit)
  discards  54478d8068bd92d09e339929974a5ce260b54089 (commit)
  discards  c0357cb0cb7d0e11834b83ccdd3edfb6f1f3ac5a (commit)
  discards  de73a7db12983440d1d4de7f5103f13660f4b24f (commit)
  discards  3af7d94677205381ecd336b048dc8c33c7dcf9a5 (commit)
  discards  b9f7287e9839760b67c07f4365d0034c34276a5c (commit)
  discards  9cf08148999af9ae0f74eb3a719fa56d1e4c7864 (commit)
  discards  cdecfb075141a21d62f4ef1ac0590403fd5c34fc (commit)
  discards  e47565a0598910e69d3e397856afd2c91d0270bc (commit)
  discards  5bf7f961a90888869504f86b926602ad9ac2e766 (commit)
  discards  d8a0684480e717cd1b12178067cbe4a1e1b10806 (commit)
  discards  6b6a1772bf007d4b0be9e9d75f8870c16bd4fa04 (commit)
  discards  a184dc8ad586101023be35bca4c8cb577ba45e42 (commit)
  discards  aedae1b4e6c33806c65789fe094d22c5c5e528ea (commit)
  discards  0121b82476f370d33e5cd1c58cc5a55d2aa083a1 (commit)
  discards  fd1d110a8cb83eb931efce4056f47e1ca531cc26 (commit)
  discards  43c0ff74262a4175f7ef4311440e09b2d3fb979f (commit)
  discards  24573f491e916ea4fe2dd1948c4f091566401c6a (commit)
  discards  7d86c6fc167acc2d6ff0f95fc7692dee31d2c463 (commit)
  discards  b2a5231a1ba736c9114a903556300e3c61da6fcb (commit)
  discards  4bb5f4709e414612659dbedeb42384d5661b6530 (commit)
  discards  63d7186f6cdd37d715aeb7b57c953049f2e33673 (commit)
  discards  15fad015e6794700d1da6ebd09cbb1ddee61efb4 (commit)
  discards  6bbf4ea6838a733dcf3f8e8c9603f0a9bbf265d6 (commit)
  discards  caec699dd3e4fdc46781bc6104c4ca052f688009 (commit)
  discards  7138569cfccbbf9efc8ee18131cdf03c21f410da (commit)
  discards  8806eb005879a2e879217f00cad88fb8f7cdaa15 (commit)
        to  16df52d8b40c32073247705bea0b3a7ff972b933 (commit)
       via  bcf93253cf185c93bd9f61e475c2749f89fb6102 (commit)
       via  4ac324755ab2aef922b89b03278843d0ccb4f3e7 (commit)
       via  8eda35d1cd8ccd8dde515a7e37f765ff0c026b96 (commit)
       via  2e1d72279762dd8adc3dd8e5a4f4582e46243232 (commit)
       via  6d021fd5821e24db0ad2275ff8464305a1a1452a (commit)
       via  583c341762b9e98a25764873082d0b9c43231653 (commit)
       via  365d0c71d2ac103e951240990c17e24c88426c67 (commit)
       via  1890c4853eaa26a06f320e1bd430cdb97afeedae (commit)
       via  92acf8c0da8944bc25b56048c85968a8ee3102b9 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (ba11c03fde668bd4032f410d40207d8be5b57bff)
            \
             N -- N -- N (16df52d8b40c32073247705bea0b3a7ff972b933)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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

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 92acf8c0da8944bc25b56048c85968a8ee3102b9
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Thu Oct 20 16:33:40 2016 +0200
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:57 2016 +0100

    Added ASP aspect.

http://git.fawkesrobotics.org/fawkes.git/commit/92acf8c
http://trac.fawkesrobotics.org/changeset/92acf8c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 1890c4853eaa26a06f320e1bd430cdb97afeedae
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Thu Oct 20 23:19:33 2016 +0200
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:57 2016 +0100

    ASP Aspect: Use Fawkes logging for Clingo.

http://git.fawkesrobotics.org/fawkes.git/commit/1890c48
http://trac.fawkesrobotics.org/changeset/1890c48

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 365d0c71d2ac103e951240990c17e24c88426c67
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Thu Oct 27 16:57:30 2016 +0200
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASP-Aspect: Added ClingoControlManager
    
    Similar to CLIPSEnvManager.
    Not yet used by the aspects.

http://git.fawkesrobotics.org/fawkes.git/commit/365d0c7
http://trac.fawkesrobotics.org/changeset/365d0c7

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 583c341762b9e98a25764873082d0b9c43231653
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Sat Oct 29 11:50:46 2016 +0200
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASP-Aspect: Added ClingoManagerAspect.
    
    Still not in use.

http://git.fawkesrobotics.org/fawkes.git/commit/583c341
http://trac.fawkesrobotics.org/changeset/583c341

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6d021fd5821e24db0ad2275ff8464305a1a1452a
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Sun Oct 30 13:57:12 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASP-Aspect: Prepared aspect and inifin for the control manager.

http://git.fawkesrobotics.org/fawkes.git/commit/6d021fd
http://trac.fawkesrobotics.org/changeset/6d021fd

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 2e1d72279762dd8adc3dd8e5a4f4582e46243232
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Sun Oct 30 20:52:38 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASPAspect: Use the clingo control manager for the aspects.

http://git.fawkesrobotics.org/fawkes.git/commit/2e1d722
http://trac.fawkesrobotics.org/changeset/2e1d722

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 8eda35d1cd8ccd8dde515a7e37f765ff0c026b96
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Mon Oct 31 16:26:27 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASP-Aspect: Added access wrapper class.
    
    This way the model symbols are stored next to the clingo control and
    user of the control manager have access to the symbols and not only the
    solver.

http://git.fawkesrobotics.org/fawkes.git/commit/8eda35d
http://trac.fawkesrobotics.org/changeset/8eda35d

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 4ac324755ab2aef922b89b03278843d0ccb4f3e7
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Mon Oct 31 16:44:19 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASP-Aspect: Use a different name for the member.
    
    Clingo is also the name of the namespace, this confuses syntax
    highlighting and may confuse humans too, so change it.

http://git.fawkesrobotics.org/fawkes.git/commit/4ac3247
http://trac.fawkesrobotics.org/changeset/4ac3247

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit bcf93253cf185c93bd9f61e475c2749f89fb6102
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Mon Oct 31 17:04:05 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASP-Aspect: Added external handling.

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 16df52d8b40c32073247705bea0b3a7ff972b933
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 2 11:44:34 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 9 17:24:58 2016 +0100

    ASP-Aspect: Add the asp plugin to the Makefile.

http://git.fawkesrobotics.org/fawkes.git/commit/16df52d
http://trac.fawkesrobotics.org/changeset/16df52d

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/robot-memory.yaml                       |   13 -
 src/libs/interfaces/RobotMemoryInterface.h         |  206 ------
 src/libs/utils/Makefile                            |   40 +-
 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/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 +-
 src/plugins/mongodb/mongodb_thread.cpp             |    2 +-
 .../openprs/aspect/openprs_kernel_manager.cpp      |    4 +-
 .../sub_process => plugins/openprs/utils}/proc.cpp |    0
 .../sub_process => plugins/openprs/utils}/proc.h   |    0
 .../openprs/utils/string.cpp}                      |    3 +-
 .../openprs/utils/string.h}                        |    6 +-
 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 --
 65 files changed, 29 insertions(+), 6277 deletions(-)
 delete mode 100644 cfg/conf.d/robot-memory.yaml
 delete mode 100644 src/libs/interfaces/RobotMemoryInterface.h
 delete mode 100644 src/plugins/clips-robot-memory/Makefile
 delete mode 100644 src/plugins/clips-robot-memory/clips_rm_trigger.cpp
 delete mode 100644 src/plugins/clips-robot-memory/clips_rm_trigger.h
 delete mode 100644 src/plugins/clips-robot-memory/clips_robot_memory_plugin.cpp
 delete mode 100644 src/plugins/clips-robot-memory/clips_robot_memory_thread.cpp
 delete mode 100644 src/plugins/clips-robot-memory/clips_robot_memory_thread.h
 delete mode 100644 src/plugins/clips-robot-memory/robot-memory.clp
 rename src/{libs/utils/sub_process => plugins/openprs/utils}/proc.cpp (100%)
 rename src/{libs/utils/sub_process => plugins/openprs/utils}/proc.h (100%)
 rename src/{libs/utils/misc/string_commands.cpp => plugins/openprs/utils/string.cpp} (98%)
 rename src/{libs/utils/misc/string_commands.h => plugins/openprs/utils/string.h} (90%)
 delete mode 100644 src/plugins/pddl-robot-memory/Makefile
 delete mode 100644 src/plugins/pddl-robot-memory/ctemplate.mk
 delete mode 100644 src/plugins/pddl-robot-memory/interfaces/Makefile
 delete mode 100644 src/plugins/pddl-robot-memory/interfaces/PddlGenInterface.xml
 delete mode 100644 src/plugins/pddl-robot-memory/pddl_robot_memory_plugin.cpp
 delete mode 100644 src/plugins/pddl-robot-memory/pddl_robot_memory_thread.cpp
 delete mode 100644 src/plugins/pddl-robot-memory/pddl_robot_memory_thread.h
 delete mode 100644 src/plugins/robot-memory/Makefile
 delete mode 100644 src/plugins/robot-memory/aspect/Makefile
 delete mode 100644 src/plugins/robot-memory/aspect/robot_memory_aspect.cpp
 delete mode 100644 src/plugins/robot-memory/aspect/robot_memory_aspect.h
 delete mode 100644 src/plugins/robot-memory/aspect/robot_memory_inifin.cpp
 delete mode 100644 src/plugins/robot-memory/aspect/robot_memory_inifin.h
 delete mode 100644 src/plugins/robot-memory/computables/blackboard_computable.cpp
 delete mode 100644 src/plugins/robot-memory/computables/blackboard_computable.h
 delete mode 100644 src/plugins/robot-memory/computables/computable.cpp
 delete mode 100644 src/plugins/robot-memory/computables/computable.h
 delete mode 100644 src/plugins/robot-memory/computables/computables_manager.cpp
 delete mode 100644 src/plugins/robot-memory/computables/computables_manager.h
 delete mode 100644 src/plugins/robot-memory/event_trigger.cpp
 delete mode 100644 src/plugins/robot-memory/event_trigger.h
 delete mode 100644 src/plugins/robot-memory/event_trigger_manager.cpp
 delete mode 100644 src/plugins/robot-memory/event_trigger_manager.h
 delete mode 100644 src/plugins/robot-memory/interfaces/Makefile
 delete mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.cpp
 delete mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.h_ext
 delete mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.tolua
 delete mode 100644 src/plugins/robot-memory/interfaces/RobotMemoryInterface.xml
 delete mode 100644 src/plugins/robot-memory/robot_memory.cpp
 delete mode 100644 src/plugins/robot-memory/robot_memory.h
 delete mode 100644 src/plugins/robot-memory/robot_memory_plugin.cpp
 delete mode 100644 src/plugins/robot-memory/robot_memory_setup.cpp
 delete mode 100644 src/plugins/robot-memory/robot_memory_setup.h
 delete mode 100644 src/plugins/robot-memory/robot_memory_thread.cpp
 delete mode 100644 src/plugins/robot-memory/robot_memory_thread.h
 delete mode 100644 src/plugins/robot-memory/test-plugin/Makefile
 delete mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test.cpp
 delete mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test.h
 delete mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test_plugin.cpp
 delete mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test_thread.cpp
 delete mode 100644 src/plugins/robot-memory/test-plugin/robot_memory_test_thread.h
 delete mode 100644 src/tools/gtest/Makefile
 delete mode 100644 src/tools/gtest/gtest_fawkes.cpp


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

- *commit* 92acf8c0da8944bc25b56048c85968a8ee3102b9 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Thu Oct 20 16:33:40 2016 +0200
Subject: Added ASP aspect.

 src/plugins/asp/.gitignore            |    1 +
 src/plugins/asp/Makefile              |   68 +++++++++++++++++++++++++++
 src/plugins/asp/asp.config            |    2 +
 src/plugins/asp/asp.creator           |    1 +
 src/plugins/asp/asp.files             |   11 +++++
 src/plugins/asp/asp.includes          |    8 +++
 src/plugins/asp/asp_plugin.cpp        |   47 +++++++++++++++++++
 src/plugins/asp/asp_thread.cpp        |   58 +++++++++++++++++++++++
 src/plugins/asp/asp_thread.h          |   54 ++++++++++++++++++++++
 src/plugins/asp/aspect/Makefile       |   61 +++++++++++++++++++++++++
 src/plugins/asp/aspect/asp.cpp        |   81 +++++++++++++++++++++++++++++++++
 src/plugins/asp/aspect/asp.h          |   59 ++++++++++++++++++++++++
 src/plugins/asp/aspect/asp_inifin.cpp |   74 ++++++++++++++++++++++++++++++
 src/plugins/asp/aspect/asp_inifin.h   |   46 +++++++++++++++++++
 14 files changed, 571 insertions(+), 0 deletions(-)


- *commit* 1890c4853eaa26a06f320e1bd430cdb97afeedae - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Thu Oct 20 23:19:33 2016 +0200
Subject: ASP Aspect: Use Fawkes logging for Clingo.

 src/plugins/asp/asp_thread.cpp        |    1 +
 src/plugins/asp/asp_thread.h          |    2 +
 src/plugins/asp/aspect/asp_inifin.cpp |   38 ++++++++++++++++++++++++++++++--
 src/plugins/asp/aspect/asp_inifin.h   |    7 ++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/asp_thread.cpp b/src/plugins/asp/asp_thread.cpp
index 285ece6..99b5805 100644
--- a/src/plugins/asp/asp_thread.cpp
+++ b/src/plugins/asp/asp_thread.cpp
@@ -42,6 +42,7 @@ ASPThread::ASPThread(void)
 void
 ASPThread::init(void)
 {
+	ASPIniFin.setLogger(logger);
 	return;
 }
 
diff --git a/src/plugins/asp/asp_thread.h b/src/plugins/asp/asp_thread.h
index 590d390..92ac825 100644
--- a/src/plugins/asp/asp_thread.h
+++ b/src/plugins/asp/asp_thread.h
@@ -25,6 +25,7 @@
 
 #include <aspect/aspect_provider.h>
 #include "aspect/asp_inifin.h"
+#include <aspect/logging.h>
 #include <core/threading/thread.h>
 
 namespace fawkes {
@@ -33,6 +34,7 @@ namespace fawkes {
 
 class ASPThread
 : public fawkes::Thread,
+  public fawkes::LoggingAspect,
   public fawkes::AspectProviderAspect
 {
 	private:
diff --git a/src/plugins/asp/aspect/asp_inifin.cpp b/src/plugins/asp/aspect/asp_inifin.cpp
index 0dbeb8d..2a39bf7 100644
--- a/src/plugins/asp/aspect/asp_inifin.cpp
+++ b/src/plugins/asp/aspect/asp_inifin.cpp
@@ -25,6 +25,7 @@
 #include "asp_inifin.h"
 #include <clingo.hh>
 #include <core/threading/thread_finalizer.h>
+#include <logging/logger.h>
 
 namespace fawkes {
 #if 0 /* just to make Emacs auto-indent happy */
@@ -35,10 +36,14 @@ namespace fawkes {
  * ASPAspect initializer/finalizer.
  * This initializer/finalizer will provide the ASP node handle to threads with the ASPAspect.
  * @author Björn Schäpers
+ *
+ * @property ASPAspectIniFin::Log
+ * @brief The logger used for Clingo Output.
  */
 
-/** Constructor. */
-ASPAspectIniFin::ASPAspectIniFin(void) : AspectIniFin("ASPAspect")
+/** Constructor.
+ */
+ASPAspectIniFin::ASPAspectIniFin(void) : AspectIniFin("ASPAspect"), Log(nullptr)
 {
 	return;
 }
@@ -53,7 +58,23 @@ ASPAspectIniFin::init(Thread *thread)
 		thread->name());
 	} //if ( asp_thread == nullptr )
 
-	asp_thread->init_ASPAspect(LockPtr<Clingo::Control>(new Clingo::Control));
+	auto clingoLogger = [this](const Clingo::WarningCode code, char const *msg)
+		{
+			fawkes::Logger::LogLevel level = fawkes::Logger::LL_NONE;
+			switch ( code )
+			{
+				case Clingo::WarningCode::AtomUndefined      :
+				case Clingo::WarningCode::OperationUndefined :
+				case Clingo::WarningCode::RuntimeError       : level = fawkes::Logger::LL_ERROR; break;
+				case Clingo::WarningCode::Other              :
+				case Clingo::WarningCode::VariableUnbounded  : level = fawkes::Logger::LL_WARN;
+				case Clingo::WarningCode::FileIncluded       :
+				case Clingo::WarningCode::GlobalVariable     : level = fawkes::Logger::LL_INFO; break;
+			} //switch ( code )
+			Log->log(level, "Clingo", msg);
+			return;
+		};
+	asp_thread->init_ASPAspect(LockPtr<Clingo::Control>(new Clingo::Control({}, clingoLogger, 100)));
 	return;
 }
 
@@ -71,4 +92,15 @@ ASPAspectIniFin::finalize(Thread *thread)
 	return;
 }
 
+/**
+ * @brief Sets the logger to use for Clingo messages.
+ * @param[in] logger The new logger.
+ */
+void
+ASPAspectIniFin::setLogger(Logger *logger)
+{
+	Log = logger;
+	return;
+}
+
 } // end namespace fawkes
diff --git a/src/plugins/asp/aspect/asp_inifin.h b/src/plugins/asp/aspect/asp_inifin.h
index f62ef73..d112084 100644
--- a/src/plugins/asp/aspect/asp_inifin.h
+++ b/src/plugins/asp/aspect/asp_inifin.h
@@ -32,13 +32,20 @@ namespace fawkes {
 }
 #endif
 
+class Logger;
+
 class ASPAspectIniFin : public AspectIniFin
 {
+	private:
+	Logger *Log;
+
 	public:
 	ASPAspectIniFin(void);
 
 	void init(Thread *thread) override;
 	void finalize(Thread *thread) override;
+
+	void setLogger(Logger *logger);
 };
 
 } // end namespace fawkes

- *commit* 365d0c71d2ac103e951240990c17e24c88426c67 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Thu Oct 27 16:57:30 2016 +0200
Subject: ASP-Aspect: Added ClingoControlManager

 src/plugins/asp/asp.files                          |    2 +
 src/plugins/asp/aspect/clingo_control_manager.cpp  |  116 ++++++++++++++++++++
 .../asp/aspect/{asp.h => clingo_control_manager.h} |   37 +++---
 3 files changed, 136 insertions(+), 19 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/asp.files b/src/plugins/asp/asp.files
index df59585..41a8afd 100644
--- a/src/plugins/asp/asp.files
+++ b/src/plugins/asp/asp.files
@@ -7,5 +7,7 @@ asp_thread.cpp
 aspect/Makefile
 aspect/asp.h
 aspect/asp.cpp
+aspect/clingo_control_manager.h
+aspect/clingo_control_manager.cpp
 aspect/asp_inifin.h
 aspect/asp_inifin.cpp

- *commit* 583c341762b9e98a25764873082d0b9c43231653 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Sat Oct 29 11:50:46 2016 +0200
Subject: ASP-Aspect: Added ClingoManagerAspect.

 src/plugins/asp/asp.files                          |    8 ++-
 .../asp/aspect/clingo_manager.cpp}                 |   44 +++++-----
 src/plugins/asp/aspect/{asp.h => clingo_manager.h} |   29 ++----
 src/plugins/asp/aspect/clingo_manager_inifin.cpp   |   91 ++++++++++++++++++++
 .../{asp_inifin.h => clingo_manager_inifin.h}      |   22 +++---
 5 files changed, 138 insertions(+), 56 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/asp.files b/src/plugins/asp/asp.files
index 41a8afd..3c8dad7 100644
--- a/src/plugins/asp/asp.files
+++ b/src/plugins/asp/asp.files
@@ -7,7 +7,11 @@ asp_thread.cpp
 aspect/Makefile
 aspect/asp.h
 aspect/asp.cpp
-aspect/clingo_control_manager.h
-aspect/clingo_control_manager.cpp
 aspect/asp_inifin.h
 aspect/asp_inifin.cpp
+aspect/clingo_control_manager.h
+aspect/clingo_control_manager.cpp
+aspect/clingo_manager.h
+aspect/clingo_manager.cpp
+aspect/clingo_manager_inifin.h
+aspect/clingo_manager_inifin.cpp

- *commit* 6d021fd5821e24db0ad2275ff8464305a1a1452a - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Sun Oct 30 13:57:12 2016 +0100
Subject: ASP-Aspect: Prepared aspect and inifin for the control manager.

 src/plugins/asp/aspect/asp.cpp        |   13 ++++++++---
 src/plugins/asp/aspect/asp.h          |    4 ++-
 src/plugins/asp/aspect/asp_inifin.cpp |   34 +++++++++++++++++++++++++++++---
 src/plugins/asp/aspect/asp_inifin.h   |    6 +++++
 4 files changed, 48 insertions(+), 9 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/aspect/asp.cpp b/src/plugins/asp/aspect/asp.cpp
index 3163f22..7650e4a 100644
--- a/src/plugins/asp/aspect/asp.cpp
+++ b/src/plugins/asp/aspect/asp.cpp
@@ -36,14 +36,19 @@ namespace fawkes {
  * @ingroup Aspects
  * @author Björn Schäpers
  *
- * @property fawkes:LockPtr<Clingo::Control> ASPAspect::ClingoControl
- * Clingo Control for exclusive usage.
+ * @property ASPAspect::ControlName
+ * @brief The name for the control in the manager.
+ *
+ * @property ASPAspect::ClingoControl
+ * @brief Clingo Control for exclusive usage.
  */
 
 
-/** Constructor.
+/**
+ * Constructor.
+ * @param[in] controlName The desired control name.
  */
-ASPAspect::ASPAspect(void)
+ASPAspect::ASPAspect(const std::string&& controlName) : ControlName(std::move(controlName))
 {
 	add_aspect("ASPAspect");
 	return;
diff --git a/src/plugins/asp/aspect/asp.h b/src/plugins/asp/aspect/asp.h
index e356fa7..72782e0 100644
--- a/src/plugins/asp/aspect/asp.h
+++ b/src/plugins/asp/aspect/asp.h
@@ -41,6 +41,8 @@ namespace fawkes {
 class ASPAspect : public virtual Aspect
 {
 	private:
+	const std::string ControlName;
+
 	void init_ASPAspect(LockPtr<Clingo::Control> clingoControl);
 	void finalize_ASPAspect();
 
@@ -48,7 +50,7 @@ class ASPAspect : public virtual Aspect
 	LockPtr<Clingo::Control> ClingoControl;
 
 	public:
-	ASPAspect(void);
+	ASPAspect(const std::string&& controlName);
 	virtual ~ASPAspect(void);
 
 	friend class ASPAspectIniFin;
diff --git a/src/plugins/asp/aspect/asp_inifin.cpp b/src/plugins/asp/aspect/asp_inifin.cpp
index 2a39bf7..c6f1887 100644
--- a/src/plugins/asp/aspect/asp_inifin.cpp
+++ b/src/plugins/asp/aspect/asp_inifin.cpp
@@ -21,33 +21,48 @@
  *  Read the full text in the LICENSE.GPL_WRE file in the doc directory.
  */
 
-#include "asp.h"
-#include "asp_inifin.h"
 #include <clingo.hh>
 #include <core/threading/thread_finalizer.h>
 #include <logging/logger.h>
 
+#include "asp.h"
+#include "asp_inifin.h"
+#include "clingo_control_manager.h"
+
 namespace fawkes {
 #if 0 /* just to make Emacs auto-indent happy */
 }
 #endif
 
-/** @class ASPAspectIniFin <plugins/asp/aspect/asp_inifin.h>
+/**
+ * @class ASPAspectIniFin <plugins/asp/aspect/asp_inifin.h>
  * ASPAspect initializer/finalizer.
  * This initializer/finalizer will provide the ASP node handle to threads with the ASPAspect.
  * @author Björn Schäpers
  *
  * @property ASPAspectIniFin::Log
  * @brief The logger used for Clingo Output.
+ *
+ * @property ASPAspectIniFin::CtrlMgr
+ * @brief The control manager.
  */
 
-/** Constructor.
+/**
+ * Constructor.
  */
 ASPAspectIniFin::ASPAspectIniFin(void) : AspectIniFin("ASPAspect"), Log(nullptr)
 {
 	return;
 }
 
+/**
+ * @brief Destructor.
+ */
+ASPAspectIniFin::~ASPAspectIniFin(void)
+{
+	return;
+}
+
 void
 ASPAspectIniFin::init(Thread *thread)
 {
@@ -103,4 +118,15 @@ ASPAspectIniFin::setLogger(Logger *logger)
 	return;
 }
 
+/**
+ * @brief Sets the control manager.
+ * @param[in] ctrlMgr The new control manager.
+ */
+void
+ASPAspectIniFin::setControlManager(const LockPtr<ClingoControlManager>& ctrlMgr)
+{
+	CtrlMgr = ctrlMgr;
+	return;
+}
+
 } // end namespace fawkes
diff --git a/src/plugins/asp/aspect/asp_inifin.h b/src/plugins/asp/aspect/asp_inifin.h
index d112084..1563622 100644
--- a/src/plugins/asp/aspect/asp_inifin.h
+++ b/src/plugins/asp/aspect/asp_inifin.h
@@ -25,6 +25,8 @@
 #define __PLUGINS_ASP_ASPECT_ASP_INIFIN_H_
 
 #include <aspect/inifins/inifin.h>
+#include <core/utils/lockptr.h>
+
 #include "asp.h"
 
 namespace fawkes {
@@ -32,20 +34,24 @@ namespace fawkes {
 }
 #endif
 
+class ClingoControlManager;
 class Logger;
 
 class ASPAspectIniFin : public AspectIniFin
 {
 	private:
 	Logger *Log;
+	LockPtr<ClingoControlManager> CtrlMgr;
 
 	public:
 	ASPAspectIniFin(void);
+	~ASPAspectIniFin(void);
 
 	void init(Thread *thread) override;
 	void finalize(Thread *thread) override;
 
 	void setLogger(Logger *logger);
+	void setControlManager(const LockPtr<ClingoControlManager>& ctrlMgr);
 };
 
 } // end namespace fawkes

- *commit* 2e1d72279762dd8adc3dd8e5a4f4582e46243232 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Sun Oct 30 20:52:38 2016 +0100
Subject: ASPAspect: Use the clingo control manager for the aspects.

 src/plugins/asp/asp_thread.cpp                    |   21 +++++++++++-
 src/plugins/asp/asp_thread.h                      |    8 ++++-
 src/plugins/asp/aspect/asp.cpp                    |    7 ++++-
 src/plugins/asp/aspect/asp.h                      |    3 +-
 src/plugins/asp/aspect/asp_inifin.cpp             |   34 +-------------------
 src/plugins/asp/aspect/asp_inifin.h               |    2 -
 src/plugins/asp/aspect/clingo_control_manager.cpp |   13 +++++++-
 src/plugins/asp/aspect/clingo_control_manager.h   |    4 ++-
 src/plugins/asp/aspect/clingo_manager_inifin.cpp  |    2 +-
 src/plugins/asp/aspect/clingo_manager_inifin.h    |    2 +-
 10 files changed, 51 insertions(+), 45 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/asp_thread.cpp b/src/plugins/asp/asp_thread.cpp
index 99b5805..19da8c3 100644
--- a/src/plugins/asp/asp_thread.cpp
+++ b/src/plugins/asp/asp_thread.cpp
@@ -29,12 +29,27 @@ using namespace fawkes;
  * ASP environment thread.
  *
  * @author Björn Schäpers
+ *
+ * @property ASPThread::ASPIniFin
+ * @brief The initi-/finalizer for the ASPAspect.
+ *
+ * @property ASPThread::ClingoIniFin
+ * @brief The initi-/finalizer for the ClingoManagerAspect.
+ *
+ * @property ASPThread::CtrlMgr
+ * @brief The clingo control manager.
  */
 
 /** Constructor. */
 ASPThread::ASPThread(void)
   : Thread("ASPThread", Thread::OPMODE_WAITFORWAKEUP),
-	AspectProviderAspect(std::list<fawkes::AspectIniFin*>(1, &ASPIniFin))
+	AspectProviderAspect([this](void) {
+		std::list<fawkes::AspectIniFin*> ret;
+		ret.emplace_back(&ASPIniFin);
+		ret.emplace_back(&ClingoIniFin);
+		return ret;
+	}()),
+	CtrlMgr(new ClingoControlManager)
 {
 	return;
 }
@@ -42,7 +57,9 @@ ASPThread::ASPThread(void)
 void
 ASPThread::init(void)
 {
-	ASPIniFin.setLogger(logger);
+	CtrlMgr->setLogger(logger);
+	ASPIniFin.setControlManager(CtrlMgr);
+	ClingoIniFin.setControlManager(CtrlMgr);
 	return;
 }
 
diff --git a/src/plugins/asp/asp_thread.h b/src/plugins/asp/asp_thread.h
index 92ac825..68bee30 100644
--- a/src/plugins/asp/asp_thread.h
+++ b/src/plugins/asp/asp_thread.h
@@ -24,10 +24,13 @@
 #define __PLUGINS_ASP_ASP_THREAD_H_
 
 #include <aspect/aspect_provider.h>
-#include "aspect/asp_inifin.h"
 #include <aspect/logging.h>
 #include <core/threading/thread.h>
 
+#include "aspect/asp_inifin.h"
+#include "aspect/clingo_control_manager.h"
+#include "aspect/clingo_manager_inifin.h"
+
 namespace fawkes {
 	class AspectIniFin;
 }
@@ -39,6 +42,8 @@ class ASPThread
 {
 	private:
 	fawkes::ASPAspectIniFin ASPIniFin;
+	fawkes::ClingoManagerAspectIniFin ClingoIniFin;
+	fawkes::LockPtr<fawkes::ClingoControlManager> CtrlMgr;
 
 	protected:
 	/** Stub to see name in backtrace for easier debugging. @see Thread::run() */
@@ -50,7 +55,6 @@ class ASPThread
 	void init(void) override;
 	void loop(void) override;
 	void finalize(void) override;
-
 };
 
 #endif
diff --git a/src/plugins/asp/aspect/asp.cpp b/src/plugins/asp/aspect/asp.cpp
index 7650e4a..fcd57c8 100644
--- a/src/plugins/asp/aspect/asp.cpp
+++ b/src/plugins/asp/aspect/asp.cpp
@@ -39,6 +39,9 @@ namespace fawkes {
  * @property ASPAspect::ControlName
  * @brief The name for the control in the manager.
  *
+ * @property ASPAspect::LogComponent
+ * @brief The component for the logger.
+ *
  * @property ASPAspect::ClingoControl
  * @brief Clingo Control for exclusive usage.
  */
@@ -47,8 +50,10 @@ namespace fawkes {
 /**
  * Constructor.
  * @param[in] controlName The desired control name.
+ * @param[in] logComponent The component for the logger.
  */
-ASPAspect::ASPAspect(const std::string&& controlName) : ControlName(std::move(controlName))
+ASPAspect::ASPAspect(const std::string&& controlName, const std::string&& logComponent) :
+	ControlName(std::move(controlName)), LogComponent(std::move(logComponent))
 {
 	add_aspect("ASPAspect");
 	return;
diff --git a/src/plugins/asp/aspect/asp.h b/src/plugins/asp/aspect/asp.h
index 72782e0..b86b869 100644
--- a/src/plugins/asp/aspect/asp.h
+++ b/src/plugins/asp/aspect/asp.h
@@ -42,6 +42,7 @@ class ASPAspect : public virtual Aspect
 {
 	private:
 	const std::string ControlName;
+	const std::string LogComponent;
 
 	void init_ASPAspect(LockPtr<Clingo::Control> clingoControl);
 	void finalize_ASPAspect();
@@ -50,7 +51,7 @@ class ASPAspect : public virtual Aspect
 	LockPtr<Clingo::Control> ClingoControl;
 
 	public:
-	ASPAspect(const std::string&& controlName);
+	ASPAspect(const std::string&& controlName, const std::string&& logComponent = std::string());
 	virtual ~ASPAspect(void);
 
 	friend class ASPAspectIniFin;
diff --git a/src/plugins/asp/aspect/asp_inifin.cpp b/src/plugins/asp/aspect/asp_inifin.cpp
index c6f1887..ecd27eb 100644
--- a/src/plugins/asp/aspect/asp_inifin.cpp
+++ b/src/plugins/asp/aspect/asp_inifin.cpp
@@ -40,9 +40,6 @@ namespace fawkes {
  * This initializer/finalizer will provide the ASP node handle to threads with the ASPAspect.
  * @author Björn Schäpers
  *
- * @property ASPAspectIniFin::Log
- * @brief The logger used for Clingo Output.
- *
  * @property ASPAspectIniFin::CtrlMgr
  * @brief The control manager.
  */
@@ -50,7 +47,7 @@ namespace fawkes {
 /**
  * Constructor.
  */
-ASPAspectIniFin::ASPAspectIniFin(void) : AspectIniFin("ASPAspect"), Log(nullptr)
+ASPAspectIniFin::ASPAspectIniFin(void) : AspectIniFin("ASPAspect")
 {
 	return;
 }
@@ -73,23 +70,7 @@ ASPAspectIniFin::init(Thread *thread)
 		thread->name());
 	} //if ( asp_thread == nullptr )
 
-	auto clingoLogger = [this](const Clingo::WarningCode code, char const *msg)
-		{
-			fawkes::Logger::LogLevel level = fawkes::Logger::LL_NONE;
-			switch ( code )
-			{
-				case Clingo::WarningCode::AtomUndefined      :
-				case Clingo::WarningCode::OperationUndefined :
-				case Clingo::WarningCode::RuntimeError       : level = fawkes::Logger::LL_ERROR; break;
-				case Clingo::WarningCode::Other              :
-				case Clingo::WarningCode::VariableUnbounded  : level = fawkes::Logger::LL_WARN;
-				case Clingo::WarningCode::FileIncluded       :
-				case Clingo::WarningCode::GlobalVariable     : level = fawkes::Logger::LL_INFO; break;
-			} //switch ( code )
-			Log->log(level, "Clingo", msg);
-			return;
-		};
-	asp_thread->init_ASPAspect(LockPtr<Clingo::Control>(new Clingo::Control({}, clingoLogger, 100)));
+	asp_thread->init_ASPAspect(CtrlMgr->create_control(asp_thread->ControlName, asp_thread->LogComponent));
 	return;
 }
 
@@ -108,17 +89,6 @@ ASPAspectIniFin::finalize(Thread *thread)
 }
 
 /**
- * @brief Sets the logger to use for Clingo messages.
- * @param[in] logger The new logger.
- */
-void
-ASPAspectIniFin::setLogger(Logger *logger)
-{
-	Log = logger;
-	return;
-}
-
-/**
  * @brief Sets the control manager.
  * @param[in] ctrlMgr The new control manager.
  */
diff --git a/src/plugins/asp/aspect/asp_inifin.h b/src/plugins/asp/aspect/asp_inifin.h
index 1563622..141ffb9 100644
--- a/src/plugins/asp/aspect/asp_inifin.h
+++ b/src/plugins/asp/aspect/asp_inifin.h
@@ -40,7 +40,6 @@ class Logger;
 class ASPAspectIniFin : public AspectIniFin
 {
 	private:
-	Logger *Log;
 	LockPtr<ClingoControlManager> CtrlMgr;
 
 	public:
@@ -50,7 +49,6 @@ class ASPAspectIniFin : public AspectIniFin
 	void init(Thread *thread) override;
 	void finalize(Thread *thread) override;
 
-	void setLogger(Logger *logger);
 	void setControlManager(const LockPtr<ClingoControlManager>& ctrlMgr);
 };
 
diff --git a/src/plugins/asp/aspect/clingo_control_manager.cpp b/src/plugins/asp/aspect/clingo_control_manager.cpp
index b508ef7..6019d76 100644
--- a/src/plugins/asp/aspect/clingo_control_manager.cpp
+++ b/src/plugins/asp/aspect/clingo_control_manager.cpp
@@ -39,9 +39,8 @@ namespace fawkes {
 
 /**
  * Constructor.
- * @param[in] logger The logger for the controls.
  */
-ClingoControlManager::ClingoControlManager(Logger *logger) : Log(logger)
+ClingoControlManager::ClingoControlManager(void) : Log(nullptr)
 {
 	return;
 }
@@ -53,6 +52,16 @@ ClingoControlManager::~ClingoControlManager(void)
 }
 
 /**
+ * @brief Sets the logger for all Clingo Controls.
+ * @param[in] logger The logger.
+ */
+void ClingoControlManager::setLogger(Logger *logger)
+{
+	Log = logger;
+	return;
+}
+
+/**
  * Create a new control. The control is registered internally under the specified name.
  * It must be destroyed when done with it. Only a single control can be created for a particular control name.
  * @param[in] ctrl_name The Name by which to register the control.
diff --git a/src/plugins/asp/aspect/clingo_control_manager.h b/src/plugins/asp/aspect/clingo_control_manager.h
index 41a5406..be16d12 100644
--- a/src/plugins/asp/aspect/clingo_control_manager.h
+++ b/src/plugins/asp/aspect/clingo_control_manager.h
@@ -44,9 +44,11 @@ class ClingoControlManager
 	std::unordered_map<std::string, LockPtr<Clingo::Control>> Controls;
 
 	public:
-	ClingoControlManager(Logger *logger);
+	ClingoControlManager(void);
 	virtual ~ClingoControlManager(void);
 
+	void setLogger(Logger *logger);
+
 	LockPtr<Clingo::Control> create_control(const std::string& ctrl_name, const std::string& log_component_name);
 	void destroy_control(const std::string& ctrl_name);
 
diff --git a/src/plugins/asp/aspect/clingo_manager_inifin.cpp b/src/plugins/asp/aspect/clingo_manager_inifin.cpp
index 6478dd7..391167c 100644
--- a/src/plugins/asp/aspect/clingo_manager_inifin.cpp
+++ b/src/plugins/asp/aspect/clingo_manager_inifin.cpp
@@ -82,7 +82,7 @@ ClingoManagerAspectIniFin::finalize(Thread *thread)
  * @param[in] clingoCtrlMgr Clingo control manager
  */
 void
-ClingoManagerAspectIniFin::set_manager(LockPtr<ClingoControlManager>& clingoCtrlMgr)
+ClingoManagerAspectIniFin::setControlManager(LockPtr<ClingoControlManager>& clingoCtrlMgr)
 {
 	ClingoCtrlMgr = clingoCtrlMgr;
 	return;
diff --git a/src/plugins/asp/aspect/clingo_manager_inifin.h b/src/plugins/asp/aspect/clingo_manager_inifin.h
index a33cc52..a142d88 100644
--- a/src/plugins/asp/aspect/clingo_manager_inifin.h
+++ b/src/plugins/asp/aspect/clingo_manager_inifin.h
@@ -45,7 +45,7 @@ class ClingoManagerAspectIniFin : public AspectIniFin
 	void init(Thread *thread) override;
 	void finalize(Thread *thread) override;
 
-	void set_manager(LockPtr<ClingoControlManager>& clingoCtrlMgr);
+	void setControlManager(LockPtr<ClingoControlManager>& clingoCtrlMgr);
 };
 
 } // end namespace fawkes

- *commit* 8eda35d1cd8ccd8dde515a7e37f765ff0c026b96 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Mon Oct 31 16:26:27 2016 +0100
Subject: ASP-Aspect: Added access wrapper class.

 src/plugins/asp/Makefile                          |   12 +-
 src/plugins/asp/asp.files                         |    2 +
 src/plugins/asp/aspect/Makefile                   |   10 +-
 src/plugins/asp/aspect/asp.cpp                    |   12 +-
 src/plugins/asp/aspect/asp.h                      |   12 +-
 src/plugins/asp/aspect/asp_inifin.cpp             |    2 +-
 src/plugins/asp/aspect/clingo_access.cpp          |  356 +++++++++++++++++++++
 src/plugins/asp/aspect/clingo_access.h            |   82 +++++
 src/plugins/asp/aspect/clingo_control_manager.cpp |   29 +--
 src/plugins/asp/aspect/clingo_control_manager.h   |   11 +-
 10 files changed, 473 insertions(+), 55 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/Makefile b/src/plugins/asp/Makefile
index d1b8a48..9df80ff 100644
--- a/src/plugins/asp/Makefile
+++ b/src/plugins/asp/Makefile
@@ -41,14 +41,14 @@ ifeq ($(HAVE_CPP11),1)
   ifeq ($(HAVE_CLINGO),1)
     PRESUBDIRS += aspect
 
-	CFLAGS  += $(CFLAGS_CLINGO) $(CFLAGS_CPP11)
-	LDFLAGS += $(LDFLAGS_CLINGO) $(LDFLAGS_CPP11)
+    CFLAGS  += $(CFLAGS_CLINGO) $(CFLAGS_CPP11)
+    LDFLAGS += $(LDFLAGS_CLINGO) $(LDFLAGS_CPP11)
 
-	PLUGINS_all = $(PLUGINDIR)/asp.so
+    PLUGINS_all = $(PLUGINDIR)/asp.so
 
-	INSTALL_extra = asp_files
-else
-	WARN_TARGETS += warning_clingo
+    INSTALL_extra = asp_files
+  else
+    WARN_TARGETS += warning_clingo
   endif
 else
   WARN_TARGETS += warning_cpp11
diff --git a/src/plugins/asp/asp.files b/src/plugins/asp/asp.files
index 3c8dad7..3ed9f3c 100644
--- a/src/plugins/asp/asp.files
+++ b/src/plugins/asp/asp.files
@@ -9,6 +9,8 @@ aspect/asp.h
 aspect/asp.cpp
 aspect/asp_inifin.h
 aspect/asp_inifin.cpp
+aspect/clingo_access.h
+aspect/clingo_access.cpp
 aspect/clingo_control_manager.h
 aspect/clingo_control_manager.cpp
 aspect/clingo_manager.h
diff --git a/src/plugins/asp/aspect/Makefile b/src/plugins/asp/aspect/Makefile
index 5c66c4e..9a43079 100644
--- a/src/plugins/asp/aspect/Makefile
+++ b/src/plugins/asp/aspect/Makefile
@@ -36,12 +36,12 @@ LDFLAGS_CLINGO = -L$(HOME)/clingo/build/debug/ -Wl,-rpath=$(HOME)/clingo/build/d
 
 ifeq ($(HAVE_CPP11),1)
   ifeq ($(HAVE_CLINGO),1)
-	CFLAGS  += $(CFLAGS_CLINGO) $(CFLAGS_CPP11)
-	LDFLAGS += $(LDFLAGS_CLINGO) $(LDFLAGS_CPP11)
+    CFLAGS  += $(CFLAGS_CLINGO) $(CFLAGS_CPP11)
+    LDFLAGS += $(LDFLAGS_CLINGO) $(LDFLAGS_CPP11)
 
-	LIBS_all = $(LIBDIR)/libfawkesaspaspect.so
-else
-	WARN_TARGETS += warning_clingo
+    LIBS_all = $(LIBDIR)/libfawkesaspaspect.so
+  else
+    WARN_TARGETS += warning_clingo
   endif
 else
   WARN_TARGETS += warning_cpp11
diff --git a/src/plugins/asp/aspect/asp.cpp b/src/plugins/asp/aspect/asp.cpp
index fcd57c8..5aee875 100644
--- a/src/plugins/asp/aspect/asp.cpp
+++ b/src/plugins/asp/aspect/asp.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "asp.h"
-#include <clingo.hh>
+#include "clingo_access.h"
 
 namespace fawkes {
 #if 0 /* just to make Emacs auto-indent happy */
@@ -69,12 +69,12 @@ ASPAspect::~ASPAspect(void)
 /** Init ASP aspect.
  * This sets the Clingo Control.
  * It is guaranteed that this is called for an ASP Thread before start is called (when running regularly inside Fawkes).
- * @param control The Clingo Control
+ * @param[in] clingo The Clingo Control.
  */
 void
-ASPAspect::init_ASPAspect(LockPtr<Clingo::Control> control)
+ASPAspect::init_ASPAspect(const LockPtr<ClingoAccess>& clingo)
 {
-	ClingoControl = control;
+	Clingo = clingo;
 	return;
 }
 
@@ -82,9 +82,9 @@ ASPAspect::init_ASPAspect(LockPtr<Clingo::Control> control)
  * This clears the Clingo Control.
  */
 void
-ASPAspect::finalize_ASPAspect()
+ASPAspect::finalize_ASPAspect(void)
 {
-	ClingoControl.clear();
+	Clingo.clear();
 	return;
 }
 
diff --git a/src/plugins/asp/aspect/asp.h b/src/plugins/asp/aspect/asp.h
index b86b869..e749f8a 100644
--- a/src/plugins/asp/aspect/asp.h
+++ b/src/plugins/asp/aspect/asp.h
@@ -29,26 +29,24 @@
 
 #include <string>
 
-namespace Clingo {
-  class Control;
-}
-
 namespace fawkes {
 #if 0 /* just to make Emacs auto-indent happy */
 }
 #endif
 
+class ClingoAccess;
+
 class ASPAspect : public virtual Aspect
 {
 	private:
 	const std::string ControlName;
 	const std::string LogComponent;
 
-	void init_ASPAspect(LockPtr<Clingo::Control> clingoControl);
-	void finalize_ASPAspect();
+	void init_ASPAspect(const LockPtr<ClingoAccess>& clingo);
+	void finalize_ASPAspect(void);
 
 	protected:
-	LockPtr<Clingo::Control> ClingoControl;
+	LockPtr<ClingoAccess> Clingo;
 
 	public:
 	ASPAspect(const std::string&& controlName, const std::string&& logComponent = std::string());
diff --git a/src/plugins/asp/aspect/asp_inifin.cpp b/src/plugins/asp/aspect/asp_inifin.cpp
index ecd27eb..a4f48d7 100644
--- a/src/plugins/asp/aspect/asp_inifin.cpp
+++ b/src/plugins/asp/aspect/asp_inifin.cpp
@@ -21,12 +21,12 @@
  *  Read the full text in the LICENSE.GPL_WRE file in the doc directory.
  */
 
-#include <clingo.hh>
 #include <core/threading/thread_finalizer.h>
 #include <logging/logger.h>
 
 #include "asp.h"
 #include "asp_inifin.h"
+#include "clingo_access.h"
 #include "clingo_control_manager.h"
 
 namespace fawkes {
diff --git a/src/plugins/asp/aspect/clingo_control_manager.cpp b/src/plugins/asp/aspect/clingo_control_manager.cpp
index 6019d76..865c872 100644
--- a/src/plugins/asp/aspect/clingo_control_manager.cpp
+++ b/src/plugins/asp/aspect/clingo_control_manager.cpp
@@ -19,13 +19,12 @@
  *  Read the full text in the LICENSE.GPL_WRE file in the doc directory.
  */
 
+#include "clingo_access.h"
 #include "clingo_control_manager.h"
 
 #include <core/exception.h>
 #include <logging/logger.h>
 
-#include <clingo.hh>
-
 namespace fawkes {
 #if 0 /* just to make Emacs auto-indent happy */
 }
@@ -68,31 +67,16 @@ void ClingoControlManager::setLogger(Logger *logger)
  * @param[in] log_component_name The Prefix for log entries. If empty it will be set to "Clingo".
  * @return A new plain Clingo Control.
  */
-LockPtr<Clingo::Control>
-ClingoControlManager::create_control(const std::string& ctrl_name, const std::string& log_component_name)
+LockPtr<ClingoAccess> ClingoControlManager::create_control(const std::string& ctrl_name,
+		const std::string& log_component_name)
 {
 	if ( Controls.count(ctrl_name) != 0 )
 	{
 		throw Exception("Clingo Control '%s' already exists!", ctrl_name.c_str());
 	} //if ( Controls.count(ctrl_name) != 0 )
 
-	auto clingoLogger = [this,log_component_name](const Clingo::WarningCode code, char const *msg)
-		{
-			fawkes::Logger::LogLevel level = fawkes::Logger::LL_NONE;
-			switch ( code )
-			{
-				case Clingo::WarningCode::AtomUndefined      :
-				case Clingo::WarningCode::OperationUndefined :
-				case Clingo::WarningCode::RuntimeError       : level = fawkes::Logger::LL_ERROR; break;
-				case Clingo::WarningCode::Other              :
-				case Clingo::WarningCode::VariableUnbounded  : level = fawkes::Logger::LL_WARN;
-				case Clingo::WarningCode::FileIncluded       :
-				case Clingo::WarningCode::GlobalVariable     : level = fawkes::Logger::LL_INFO; break;
-			} //switch ( code )
-			Log->log(level, log_component_name.empty() ? "Clingo" : log_component_name.c_str(), msg);
-			return;
-		};
-	LockPtr<Clingo::Control> ctrl(new Clingo::Control({}, clingoLogger, 100));
+	Clingo::SymbolSpan s;
+	LockPtr<ClingoAccess> ctrl(new ClingoAccess(Log, log_component_name));
 
 	Controls.emplace(ctrl_name, ctrl);
 
@@ -111,12 +95,11 @@ ClingoControlManager::destroy_control(const std::string& ctrl_name)
 	return;
 }
 
-
 /**
  * Get map of controls.
  * @return The map from control name to control lock ptr.
  */
-const std::unordered_map<std::string, LockPtr<Clingo::Control>>&
+const std::unordered_map<std::string, LockPtr<ClingoAccess>>&
 ClingoControlManager::controls(void) const
 {
 	return Controls;
diff --git a/src/plugins/asp/aspect/clingo_control_manager.h b/src/plugins/asp/aspect/clingo_control_manager.h
index be16d12..fdc7cf4 100644
--- a/src/plugins/asp/aspect/clingo_control_manager.h
+++ b/src/plugins/asp/aspect/clingo_control_manager.h
@@ -26,22 +26,19 @@
 
 #include <unordered_map>
 
-namespace Clingo {
-	class Control;
-}
-
 namespace fawkes {
 #if 0 /* just to make Emacs auto-indent happy */
 }
 #endif
 
+class ClingoAccess;
 class Logger;
 
 class ClingoControlManager
 {
 	private:
 	Logger *Log;
-	std::unordered_map<std::string, LockPtr<Clingo::Control>> Controls;
+	std::unordered_map<std::string, LockPtr<ClingoAccess>> Controls;
 
 	public:
 	ClingoControlManager(void);
@@ -49,10 +46,10 @@ class ClingoControlManager
 
 	void setLogger(Logger *logger);
 
-	LockPtr<Clingo::Control> create_control(const std::string& ctrl_name, const std::string& log_component_name);
+	LockPtr<ClingoAccess> create_control(const std::string& ctrl_name, const std::string& log_component_name);
 	void destroy_control(const std::string& ctrl_name);
 
-	const std::unordered_map<std::string, LockPtr<Clingo::Control>>& controls(void) const;
+	const std::unordered_map<std::string, LockPtr<ClingoAccess>>& controls(void) const;
 };
 
 } // end namespace fawkes

- *commit* 4ac324755ab2aef922b89b03278843d0ccb4f3e7 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Mon Oct 31 16:44:19 2016 +0100
Subject: ASP-Aspect: Use a different name for the member.

 src/plugins/asp/aspect/asp.cpp |    6 +++---
 src/plugins/asp/aspect/asp.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/aspect/asp.cpp b/src/plugins/asp/aspect/asp.cpp
index 5aee875..5b53228 100644
--- a/src/plugins/asp/aspect/asp.cpp
+++ b/src/plugins/asp/aspect/asp.cpp
@@ -42,7 +42,7 @@ namespace fawkes {
  * @property ASPAspect::LogComponent
  * @brief The component for the logger.
  *
- * @property ASPAspect::ClingoControl
+ * @property ASPAspect::ClingoAcc
  * @brief Clingo Control for exclusive usage.
  */
 
@@ -74,7 +74,7 @@ ASPAspect::~ASPAspect(void)
 void
 ASPAspect::init_ASPAspect(const LockPtr<ClingoAccess>& clingo)
 {
-	Clingo = clingo;
+	ClingoAcc = clingo;
 	return;
 }
 
@@ -84,7 +84,7 @@ ASPAspect::init_ASPAspect(const LockPtr<ClingoAccess>& clingo)
 void
 ASPAspect::finalize_ASPAspect(void)
 {
-	Clingo.clear();
+	ClingoAcc.clear();
 	return;
 }
 
diff --git a/src/plugins/asp/aspect/asp.h b/src/plugins/asp/aspect/asp.h
index e749f8a..c9885d1 100644
--- a/src/plugins/asp/aspect/asp.h
+++ b/src/plugins/asp/aspect/asp.h
@@ -46,7 +46,7 @@ class ASPAspect : public virtual Aspect
 	void finalize_ASPAspect(void);
 
 	protected:
-	LockPtr<ClingoAccess> Clingo;
+	LockPtr<ClingoAccess> ClingoAcc;
 
 	public:
 	ASPAspect(const std::string&& controlName, const std::string&& logComponent = std::string());

- *commit* bcf93253cf185c93bd9f61e475c2749f89fb6102 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Mon Oct 31 17:04:05 2016 +0100
Subject: ASP-Aspect: Added external handling.

 src/plugins/asp/aspect/clingo_access.cpp |   55 ++++++++++++++++++++++++++++++
 src/plugins/asp/aspect/clingo_access.h   |    3 ++
 2 files changed, 58 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/aspect/clingo_access.cpp b/src/plugins/asp/aspect/clingo_access.cpp
index 5d7b822..fd4a60e 100644
--- a/src/plugins/asp/aspect/clingo_access.cpp
+++ b/src/plugins/asp/aspect/clingo_access.cpp
@@ -353,4 +353,59 @@ ClingoAccess::ground(const Clingo::PartSpan& parts)
 	return true;
 }
 
+/**
+ * @brief Assigns an external value.
+ * @param[in] atom The atom to assign.
+ * @param[in] value The assigned value.
+ * @return If it could be assigned.
+ */
+bool
+ClingoAccess::assign_external(const Clingo::Symbol atom, const Clingo::TruthValue value)
+{
+	MutexLocker locker(&ControlMutex);
+	if ( Solving )
+	{
+		return false;
+	} //if ( Solving )
+
+	if ( Debug )
+	{
+		Log->log_info(LogComponent.c_str(), "Assigning %s to %s.", [value](void)
+			{
+				const char *ret = "Unknown Value";
+				switch ( value )
+				{
+					case Clingo::TruthValue::Free  : ret = "Free";  break;
+					case Clingo::TruthValue::True  : ret = "True";  break;
+					case Clingo::TruthValue::False : ret = "False"; break;
+				} //switch ( value )
+				return ret;
+			}, atom.string());
+	} //if ( Debug )
+	Control.assign_external(atom, value);
+	return true;
+}
+
+/**
+ * @brief Releases an external value.
+ * @param[in] atom The atom to release.
+ * @return If it could be released.
+ */
+bool
+ClingoAccess::release_external(const Clingo::Symbol atom)
+{
+	MutexLocker locker(&ControlMutex);
+	if ( Solving )
+	{
+		return false;
+	} //if ( Solving )
+
+	if ( Debug )
+	{
+		Log->log_info(LogComponent.c_str(), "Releasing %s.", atom.string());
+	} //if ( Debug )
+	Control.release_external(atom);
+	return true;
+}
+
 } // end namespace fawkes
diff --git a/src/plugins/asp/aspect/clingo_access.h b/src/plugins/asp/aspect/clingo_access.h
index 6f6ed18..ebeb189 100644
--- a/src/plugins/asp/aspect/clingo_access.h
+++ b/src/plugins/asp/aspect/clingo_access.h
@@ -75,6 +75,9 @@ class ClingoAccess
 	bool loadFile(const std::string& path);
 
 	bool ground(const Clingo::PartSpan& parts);
+
+	bool assign_external(const Clingo::Symbol atom, const Clingo::TruthValue value);
+	bool release_external(const Clingo::Symbol atom);
 };
 
 } // end namespace fawkes

- *commit* 16df52d8b40c32073247705bea0b3a7ff972b933 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 2 11:44:34 2016 +0100
Subject: ASP-Aspect: Add the asp plugin to the Makefile.

 src/plugins/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/Makefile b/src/plugins/Makefile
index caee20b..0a56ea9 100644
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@ -28,7 +28,8 @@ SUBDIRS	= bbsync bblogger webview ttmainloop rrd rrdweb \
 	  clips-tf openprs openprs-agent eclipse-clp \
 	  mongodb mongodb_log \
 	  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