From 6c943197c36949ac4da0ca7a1b1a494c644c9a6b Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 5 Aug 2021 18:04:39 +0200
Subject: [PATCH] Update includes, remove disabled code
---
.../RobotAPI/libraries/armem/CMakeLists.txt | 1 -
.../armem/core/base/detail/iteration_mixins.h | 29 +------------------
.../armem/core/diskmemory/EntityInstance.cpp | 2 ++
.../core/longtermmemory/EntitySnapshot.cpp | 3 ++
.../armem/core/wm/aron_conversions.h | 2 ++
.../armem/core/wm/json_conversions.cpp | 9 ++++--
.../armem/core/wm/json_conversions.h | 11 ++++---
.../armem/core/wm/memory_definitions.h | 5 ----
.../libraries/armem/core/wm/visitor.h | 4 ---
9 files changed, 20 insertions(+), 46 deletions(-)
delete mode 100644 source/RobotAPI/libraries/armem/core/wm/visitor.h
diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 972d51e11..a3f2632b2 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 189c33799..a53e661a8 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 e658ce8c2..567867566 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 443291c13..8d7addcd6 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 f40d1d757..f6b43dc8b 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 e7499d8b4..fd67c5f82 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 daea55b95..4ce93812b 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 4763944c8..85b320e31 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 815ee1b34..000000000
--- 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"
--
GitLab