From 3f29058fa7a41ff668864fed891f9a78d36feda5 Mon Sep 17 00:00:00 2001
From: Fabian Peller-Konrad <fabian.peller-konrad@kit.edu>
Date: Thu, 21 Dec 2023 10:28:28 +0100
Subject: [PATCH] fix missing member history()
---
source/RobotAPI/libraries/armem/util/util.h | 35 +++++++--------------
1 file changed, 11 insertions(+), 24 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/util/util.h b/source/RobotAPI/libraries/armem/util/util.h
index 2f45b843a..050df3f88 100644
--- a/source/RobotAPI/libraries/armem/util/util.h
+++ b/source/RobotAPI/libraries/armem/util/util.h
@@ -88,18 +88,15 @@ namespace armarx::armem
// loop over all entities and their snapshots
for (const auto &[s, entity] : entities)
{
- for (const auto &[ss, entitySnapshot] : entity.history())
+ entity.forEachInstance([&outV](const wm::EntityInstance& entityInstance)
{
- for (const auto& entityInstance : entitySnapshot.instances())
- {
- const auto o = tryCast<AronClass>(entityInstance);
+ const auto o = tryCast<AronClass>(entityInstance);
- if (o)
- {
- outV.push_back(*o);
- }
+ if (o)
+ {
+ outV.push_back(*o);
}
- }
+ });
}
return outV;
@@ -139,25 +136,15 @@ namespace armarx::armem
// loop over all entities and their snapshots
for (const auto &[s, entity] : entities)
{
- if (entity.history().empty())
+ entity.forEachInstance([&outV, &pred](const wm::EntityInstance& entityInstance)
{
- ARMARX_WARNING << "Empty history for " << s;
- }
-
- ARMARX_DEBUG << "History size: " << entity.history().size();
+ const auto o = tryCast<AronClass>(entityInstance);
- for (const auto &[ss, entitySnapshot] : entity.history())
- {
- for (const auto& entityInstance : entitySnapshot.instances())
+ if (o)
{
- const auto o = tryCast<AronClass>(entityInstance);
-
- if (o)
- {
- outV.push_back(pred(*o));
- }
+ outV.push_back(pred(*o));
}
- }
+ });
}
return outV;
--
GitLab