diff --git a/corelib/src/Graph.cpp b/corelib/src/Graph.cpp index aad71002..0e180f2a 100644 --- a/corelib/src/Graph.cpp +++ b/corelib/src/Graph.cpp @@ -907,9 +907,10 @@ std::map radiusPosesFiltering( pcl::PointCloud::Ptr cloud(new pcl::PointCloud); cloud->resize(poses.size()); int i=0; - for(std::map::const_iterator iter = poses.begin(); iter!=poses.end(); ++iter) + for(std::map::const_iterator iter = poses.begin(); iter!=poses.end(); ++iter, ++i) { - (*cloud)[i++] = pcl::PointXYZ(iter->second.x(), iter->second.y(), iter->second.z()); + (*cloud)[i] = pcl::PointXYZ(iter->second.x(), iter->second.y(), iter->second.z()); + UASSERT_MSG(pcl::isFinite((*cloud)[i]), uFormat("Invalid pose (%d) %s", iter->first, iter->second.prettyPrint().c_str()).c_str()); } // radius filtering @@ -1011,9 +1012,10 @@ std::multimap radiusPosesClustering(const std::map & p pcl::PointCloud::Ptr cloud(new pcl::PointCloud); cloud->resize(poses.size()); int i=0; - for(std::map::const_iterator iter = poses.begin(); iter!=poses.end(); ++iter) + for(std::map::const_iterator iter = poses.begin(); iter!=poses.end(); ++iter, ++i) { - (*cloud)[i++] = pcl::PointXYZ(iter->second.x(), iter->second.y(), iter->second.z()); + (*cloud)[i] = pcl::PointXYZ(iter->second.x(), iter->second.y(), iter->second.z()); + UASSERT_MSG(pcl::isFinite((*cloud)[i]), uFormat("Invalid pose (%d) %s", iter->first, iter->second.prettyPrint().c_str()).c_str()); } // radius clustering (nearest neighbors) @@ -1257,17 +1259,21 @@ std::map getNodesInRadius( } pcl::PointCloud::Ptr cloud(new pcl::PointCloud); - cloud->resize(nodes.size()-1); - std::vector ids(nodes.size()-1); + cloud->resize(nodes.size()); + std::vector ids(nodes.size()); int oi = 0; for(std::map::const_iterator iter = nodes.begin(); iter!=nodes.end(); ++iter) { if(iter->first != nodeId) { (*cloud)[oi] = pcl::PointXYZ(iter->second.x(), iter->second.y(), iter->second.z()); - ids[oi++] = iter->first; + UASSERT_MSG(pcl::isFinite((*cloud)[oi]), uFormat("Invalid pose (%d) %s", iter->first, iter->second.prettyPrint().c_str()).c_str()); + ids[oi] = iter->first; + ++oi; } } + cloud->resize(oi); + ids.resize(oi); Transform fromT = nodes.at(nodeId);