From 5416f1cd46e05954d106726f3b8a86416ffc6ee7 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Mon, 20 Mar 2023 10:32:17 +0100
Subject: [PATCH] Rename accessed to numAccessed
---
.../libraries/armem/core/base/EntityInstanceBase.cpp | 4 ++--
.../RobotAPI/libraries/armem/core/base/EntityInstanceBase.h | 6 +++---
.../RobotAPI/libraries/armem/core/base/ice_conversions.cpp | 4 ++--
.../RobotAPI/libraries/armem_gui/instance/InstanceView.cpp | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
index 56f207e7e..a2cabd58b 100644
--- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
+++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
@@ -5,7 +5,7 @@ namespace armarx::armem::base
{
void EntityInstanceMetadata::access() const
{
- accessed++;
+ numAccessed++;
lastAccessedTime = armarx::core::time::DateTime::Now();
}
@@ -25,7 +25,7 @@ std::ostream& armarx::armem::base::operator<<(std::ostream& os, const EntityInst
<< "\n - t_referenced = \t" << armem::toStringMicroSeconds(d.referencedTime) << " us"
<< "\n - t_sent = \t" << armem::toStringMicroSeconds(d.sentTime) << " us"
<< "\n - t_arrived = \t" << armem::toStringMicroSeconds(d.arrivedTime) << " us"
- << "\n - t_accessed = \t" << armem::toStringMicroSeconds(d.lastAccessedTime) << " us (" << d.accessed << ")"
+ << "\n - t_accessed = \t" << armem::toStringMicroSeconds(d.lastAccessedTime) << " us (" << d.numAccessed << ")"
<< "\n - confidence = \t" << d.confidence << " us"
;
return os;
diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
index 9e9fbdbc9..5839641f8 100644
--- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
+++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
@@ -62,11 +62,11 @@ namespace armarx::armem::base
/// An optional confidence, may be used for things like decay.
float confidence = 1.0;
- /// An optional value indicating the last access
+ /// An optional value indicating the time of last access.
mutable Time lastAccessedTime = Time::Invalid();
- /// A counter how often the instance has been accessed
- mutable unsigned long accessed = 0;
+ /// A counter how often the instance has been accessed.
+ mutable unsigned long numAccessed = 0;
virtual ~EntityInstanceMetadata() = default;
diff --git a/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp b/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp
index af2dfbcfa..42620f2d9 100644
--- a/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp
+++ b/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp
@@ -60,7 +60,7 @@ namespace armarx::armem
toIce(ice.referencedTime, metadata.referencedTime);
toIce(ice.sentTime, metadata.sentTime);
toIce(ice.lastAccessedTime, metadata.lastAccessedTime);
- ice.accessed = metadata.accessed;
+ ice.accessed = metadata.numAccessed;
}
void base::fromIce(const data::EntityInstanceMetadata& ice, EntityInstanceMetadata& metadata)
{
@@ -69,7 +69,7 @@ namespace armarx::armem
fromIce(ice.referencedTime, metadata.referencedTime);
fromIce(ice.sentTime, metadata.sentTime);
fromIce(ice.lastAccessedTime, metadata.lastAccessedTime);
- metadata.accessed = ice.accessed;
+ metadata.numAccessed = ice.accessed;
}
diff --git a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
index 025eb36cc..1c7a40fae 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
@@ -114,7 +114,7 @@ namespace armarx::armem::gui::instance
armem::toDateTimeMilliSeconds(metadata.referencedTime),
armem::toDateTimeMilliSeconds(metadata.sentTime),
armem::toDateTimeMilliSeconds(metadata.arrivedTime),
- armem::toDateTimeMilliSeconds(metadata.lastAccessedTime) + " (" + std::to_string(metadata.accessed) + " times total)"
+ armem::toDateTimeMilliSeconds(metadata.lastAccessedTime) + " (" + std::to_string(metadata.numAccessed) + " times total)"
};
ARMARX_CHECK_EQUAL(static_cast<size_t>(treeItemMetadata->childCount()), items.size());
int i = 0;
--
GitLab