Add reminder to replace fixed side length map size

CGAL · Aug 7, 2020 · 9fb5182 · 9fb5182
1 parent b9b269e
commit 9fb5182
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Octree/include/CGAL/Octree.h b/Octree/include/CGAL/Octree.h
@@ -222,6 +222,7 @@ class Octree {
     m_side_per_depth.resize(0);
 
     // create a side length map
+    // TODO: This should not be a fixed value (32)
     for (int i = 0; i <= (int) 32; i++)
       m_side_per_depth.push_back(m_bbox_side / (FT) (1 << i));
 

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
@@ -213,7 +213,7 @@ class Efficient_RANSAC {
 
 //  typedef internal::Octree<internal::DirectPointAccessor<Traits> >
 //          Direct_octree;
-  typedef internal::Direct_octree<Traits> Direct_octree;
+  typedef internal::Indexed_octree<Traits> Direct_octree;
   typedef internal::Indexed_octree<Traits> Indexed_octree;
 
   //--------------------------------------------typedef
@@ -372,14 +372,9 @@ class Efficient_RANSAC {
                 m_point_pmap,
                 0);
 
-      std::cout << "s = " << s << std::endl;
-      std::cout << *(m_input_iterator_first + 0) << std::endl;
-
       m_available_octree_sizes[s] = subsetSize;
       m_direct_octrees[s]->refine(m_options.cluster_epsilon);
 
-      std::cout << *(m_input_iterator_first + 0) << std::endl;
-
       remainingPoints -= subsetSize;
     }
 
@@ -905,8 +900,9 @@ class Efficient_RANSAC {
 
 private:
   int select_random_octree_level() {
-    return (int) get_default_random()(
-            static_cast<unsigned int>(m_global_octree->maxLevel() + 1));
+    std::cout << m_global_octree->maxLevel() << std::endl;
+    auto upper_bound = static_cast<unsigned int>(m_global_octree->maxLevel() + 1);
+    return (int) get_default_random()(upper_bound);
   }
 
   Shape *get_best_candidate(std::vector<Shape *> &candidates,