Replace IntPoint_3 with std::array<uint32_t, 3>

CGAL · Jun 16, 2020 · a5e037b · a5e037b
1 parent 80ab980
commit a5e037b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/...e/benchmark/Octree/results/2020-06-16.txt → ...benchmark/Octree/results/2020-06-16~1.txt b/...e/benchmark/Octree/results/2020-06-16.txt → ...benchmark/Octree/results/2020-06-16~1.txt
diff --git a/Octree/benchmark/Octree/results/2020-06-16~2.txt b/Octree/benchmark/Octree/results/2020-06-16~2.txt
@@ -0,0 +1,18 @@
+Tue Jun 16 18:00:46 2020
+
+Benchmark Configuration
+~~~~~~~~~~~~~~~~~~~~~~~
+Bucket Size: 20
+Max Depth: 10
+Dataset Source: ../data/archer_statue_scan.ply
+Point Count: 380306
+Number of Runs: 40
+
+Results
+~~~~~~~~~~~~~~~~~~~~~~~
+Tree construction time: 91 ms
+
+Notes
+~~~~~~~~~~~~~~~~~~~~~~~
+IntPoint_3 replaced by std::array<uint32_t, 3>
+
diff --git a/Octree/include/CGAL/Octree/IO.h b/Octree/include/CGAL/Octree/IO.h
@@ -18,7 +18,7 @@ void writeToStream(ostream &os, const CGAL::Octree_node<Kernel, PointRange> &nod
   }
 
   // Print out this node
-  os << node.location().x() << node.location().y() << node.location().z()
+  os << node.location()[0] << node.location()[1] << node.location()[2]
      << " contains " << node.num_points() << " points \n";
 
   // Print out this node's children

diff --git a/Octree/include/CGAL/Octree/Octree_node.h b/Octree/include/CGAL/Octree/Octree_node.h
@@ -104,11 +104,11 @@ namespace CGAL {
     typedef Octree_node<Kernel, PointRange> Node;
     typedef typename Kernel::FT FT;
     typedef typename Kernel::Point_3 Point;
-    typedef IntPoint_3 IntPoint;
     typedef typename Kernel::Vector_3 Vector;
     typedef typename PointRange::const_iterator InputIterator;
     typedef typename std::list<InputIterator> IterList;
 
+    typedef std::array<uint32_t, 3> IntPoint;
     typedef std::array<Node, 8> ChildList;
 
   private: // members :
@@ -125,7 +125,7 @@ namespace CGAL {
     Octree_node() :
             //m_children(NULL),
             m_parent(NULL),
-            m_location(IntPoint(0, 0, 0)),
+            m_location(IntPoint{0, 0, 0}),
             m_depth(0) {}
 
     ~Octree_node() {