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

Remove requirement that object memory needs instance index for prediction

parent f7a76139
No related branches found
No related tags found
No related merge requests found
......@@ -234,15 +234,16 @@ namespace armarx::armem::server::obj
auto boRequest = armarx::fromIce<armem::PredictionRequest>(request);
armem::PredictionResult result;
result.snapshotID = boRequest.snapshotID;
if (armem::contains(workingMemory().id().withCoreSegmentName("Instance"),
boRequest.snapshotID) &&
!boRequest.snapshotID.hasGap() && boRequest.snapshotID.hasInstanceIndex())
if (armem::contains(workingMemory().id().withCoreSegmentName("Instance"), boRequest.snapshotID)
and not boRequest.snapshotID.hasGap()
and boRequest.snapshotID.hasTimestamp())
{
objpose::ObjectPosePredictionRequest objPoseRequest;
toIce(objPoseRequest.timeWindow, Duration::SecondsDouble(predictionTimeWindow));
objPoseRequest.objectID = toIce(ObjectID(request.snapshotID.entityName));
objPoseRequest.settings = request.settings;
toIce(objPoseRequest.timestamp, boRequest.snapshotID.timestamp);
objpose::ObjectPosePredictionResult objPoseResult =
predictObjectPoses({objPoseRequest}).at(0);
result.success = objPoseResult.success;
......@@ -263,6 +264,10 @@ namespace armarx::armem::server::obj
}
else
{
if (not boRequest.snapshotID.hasInstanceIndex())
{
boRequest.snapshotID.instanceIndex = 0;
}
auto* aronInstance = queryResult.memory.findLatestInstance(
boRequest.snapshotID, boRequest.snapshotID.instanceIndex);
if (aronInstance == nullptr)
......
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