diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 972d51e1162b4d57557d1a188f24fec24731d83e..a3f2632b20e716d6cbf6a0c0fa78d4814ad3d7e7 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -167,7 +167,6 @@ set(LIB_HEADERS
core/wm/aron_conversions.h
core/wm/ice_conversions.h
core/wm/json_conversions.h
- core/wm/visitor.h
core/wm/visitor/Visitor.h
core/wm/visitor/FunctionalVisitor.h
diff --git a/source/RobotAPI/libraries/armem/core/base/detail/iteration_mixins.h b/source/RobotAPI/libraries/armem/core/base/detail/iteration_mixins.h
index 189c33799b2bd54e31d5270699f17a9d1226d35b..a53e661a83610f1fcc0e8edabe12e9f8cd6c5c83 100644
--- a/source/RobotAPI/libraries/armem/core/base/detail/iteration_mixins.h
+++ b/source/RobotAPI/libraries/armem/core/base/detail/iteration_mixins.h
@@ -29,20 +29,7 @@ namespace armarx::armem::base::detail
}
return true;
}
-#if 0
- template <class ContainerT, class FunctionT>
- bool forEachChildSingle(const ContainerT& container, FunctionT&& func)
- {
- for (const auto& child : container)
- {
- if (!func(child))
- {
- return false;
- }
- }
- return true;
- }
-#endif
+
// Pair-valued containers.
template <class ContainerT, class FunctionT>
@@ -64,20 +51,6 @@ namespace armarx::armem::base::detail
}
return true;
}
-#if 0
- template <class ContainerT, class FunctionT>
- bool forEachChildPair(const ContainerT& container, FunctionT&& func)
- {
- for (const auto& [_, child] : container)
- {
- if (!func(child))
- {
- return false;
- }
- }
- return true;
- }
-#endif
// see: https://en.cppreference.com/w/cpp/types/void_t
diff --git a/source/RobotAPI/libraries/armem/core/diskmemory/EntityInstance.cpp b/source/RobotAPI/libraries/armem/core/diskmemory/EntityInstance.cpp
index e658ce8c29d6208ccedea1e741e83267ef5f03b1..56786756655453bb97952a206ff642b9f65174cb 100644
--- a/source/RobotAPI/libraries/armem/core/diskmemory/EntityInstance.cpp
+++ b/source/RobotAPI/libraries/armem/core/diskmemory/EntityInstance.cpp
@@ -4,6 +4,8 @@
#include <RobotAPI/libraries/armem/core/wm/aron_conversions.h>
#include <RobotAPI/libraries/armem/core/wm/json_conversions.h>
+#include <RobotAPI/libraries/aron/core/navigator/data/container/Dict.h>
+
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <SimoxUtility/json/json.hpp>
diff --git a/source/RobotAPI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp b/source/RobotAPI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp
index 443291c13dbc989bee7eef4e8724fea4de7dca4a..8d7addcd6262d20242cf5868207572e554769687 100644
--- a/source/RobotAPI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp
+++ b/source/RobotAPI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp
@@ -2,9 +2,12 @@
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+#include <RobotAPI/libraries/aron/core/navigator/data/container/Dict.h>
+
#include <RobotAPI/libraries/armem/core/wm/aron_conversions.h>
#include <RobotAPI/libraries/armem/core/wm/json_conversions.h>
+
#include "error.h"
diff --git a/source/RobotAPI/libraries/armem/core/wm/aron_conversions.h b/source/RobotAPI/libraries/armem/core/wm/aron_conversions.h
index f40d1d7573e089f90b58e00dadb7a80be0107e9d..f6b43dc8bd468008b9fe8ee470564f5de89e16cb 100644
--- a/source/RobotAPI/libraries/armem/core/wm/aron_conversions.h
+++ b/source/RobotAPI/libraries/armem/core/wm/aron_conversions.h
@@ -1,5 +1,7 @@
#pragma once
+#include <RobotAPI/libraries/aron/core/navigator/data/forward_declarations.h>
+
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
diff --git a/source/RobotAPI/libraries/armem/core/wm/json_conversions.cpp b/source/RobotAPI/libraries/armem/core/wm/json_conversions.cpp
index e7499d8b42edf895bbbdb2f0d06a1fe3ed2ee823..fd67c5f822cbfa3783bf1fc23b3de24f06a27f88 100644
--- a/source/RobotAPI/libraries/armem/core/wm/json_conversions.cpp
+++ b/source/RobotAPI/libraries/armem/core/wm/json_conversions.cpp
@@ -1,10 +1,14 @@
#include "json_conversions.h"
#include <RobotAPI/libraries/aron/core/Debug.h>
+#include <RobotAPI/libraries/aron/core/io/dataIO/visitor/Visitor.h>
+#include <RobotAPI/libraries/aron/core/io/dataIO/converter/Converter.h>
+#include <RobotAPI/libraries/aron/core/io/dataIO/reader/nlohmannJSON/NlohmannJSONReader.h>
+#include <RobotAPI/libraries/aron/core/io/dataIO/writer/nlohmannJSON/NlohmannJSONWriter.h>
+
namespace armarx::armem
{
-
void from_aron(const aron::datanavigator::DictNavigatorPtr& aron, nlohmann::json& j)
{
aron::dataIO::writer::NlohmannJSONWriter dataWriter;
@@ -12,7 +16,8 @@ namespace armarx::armem
j = dataWriter.getResult();
}
- void to_aron(aron::datanavigator::DictNavigatorPtr& a, const nlohmann::json& e, const aron::typenavigator::NavigatorPtr& expectedStructure)
+ void to_aron(aron::datanavigator::DictNavigatorPtr& a, const nlohmann::json& e,
+ const aron::typenavigator::NavigatorPtr& expectedStructure)
{
aron::dataIO::reader::NlohmannJSONReader dataReader(e);
aron::dataIO::writer::NavigatorWriter navWriter;
diff --git a/source/RobotAPI/libraries/armem/core/wm/json_conversions.h b/source/RobotAPI/libraries/armem/core/wm/json_conversions.h
index daea55b9566ad3e55374b9ffd55f47df3f0b570f..4ce93812b606688e642eecc0b7856210adce1a90 100644
--- a/source/RobotAPI/libraries/armem/core/wm/json_conversions.h
+++ b/source/RobotAPI/libraries/armem/core/wm/json_conversions.h
@@ -1,15 +1,14 @@
#pragma once
-#include "memory_definitions.h"
+#include <RobotAPI/libraries/aron/core/navigator/data/forward_declarations.h>
+#include <RobotAPI/libraries/aron/core/navigator/type/forward_declarations.h>
-#include <RobotAPI/libraries/aron/core/io/dataIO/converter/Converter.h>
-#include <RobotAPI/libraries/aron/core/io/dataIO/visitor/Visitor.h>
-#include <RobotAPI/libraries/aron/core/io/dataIO/reader/nlohmannJSON/NlohmannJSONReader.h>
-#include <RobotAPI/libraries/aron/core/io/dataIO/writer/nlohmannJSON/NlohmannJSONWriter.h>
+#include <SimoxUtility/json/json.hpp>
namespace armarx::armem
{
void from_aron(const aron::datanavigator::DictNavigatorPtr&, nlohmann::json&);
- void to_aron(aron::datanavigator::DictNavigatorPtr&, const nlohmann::json&, const aron::typenavigator::NavigatorPtr& expectedStructure = nullptr);
+ void to_aron(aron::datanavigator::DictNavigatorPtr&, const nlohmann::json&,
+ const aron::typenavigator::NavigatorPtr& expectedStructure = nullptr);
}
diff --git a/source/RobotAPI/libraries/armem/core/wm/memory_definitions.h b/source/RobotAPI/libraries/armem/core/wm/memory_definitions.h
index 4763944c880f70c6d9a14fa3b559622dd61ee301..85b320e319259da6f009680e75a44a5cfd5945e0 100644
--- a/source/RobotAPI/libraries/armem/core/wm/memory_definitions.h
+++ b/source/RobotAPI/libraries/armem/core/wm/memory_definitions.h
@@ -120,11 +120,6 @@ namespace armarx::armem::wm
CoreSegment& operator=(const CoreSegment& other);
CoreSegment& operator=(CoreSegment&& other);
- /**
- * @brief Convert the content of this segmnet into a commit
- * @return The resulting commit
- */
- Commit toCommit() const;
std::mutex& mutex() const;
diff --git a/source/RobotAPI/libraries/armem/core/wm/visitor.h b/source/RobotAPI/libraries/armem/core/wm/visitor.h
deleted file mode 100644
index 815ee1b34908dc5916e7d909e709bc735409f63c..0000000000000000000000000000000000000000
--- a/source/RobotAPI/libraries/armem/core/wm/visitor.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "visitor/FunctionalVisitor.h"
-#include "visitor/Visitor.h"