diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp b/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
index a3c7f7bc8c31e0c6c8ff2af96ebd36412521ee00..8bd030bb8883e73910b182d7aad66feda0dab96f 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
@@ -60,16 +60,16 @@ namespace armarx
void ExampleMemory::onInitComponent()
{
- workingmemory.name() = p.memoryName;
+ workingMemory.name() = p.memoryName;
// Usually, the memory server will specify a number of core segments with a specific aron type.
- workingmemory.addCoreSegment("ExampleData", armem::example::ExampleData::toInitialAronType());
+ workingMemory.addCoreSegment("ExampleData", armem::example::ExampleData::toInitialAronType());
// For illustration purposes, we add more segments (without types).
bool trim = true;
p.core.defaultCoreSegments = simox::alg::split(p.core._defaultSegmentsStr, ",", trim);
p.core._defaultSegmentsStr.clear();
- workingmemory.addCoreSegments(p.core.defaultCoreSegments);
+ workingMemory.addCoreSegments(p.core.defaultCoreSegments);
}
void ExampleMemory::onConnectComponent()
@@ -121,8 +121,8 @@ namespace armarx
using namespace armarx::RemoteGui::Client;
{
- std::scoped_lock lock(workingmemoryMutex);
- tab.memoryGroup = armem::server::MemoryRemoteGui().makeGroupBox(workingmemory);
+ std::scoped_lock lock(workingMemoryMutex);
+ tab.memoryGroup = armem::server::MemoryRemoteGui().makeGroupBox(workingMemory);
}
VBoxLayout root = {tab.memoryGroup, VSpacer()};
diff --git a/source/RobotAPI/components/armem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp b/source/RobotAPI/components/armem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp
index 8247ab6f9d1ff22baecefb6146a14ea6866c8d93..3b17f4fc879dfb49fd1b816f8e4b0e450e3f926f 100644
--- a/source/RobotAPI/components/armem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp
+++ b/source/RobotAPI/components/armem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp
@@ -50,7 +50,7 @@ namespace armarx
void GeneralPurposeMemory::onInitComponent()
{
- workingmemory.name() = memoryName;
+ workingMemory.name() = memoryName;
}
diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
index 256cd79eea945e24e275945a1486a3ccb7c4afe8..18ccb6875d1611e05cf20a8fa714dd293df995e6 100644
--- a/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
+++ b/source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
@@ -46,8 +46,8 @@ namespace armarx::armem::server::obj
const std::string prefix = "mem.";
- memory.name() = defaultMemoryName;
- defs->optional(memory.name(), prefix + "MemoryName", "Name of this memory server.");
+ workingMemory.name() = defaultMemoryName;
+ defs->optional(workingMemory.name(), prefix + "MemoryName", "Name of this memory server.");
classSegment.defineProperties(defs, prefix + "cls.");
instance::SegmentAdapter::defineProperties(defs, prefix + "inst.");
@@ -57,8 +57,10 @@ namespace armarx::armem::server::obj
ObjectMemory::ObjectMemory() :
server::ComponentPluginUser(),
- instance::SegmentAdapter(server::ComponentPluginUser::iceMemory, server::ComponentPluginUser::memoryMutex),
- classSegment(server::ComponentPluginUser::iceMemory, server::ComponentPluginUser::memoryMutex)
+ instance::SegmentAdapter(server::ComponentPluginUser::iceMemory,
+ server::ComponentPluginUser::workingMemoryMutex),
+ classSegment(server::ComponentPluginUser::iceMemory,
+ server::ComponentPluginUser::workingMemoryMutex)
{
}
@@ -69,7 +71,7 @@ namespace armarx::armem::server::obj
void ObjectMemory::onInitComponent()
{
- memory.name() = defaultMemoryName;
+ workingMemory.name() = defaultMemoryName;
instance::SegmentAdapter::init();
diff --git a/source/RobotAPI/components/armem/server/RobotSensorMemory/RobotSensorMemory.cpp b/source/RobotAPI/components/armem/server/RobotSensorMemory/RobotSensorMemory.cpp
index 2293364c6cf55555b40c86b3b9d1490783112e09..a719b42bf112d6d7a58f06066dee3b96efabae83 100644
--- a/source/RobotAPI/components/armem/server/RobotSensorMemory/RobotSensorMemory.cpp
+++ b/source/RobotAPI/components/armem/server/RobotSensorMemory/RobotSensorMemory.cpp
@@ -71,7 +71,7 @@ namespace armarx
robotStateComponentMemoryBatchSize = std::max((unsigned int) 1, robotStateComponentMemoryBatchSize);
robotStateComponentPollFrequency = std::clamp(robotStateComponentPollFrequency, 1, ROBOT_STATE_COMPONENT_MAXIMUM_FREQUENCY);
- workingmemory.name() = workingMemoryName;
+ workingMemory.name() = workingMemoryName;
}
@@ -114,7 +114,7 @@ namespace armarx
void RobotSensorMemory::setupRobotUnitSegment()
{
ARMARX_INFO << "Adding core segment " << robotUnitCoreSegmentName;
- workingmemory.addCoreSegments({robotUnitCoreSegmentName});
+ workingMemory.addCoreSegments({robotUnitCoreSegmentName});
ARMARX_INFO << "Adding provider segment " << robotUnitCoreSegmentName << "/" << robotUnitProviderSegmentName;
armem::data::AddSegmentInput input;
@@ -379,7 +379,7 @@ namespace armarx
void RobotSensorMemory::setupRobotStateComponentSegment()
{
ARMARX_INFO << "Adding core segment " << robotStateComponentCoreSegmentName;
- workingmemory.addCoreSegments({robotStateComponentCoreSegmentName});
+ workingMemory.addCoreSegments({robotStateComponentCoreSegmentName});
ARMARX_INFO << "Adding provider segment " << robotStateComponentCoreSegmentName << "/" << robotStateComponentProviderSegmentName;
armem::data::AddSegmentInput input;
diff --git a/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp b/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp
index 4efdcbff7b43ca8a168ba17d0970b1b6a5781d10..295e2c6aee2010162c6919af97141f28989b6040 100644
--- a/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp
+++ b/source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp
@@ -50,7 +50,7 @@ namespace armarx
void SkillsMemory::onInitComponent()
{
- workingmemory.name() = memoryName;
+ workingMemory.name() = memoryName;
}
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
index c5aff2156b36fc76b06920ba82a2db44539b1f19..536c72f49d6ccb4c656f37c345dc6a4ec70b4f17 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
@@ -41,7 +41,7 @@ namespace armarx::armem::server::plugins
settings.user = longTermMemoryDatabaseUser;
settings.password = longTermMemoryDatabasePassword;
- parent.longtermmemory.reload(settings);
+ parent.longtermMemory.reload(settings);
}
@@ -58,7 +58,7 @@ namespace armarx::armem::server::plugins
data::RegisterMemoryResult ComponentPlugin::registerMemory(ComponentPluginUser& parent)
{
data::RegisterMemoryInput input;
- input.name = parent.workingmemory.name();
+ input.name = parent.workingMemory.name();
input.proxy = MemoryInterfacePrx::checkedCast(parent.getProxy());
ARMARX_CHECK_NOT_NULL(input.proxy);
data::RegisterMemoryResult result = parent.memoryNameSystem->registerMemory(input);
@@ -81,7 +81,7 @@ namespace armarx::armem::server::plugins
try
{
data::RemoveMemoryInput input;
- input.name = parent.workingmemory.name();
+ input.name = parent.workingMemory.name();
result = parent.memoryNameSystem->removeMemory(input);
if (result.success)
{
@@ -122,7 +122,7 @@ namespace armarx::armem::server
data::AddSegmentsResult ComponentPluginUser::addSegments(const data::AddSegmentsInput& input, bool addCoreSegments)
{
- std::scoped_lock lock(workingmemoryMutex);
+ std::scoped_lock lock(workingMemoryMutex);
data::AddSegmentsResult result = iceMemory.addSegments(input, addCoreSegments);
return result;
}
@@ -130,7 +130,7 @@ namespace armarx::armem::server
data::CommitResult ComponentPluginUser::commit(const data::Commit& commitIce, const Ice::Current&)
{
- std::scoped_lock lock(workingmemoryMutex);
+ std::scoped_lock lock(workingMemoryMutex);
return iceMemory.commit(commitIce);
}
@@ -138,15 +138,15 @@ namespace armarx::armem::server
// READING
armem::query::data::Result ComponentPluginUser::query(const armem::query::data::Input& input, const Ice::Current&)
{
- std::scoped_lock lock(workingmemoryMutex);
+ std::scoped_lock lock(workingMemoryMutex);
return iceMemory.query(input);
}
// LTM LOADING
data::StoreResult ComponentPluginUser::store(const data::StoreInput& input, const Ice::Current&)
{
- std::scoped_lock lock(workingmemoryMutex);
- std::scoped_lock lock2(longtermmemoryMutex);
+ std::scoped_lock lock(workingMemoryMutex);
+ std::scoped_lock lock2(longtermMemoryMutex);
return iceMemory.store(input);
}
@@ -154,7 +154,7 @@ namespace armarx::armem::server
// LTM STORING
armem::query::data::Result ComponentPluginUser::load(const armem::query::data::Input& input, const Ice::Current&)
{
- std::scoped_lock lock(longtermmemoryMutex);
+ std::scoped_lock lock(longtermMemoryMutex);
return iceMemory.load(input);
}
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
index c051995c4c6790731850bc4294e9dba59155a795..fc2154f59a0d640a2b6d6e07f5df51465caa2812 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
@@ -96,11 +96,11 @@ namespace armarx::armem::server
public:
/// The actual memory.
- wm::Memory workingmemory;
- std::mutex workingmemoryMutex;
+ wm::Memory workingMemory;
+ std::mutex workingMemoryMutex;
- ltm::Memory longtermmemory;
- std::mutex longtermmemoryMutex;
+ ltm::Memory longtermMemory;
+ std::mutex longtermMemoryMutex;
/// property defaults
std::string memoryListenerDefaultName = "MemoryUpdates";
@@ -109,7 +109,7 @@ namespace armarx::armem::server
std::string longTermMemoryDatabasePasswordDefault = "";
/// Helps connecting `memory` to ice. Used to handle Ice callbacks.
- MemoryToIceAdapter iceMemory { &workingmemory, &longtermmemory};
+ MemoryToIceAdapter iceMemory { &workingMemory, &longtermMemory};
private:
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
index 259c0ca97ed7b8e3c05cac1d878ba2b0164378a3..6895cf4e5b27ecec5872a38890d8111b41405fa7 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
@@ -12,7 +12,8 @@
namespace armarx::armem::server
{
- MemoryToIceAdapter::MemoryToIceAdapter(wm::Memory* workingmemory, ltm::Memory* longtermmemory) : workingMemory(workingmemory), longtermMemory(longtermmemory)
+ MemoryToIceAdapter::MemoryToIceAdapter(wm::Memory* workingMemory, ltm::Memory* longtermMemory) :
+ workingMemory(workingMemory), longtermMemory(longtermMemory)
{
}