Skip to content
Snippets Groups Projects
Commit 203afee5 authored by Fabian Reister's avatar Fabian Reister
Browse files

bugfix: grasp sets might have similar names for different robots: using robot...

bugfix: grasp sets might have similar names for different robots: using robot name prefix in local map
parent e899ea28
No related branches found
No related tags found
No related merge requests found
Pipeline #21347 failed
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
#include <VirtualRobot/XML/ObjectIO.h> #include <VirtualRobot/XML/ObjectIO.h>
#include <RobotAPI/libraries/armem/server/MemoryToIceAdapter.h> #include <RobotAPI/libraries/armem/server/MemoryToIceAdapter.h>
#include <ArmarXCore/core/exceptions/LocalException.h>
#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXCore/core/rapidxml/wrapper/RapidXmlReader.h> #include <ArmarXCore/core/rapidxml/wrapper/RapidXmlReader.h>
namespace armarx::armem::grasping::segment namespace armarx::armem::grasping::segment
...@@ -71,12 +73,16 @@ namespace armarx::armem::grasping::segment ...@@ -71,12 +73,16 @@ namespace armarx::armem::grasping::segment
retGraspSet.grasps.push_back(retGrasp); retGraspSet.grasps.push_back(retGrasp);
} }
ret.graspSets[retGraspSet.name] = retGraspSet;
ARMARX_CHECK(ret.graspSets.count(retGraspSet.robot + "/" + retGraspSet.name) == 0)
<< "The grasp set `" << retGraspSet.robot + "/" + retGraspSet.name << "` was defined twice!";
ret.graspSets[retGraspSet.robot + "/" + retGraspSet.name] = retGraspSet;
} }
return ret; return ret;
} catch (...) { } catch (...) {
ARMARX_WARNING << graspFilePath << " is not a manipulation object!"; ARMARX_WARNING << graspFilePath << " is not a manipulation object!" << GetHandledExceptionString();
return std::nullopt; return std::nullopt;
} }
} }
...@@ -109,6 +115,16 @@ namespace armarx::armem::grasping::segment ...@@ -109,6 +115,16 @@ namespace armarx::armem::grasping::segment
{ {
knownGraspCandidate->toAron() knownGraspCandidate->toAron()
}; };
ARMARX_VERBOSE << VAROUT(knownGraspCandidate->graspSets.size());
for(const auto& gs : knownGraspCandidate->graspSets)
{
ARMARX_VERBOSE << VAROUT(gs.second.grasps.size());
for(const auto& grasp : gs.second.grasps)
{
ARMARX_VERBOSE << VAROUT(grasp.name);
}
}
} }
} }
ARMARX_INFO << "Loaded " << commit.updates.size() << " grasp candidates from object classes from '" << objectFinder.getPackageName() << "'."; ARMARX_INFO << "Loaded " << commit.updates.size() << " grasp candidates from object classes from '" << objectFinder.getPackageName() << "'.";
......
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