From 13731bc4ba99438e804e375cb3d60d2861d6f3d2 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 16 Jul 2021 08:06:16 +0200
Subject: [PATCH] Move code and includes to .cpp, add virtual dtors
---
.../query_proc/diskmemory/EntityQueryProcessor.h | 3 +++
.../query_proc/workingmemory/BaseQueryProcessor.h | 1 +
.../workingmemory/CoreSegmentQueryProcessor.cpp | 9 ++++++++-
.../workingmemory/CoreSegmentQueryProcessor.h | 6 +++---
.../workingmemory/EntityQueryProcessor.cpp | 5 ++++-
.../workingmemory/EntityQueryProcessor.h | 5 ++---
.../workingmemory/MemoryQueryProcessor.cpp | 14 +++++++++++++-
.../workingmemory/MemoryQueryProcessor.h | 8 ++++----
.../ProviderSegmentQueryProcessor.cpp | 5 +++++
.../workingmemory/ProviderSegmentQueryProcessor.h | 4 +---
10 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h
index 4d1b9e14e..c57c2c2da 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h
@@ -19,11 +19,14 @@ namespace armarx::armem::d_ltm::query_proc
using Base = BaseQueryProcessor<d_ltm::Entity, armem::query::data::EntityQuery>;
public:
+
EntityQueryProcessor() :
Base()
{}
+
private:
+
void addResultSnapshot(d_ltm::Entity& result, d_ltm::Entity::ContainerT::const_iterator it) const override
{
addResultSnapshot(result, it->second);
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
index 708157ab6..933f9a6fd 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
@@ -23,6 +23,7 @@ namespace armarx::armem::wm::query_proc
dataMode(dataMode)
{}
+
protected:
DataMode dataMode;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp
index 52efc9cc4..692f15aed 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp
@@ -6,8 +6,14 @@
namespace armarx::armem::wm::query_proc
{
+ CoreSegmentQueryProcessor::CoreSegmentQueryProcessor(DataMode dataMode) :
+ Base(dataMode), providerSegmentProcessor(dataMode)
+ {}
+
+
CoreSegmentQueryProcessor::~CoreSegmentQueryProcessor() = default;
+
data::CoreSegment CoreSegmentQueryProcessor::processToIce(const armem::query::data::CoreSegmentQuery& query, const wm::CoreSegment& coreSegment) const
{
data::CoreSegment data;
@@ -15,7 +21,8 @@ namespace armarx::armem::wm::query_proc
return data;
}
- ProviderSegment CoreSegmentQueryProcessor::providerSegmentProcessorProcess(const armem::query::data::ProviderSegmentQuerySeq& q, const ProviderSegmentT& s) const
+
+ ProviderSegment CoreSegmentQueryProcessor::providerSegmentProcessorProcess(const armem::query::data::ProviderSegmentQuerySeq& q, const ProviderSegment& s) const
{
return providerSegmentProcessor.process(q, s, {armem::query::data::QueryTarget::WM});
}
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
index 50387e5f1..8fc7e8a37 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
@@ -22,12 +22,12 @@ namespace armarx::armem::wm::query_proc
public:
- CoreSegmentQueryProcessor(DataMode dataMode = DataMode::WithData) :
- Base(dataMode), providerSegmentProcessor(dataMode)
- {}
+ CoreSegmentQueryProcessor(DataMode dataMode = DataMode::WithData);
virtual ~CoreSegmentQueryProcessor() override;
using Base::process;
+
+
data::CoreSegment processToIce(const armem::query::data::CoreSegmentQuery& query, const wm::CoreSegment& coreSegment) const;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp
index 001bedae1..7ef31f2ba 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp
@@ -1,11 +1,14 @@
#include "EntityQueryProcessor.h"
-#include <RobotAPI/libraries/armem/core/workingmemory/Entity.h>
#include <RobotAPI/libraries/armem/core/workingmemory/ice_conversions.h>
namespace armarx::armem::wm::query_proc
{
+ EntityQueryProcessor::EntityQueryProcessor(DataMode dataMode) :
+ Base(dataMode)
+ {}
+
EntityQueryProcessor::~EntityQueryProcessor() = default;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
index 34f66237e..dde53a8ff 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
@@ -19,13 +19,12 @@ namespace armarx::armem::wm::query_proc
public:
- EntityQueryProcessor(DataMode dataMode = DataMode::WithData) :
- Base(dataMode)
- {}
+ EntityQueryProcessor(DataMode dataMode = DataMode::WithData);
virtual ~EntityQueryProcessor() override;
data::Entity processToIce(const armem::query::data::EntityQuery& query, const wm::Entity& entity) const;
+
private:
void addResultSnapshot(wm::Entity& result, wm::Entity::ContainerT::const_iterator it) const override;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp
index cb8d94789..dd249b61c 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp
@@ -3,8 +3,20 @@
namespace armarx::armem::wm::query_proc
{
- CoreSegment MemoryQueryProcessor::coreSegmentProcessorProcess(const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegmentT& s) const
+
+ MemoryQueryProcessor::MemoryQueryProcessor(DataMode dataMode) :
+ Base(dataMode), coreSegmentProcessor(dataMode)
+ {}
+
+
+ MemoryQueryProcessor::~MemoryQueryProcessor()
+ {
+ }
+
+
+ CoreSegment MemoryQueryProcessor::coreSegmentProcessorProcess(const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegment& s) const
{
return coreSegmentProcessor.process(q, s, {armem::query::data::QueryTarget::WM});
}
+
}
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
index 674b9ede6..c57eea94a 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
@@ -21,14 +21,14 @@ namespace armarx::armem::wm::query_proc
public:
- MemoryQueryProcessor(DataMode dataMode = DataMode::WithData) :
- Base(dataMode), coreSegmentProcessor(dataMode)
- {}
+ MemoryQueryProcessor(DataMode dataMode = DataMode::WithData);
+ virtual ~MemoryQueryProcessor() override;
protected:
- virtual CoreSegment coreSegmentProcessorProcess(const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegment& s) const override;
+ virtual CoreSegment coreSegmentProcessorProcess(
+ const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegment& s) const override;
private:
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp
index 84189bf2b..a5e23184f 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp
@@ -6,6 +6,11 @@
namespace armarx::armem::wm::query_proc
{
+ ProviderSegmentQueryProcessor::ProviderSegmentQueryProcessor(DataMode dataMode) :
+ Base(dataMode), entityProcessor(dataMode)
+ {}
+
+
ProviderSegmentQueryProcessor::~ProviderSegmentQueryProcessor() = default;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
index adb921d02..8e4f5a5e8 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
@@ -20,9 +20,7 @@ namespace armarx::armem::wm::query_proc
public:
- ProviderSegmentQueryProcessor(DataMode dataMode = DataMode::WithData) :
- Base(dataMode), entityProcessor(dataMode)
- {}
+ ProviderSegmentQueryProcessor(DataMode dataMode = DataMode::WithData);
virtual ~ProviderSegmentQueryProcessor() override;
--
GitLab