Update includes, remove disabled code

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
 

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

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>

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"
 
 

source/RobotAPI/libraries/armem/core/wm/aron_conversions.h

 #pragma once
 
+#include <RobotAPI/libraries/aron/core/navigator/data/forward_declarations.h>
+
 #include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
 
 

source/RobotAPI/libraries/armem/core/wm/json_conversions.cpp

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

source/RobotAPI/libraries/armem/core/wm/json_conversions.h

 #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);
 }

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;
 

source/RobotAPI/libraries/armem/core/wm/visitor.h

-#pragma once
-
-#include "visitor/FunctionalVisitor.h"
-#include "visitor/Visitor.h"