Changes have been pushed for the repository "fawkesrobotics/fawkes".

Clone:  https://github.com/fawkesrobotics/fawkes.git
Gitweb: https://github.com/fawkesrobotics/fawkes

The branch, thofmann/robot-memory-run-thread-in-continuous-mode has been updated
        to  6d62a6aa130dc4cb00d206ce4fdff189fc03b603 (commit)
      from  760aa65fe0dd4e847ed4d0e8a78ecfa2b5cd2056 (commit)

https://github.com/fawkesrobotics/fawkes/tree/thofmann/robot-memory-run-thread-in-continuous-mode

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 6d62a6aa130dc4cb00d206ce4fdff189fc03b603
Author:     Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Sun Jun 16 13:40:52 2019 +0200
Commit:     Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Sun Jun 16 13:40:52 2019 +0200

    robot-memory: provide copy-constructor for ComputablesManager
    
    The copy constructor only copies the basic configuration and does not
    copy the computables from the other ComputablesManager.

https://github.com/fawkesrobotics/fawkes/commit/6d62a6aa1

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


- *Summary* -----------------------------------------------------------
 .../robot-memory/computables/computables_manager.cpp    | 17 +++++++++++++++++
 .../robot-memory/computables/computables_manager.h      |  1 +
 2 files changed, 18 insertions(+)


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

- *commit* 6d62a6aa130dc4cb00d206ce4fdff189fc03b603 - - - - - - - - - -
Author:  Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:    Sun Jun 16 13:40:52 2019 +0200
Subject: robot-memory: provide copy-constructor for ComputablesManager

 .../robot-memory/computables/computables_manager.cpp    | 17 +++++++++++++++++
 .../robot-memory/computables/computables_manager.h      |  1 +
 2 files changed, 18 insertions(+)

_Diff for modified files_:
diff --git a/src/plugins/robot-memory/computables/computables_manager.cpp 
b/src/plugins/robot-memory/computables/computables_manager.cpp
index 854a4d081..5087c29c0 100644
--- a/src/plugins/robot-memory/computables/computables_manager.cpp
+++ b/src/plugins/robot-memory/computables/computables_manager.cpp
@@ -67,6 +67,23 @@ ComputablesManager::ComputablesManager(fawkes::Configuration 
*config, RobotMemor
 #endif
 }
 
+/**
+ * Copy-construct a ComputablesManager.
+ * Do *not* copy-construct the computables that are managed by the manager, but
+ * only the basic configuration.  If you want to use a computable with the new
+ * manager, you will need to register it again.
+ * @param other A reference to the other ComputablesManager to copy from.
+ */
+ComputablesManager::ComputablesManager(const ComputablesManager &other)
+{
+       config_                   = other.config_;
+       robot_memory_             = other.robot_memory_;
+       matching_test_collection_ = other.matching_test_collection_;
+#ifdef USE_TIMETRACKER
+       tt_ = other.tt_;
+#endif
+}
+
 ComputablesManager::~ComputablesManager()
 {
 #ifdef USE_TIMETRACKER
diff --git a/src/plugins/robot-memory/computables/computables_manager.h 
b/src/plugins/robot-memory/computables/computables_manager.h
index 92a0634ff..d6a1e2ba9 100644
--- a/src/plugins/robot-memory/computables/computables_manager.h
+++ b/src/plugins/robot-memory/computables/computables_manager.h
@@ -47,6 +47,7 @@ class ComputablesManager
 {
 public:
        ComputablesManager(fawkes::Configuration *config, RobotMemory 
*robot_memory);
+       ComputablesManager(const ComputablesManager &other);
        virtual ~ComputablesManager();
 
        bool check_and_compute(const bsoncxx::document::view &query, 
std::string collection);



_______________________________________________
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits

Reply via email to