Naming convention change

attcs · Feb 17, 2024 · 67a9bf6 · 67a9bf6
1 parent 26fd69c
commit 67a9bf6
Show file tree

Hide file tree

Showing 9 changed files with 1,457 additions and 1,392 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -0,0 +1 @@
+unittests/*
diff --git a/octree.h b/octree.h
diff --git a/octree_container.h b/octree_container.h
diff --git a/unittests/adaptor.tests.cpp b/unittests/adaptor.tests.cpp
@@ -2,6 +2,9 @@
 
 using namespace OrthoTree;
 
+using std::array;
+using std::vector;
+
 namespace CustomGeometryType
 {
   // User-defined geometrical objects
@@ -34,10 +37,10 @@ namespace CustomGeometryType
       }
     }
 
-    static constexpr Point2DCustom& box_min(BoundingBox2DCustom& box) { return box[0]; }
-    static constexpr Point2DCustom& box_max(BoundingBox2DCustom& box) { return box[1]; }
-    static constexpr Point2DCustom const& box_min_c(BoundingBox2DCustom const& box) { return box[0]; }
-    static constexpr Point2DCustom const& box_max_c(BoundingBox2DCustom const& box) { return box[1]; }
+    static constexpr Point2DCustom& box_min(BoundingBox2DCustom& Box) { return Box[0]; }
+    static constexpr Point2DCustom& box_max(BoundingBox2DCustom& Box) { return Box[1]; }
+    static constexpr Point2DCustom const& box_min_c(BoundingBox2DCustom const& Box) { return Box[0]; }
+    static constexpr Point2DCustom const& box_max_c(BoundingBox2DCustom const& Box) { return Box[1]; }
   };
 
   using AdaptorCustom = OrthoTree::AdaptorGeneralBase<2, Point2DCustom, BoundingBox2DCustom, AdaptorBasicsCustom, float>;
@@ -79,7 +82,7 @@ namespace AdaptorTest
       autoc tree = QuadtreePointCustom(vector<Point2DCustom>{}, 2);
       autoc& nodes = tree.GetNodes();
       Assert::IsTrue(nodes.size() == 1);
-      Assert::IsTrue(nodes.at(1).vid.empty());
+      Assert::IsTrue(nodes.at(1).Entities.empty());
       Assert::IsTrue(AreEqualAlmost(tree.GetBox(), BoundingBox2DCustom{}));
     }
 
@@ -92,7 +95,7 @@ namespace AdaptorTest
 
       autoc& nodes = tree.GetNodes();
       Assert::AreEqual<size_t>(7, nodes.size());
-      Assert::IsTrue(nodes.at(tree.GetHash(2, 15)).vid == vector<size_t>{ 3, 4 });
+      Assert::IsTrue(nodes.at(tree.GetHash(2, 15)).Entities == vector<size_t>{ 3, 4 });
     }
 
     TEST_METHOD(Contains__1__True)

diff --git a/unittests/bitset.arithmetic.tests.cpp b/unittests/bitset.arithmetic.tests.cpp
@@ -2,6 +2,9 @@
 
 using namespace OrthoTree;
 
+using std::array;
+using std::vector;
+
 namespace BitsetArithmeticTest
 {
   TEST_CLASS(BitsetArithmeticTest)

diff --git a/unittests/compile_test.h b/unittests/compile_test.h
@@ -65,7 +65,7 @@ void testCompilePoint()
 
     autoc keySmallest = tree.FindSmallestNodeKey(keyRoot);
     autoc boxAll = tree.GetBox();
-    autoc nDepth = tree.GetDepth(keyRoot);
+    autoc nDepth = tree.GetDepthID(keyRoot);
     autoc nDepthMax = tree.GetDepthMax();
     autoc nodeRoot = tree.GetNode(keyRoot);
     autoc nodes = tree.GetNodes();
@@ -142,7 +142,7 @@ void testCompileBox()
 
     autoc keySmallest = tree.FindSmallestNodeKey(keyRoot);
     autoc boxAll = tree.GetBox();
-    autoc nDepth = tree.GetDepth(keyRoot);
+    autoc nDepth = tree.GetDepthID(keyRoot);
     autoc nDepthMax = tree.GetDepthMax();
     autoc nodeRoot = tree.GetNode(keyRoot);
     autoc nodes = tree.GetNodes();

diff --git a/unittests/example.tests.cpp b/unittests/example.tests.cpp
@@ -2,6 +2,9 @@
 
 using namespace OrthoTree;
 
+using std::array;
+using std::vector;
+
 namespace Example
 {
   TEST_CLASS(ExampleTests)
@@ -33,7 +36,7 @@ namespace Example
       };
 
       auto quadtreebox = QuadtreeBox(boxes, 3
-        , std::nullopt // user-provided bounding box for all
+        , std::nullopt // user-provided bounding Box for all
         , 2            // max element in a node 
       );
 
@@ -96,7 +99,7 @@ namespace Example
       };
 
       auto quadtreebox = QuadtreeBoxC(boxes, 3
-        , std::nullopt // user-provided bounding box for all
+        , std::nullopt // user-provided bounding Box for all
         , 2            // max element in a node 
         , false        // parallel calculation flag
       );
@@ -127,7 +130,7 @@ namespace Example
       auto boxes = vector{ BoundingBox3D{ { 0.0, 0.0, 0.0 }, { 1.0, 1.0, 1.0 } } /* and more... */ };
       // Using ctor
       {
-        auto octreebox = OctreeBoxC(boxes, 3, std::nullopt, OctreeBox::max_element_default
+        auto octreebox = OctreeBoxC(boxes, 3, std::nullopt, OctreeBox::DEFAULT_MAX_ELEMENT
           , true // Set std::execution::parallel_unsequenced_policy
         );
       }