From 1dcf876679f349b2ce986d4734954aed9c21ef19 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Tue, 19 Jan 2021 14:07:13 +0100 Subject: [PATCH] Remove TODOs --- .../CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h | 5 +---- .../test/Shape_detection/test_efficient_RANSAC_scene.cpp | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h b/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h index a003411ab51..c052b30c24e 100644 --- a/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h +++ b/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h @@ -759,8 +759,7 @@ public: num_invalid++; for (std::size_t j = 0; j < m_num_subsets; j++) { - // TODO: With the new octree, all trees have roots (even before refining) - if (m_direct_octrees[j]/* && m_direct_octrees[j]->root()*/) { + if (m_direct_octrees[j]) { std::size_t offset = m_direct_octrees[j]->offset(); if (offset <= indices_points_best_candidate.at(i) && @@ -1031,7 +1030,6 @@ private: / (FT(num_pts) * (octree_depth+1) * (1 << (m_required_samples - 1))), (int) num_candidates), (FT) 1); } - // TODO: Make these work outside the octree! template std::size_t score(const Octree *octree, Shape *candidate, @@ -1149,7 +1147,6 @@ private: do { std::size_t p = CGAL::get_default_random(). uniform_int(0, cur.size() - 1); - // TODO: I'm not sure if dereferencing this is working correctly std::size_t j = octree->index(cur, p); if (shapeIndex[j] == -1) diff --git a/Shape_detection/test/Shape_detection/test_efficient_RANSAC_scene.cpp b/Shape_detection/test/Shape_detection/test_efficient_RANSAC_scene.cpp index a036d9b3a6a..09ff5a02c67 100644 --- a/Shape_detection/test/Shape_detection/test_efficient_RANSAC_scene.cpp +++ b/Shape_detection/test/Shape_detection/test_efficient_RANSAC_scene.cpp @@ -12,9 +12,6 @@ template bool test_scene(int argc, char** argv) { - // TODO: Remove this after testing - CGAL::get_default_random() = CGAL::Random(4); - typedef typename K::FT FT; typedef CGAL::Point_with_normal_3 Pwn; typedef std::vector Pwn_vector;