Skip to content
Snippets Groups Projects
Commit 5416f1cd authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Rename accessed to numAccessed

parent 61e186e2
No related branches found
No related tags found
1 merge request!330Rename time created
...@@ -5,7 +5,7 @@ namespace armarx::armem::base ...@@ -5,7 +5,7 @@ namespace armarx::armem::base
{ {
void EntityInstanceMetadata::access() const void EntityInstanceMetadata::access() const
{ {
accessed++; numAccessed++;
lastAccessedTime = armarx::core::time::DateTime::Now(); lastAccessedTime = armarx::core::time::DateTime::Now();
} }
...@@ -25,7 +25,7 @@ std::ostream& armarx::armem::base::operator<<(std::ostream& os, const EntityInst ...@@ -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_referenced = \t" << armem::toStringMicroSeconds(d.referencedTime) << " us"
<< "\n - t_sent = \t" << armem::toStringMicroSeconds(d.sentTime) << " us" << "\n - t_sent = \t" << armem::toStringMicroSeconds(d.sentTime) << " us"
<< "\n - t_arrived = \t" << armem::toStringMicroSeconds(d.arrivedTime) << " 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" << "\n - confidence = \t" << d.confidence << " us"
; ;
return os; return os;
......
...@@ -62,11 +62,11 @@ namespace armarx::armem::base ...@@ -62,11 +62,11 @@ namespace armarx::armem::base
/// An optional confidence, may be used for things like decay. /// An optional confidence, may be used for things like decay.
float confidence = 1.0; 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(); mutable Time lastAccessedTime = Time::Invalid();
/// A counter how often the instance has been accessed /// A counter how often the instance has been accessed.
mutable unsigned long accessed = 0; mutable unsigned long numAccessed = 0;
virtual ~EntityInstanceMetadata() = default; virtual ~EntityInstanceMetadata() = default;
......
...@@ -60,7 +60,7 @@ namespace armarx::armem ...@@ -60,7 +60,7 @@ namespace armarx::armem
toIce(ice.referencedTime, metadata.referencedTime); toIce(ice.referencedTime, metadata.referencedTime);
toIce(ice.sentTime, metadata.sentTime); toIce(ice.sentTime, metadata.sentTime);
toIce(ice.lastAccessedTime, metadata.lastAccessedTime); toIce(ice.lastAccessedTime, metadata.lastAccessedTime);
ice.accessed = metadata.accessed; ice.accessed = metadata.numAccessed;
} }
void base::fromIce(const data::EntityInstanceMetadata& ice, EntityInstanceMetadata& metadata) void base::fromIce(const data::EntityInstanceMetadata& ice, EntityInstanceMetadata& metadata)
{ {
...@@ -69,7 +69,7 @@ namespace armarx::armem ...@@ -69,7 +69,7 @@ namespace armarx::armem
fromIce(ice.referencedTime, metadata.referencedTime); fromIce(ice.referencedTime, metadata.referencedTime);
fromIce(ice.sentTime, metadata.sentTime); fromIce(ice.sentTime, metadata.sentTime);
fromIce(ice.lastAccessedTime, metadata.lastAccessedTime); fromIce(ice.lastAccessedTime, metadata.lastAccessedTime);
metadata.accessed = ice.accessed; metadata.numAccessed = ice.accessed;
} }
......
...@@ -114,7 +114,7 @@ namespace armarx::armem::gui::instance ...@@ -114,7 +114,7 @@ namespace armarx::armem::gui::instance
armem::toDateTimeMilliSeconds(metadata.referencedTime), armem::toDateTimeMilliSeconds(metadata.referencedTime),
armem::toDateTimeMilliSeconds(metadata.sentTime), armem::toDateTimeMilliSeconds(metadata.sentTime),
armem::toDateTimeMilliSeconds(metadata.arrivedTime), 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()); ARMARX_CHECK_EQUAL(static_cast<size_t>(treeItemMetadata->childCount()), items.size());
int i = 0; int i = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment