Fix of Insert: Child nodes are attached in order

attcs · Mar 26, 2024 · 561a230 · 561a230
1 parent 75bd3e4
commit 561a230
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/adaptortests/test.cpp b/adaptortests/test.cpp
@@ -340,7 +340,7 @@ namespace
     tree.Insert(pointNo - 1, points.back());
     tree.template Erase<false>(0, points[0]);
     auto const entityIDsInDFS_AfterErase_Actual = tree.CollectAllIdInDFS();
-    auto const entityIDsInDFS_AfterErase_Expected = std::vector<std::size_t>{ 1, 8, 9, 10, 7, 6, 5, 2, 3, 4 };
+    auto const entityIDsInDFS_AfterErase_Expected = std::vector<std::size_t>{ 1, 8, 10, 9, 7, 6, 5, 2, 3, 4 };
 
     auto const entityIDsKNNActual = tree.GetNearestNeighbors(pointOfkNN, 3, points);
     auto const entityIDsKNNExpected = std::vector<std::size_t>{ 1, 10, 8 };

diff --git a/octree.h b/octree.h
@@ -971,7 +971,6 @@ namespace OrthoTree
     inline Node& createChild(Node& parentNode, ChildID childID, MortonNodeIDCR childKey) noexcept
     {
       assert(childID < this->CHILD_NO);
-      parentNode.AddChild(childKey);
 
       auto& nodeChild = m_nodes[childKey];
       if constexpr (std::is_integral_v<TGeometry>)
@@ -1110,7 +1109,10 @@ namespace OrthoTree
           if (parentNode.HasChild(childNodeKey))
             return childNodesCache.emplace_back(childNodeKey, this->m_nodes.at(childNodeKey)).second;
           else
+          {
+            parentNode.AddChildInOrder(childNodeKey);
             return childNodesCache.emplace_back(childNodeKey, this->createChild(parentNode, childID, childNodeKey)).second;
+          }
         };
 
         autoce isPointSolution = std::is_same_v<TVector, TData>;
@@ -1189,6 +1191,7 @@ namespace OrthoTree
           autoc childID = getChildIDByDepth(parentDepth, this->GetDepthID(entityNodeKey), entityNodeKey);
           autoc childNodeKey = parentFlag | MortonGridID(childID);
 
+          parentNode.AddChildInOrder(childNodeKey);
           auto& nodeChild = this->createChild(parentNode, childID, childNodeKey);
           nodeChild.Entities.emplace_back(entityID);
         }
@@ -2042,6 +2045,7 @@ namespace OrthoTree
         MortonGridID const childKey = parentKeyFlag | actualChildGridID;
         MortonGridID const beginChildGridID = gridID + actualChildGridID * stepNo;
 
+        parentNode.AddChild(childKey);
         auto& childNode = this->createChild(parentNode, actualChildID, childKey);
         this->addNodes(childNode, childKey, locationBeginIterator, actualEndIterator, beginChildGridID, remainingDepth);
       }
@@ -2519,6 +2523,7 @@ namespace OrthoTree
         MortonGridID const childKey = parentFlag | actualChildID_;
         MortonGridID const firstChildLocationID = firstLocationID + actualChildID_ * locationStepNo;
 
+        parentNode.AddChild(childKey);
         auto& nodeChild = this->createChild(parentNode, actualChildID, childKey);
         this->addNodes(nodeChild, childKey, beginLocationIterator, actualEndLocationIterator, firstChildLocationID, remainingDepthNo);
       }

diff --git a/unittests/adaptor.tests.cpp b/unittests/adaptor.tests.cpp
@@ -213,7 +213,7 @@ namespace AdaptorTest
 
         Assert::IsTrue(vector<std::size_t>{ 7, 6, 5, 0, 2, 1, 8, 9, 3, 4 } == entityIDsInBFS);
         Assert::IsTrue(vector<std::size_t>{ 0, 1, 8, 9, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS);
-        Assert::IsTrue(vector<std::size_t>{ 1, 8, 9, 10, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS_AfterErase);
+        Assert::IsTrue(vector<std::size_t>{ 1, 8, 10, 9, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS_AfterErase);
       }
 
       TEST_METHOD(BoxGeneral2DC_Example2)
@@ -349,7 +349,7 @@ namespace AdaptorTest
 
         Assert::IsTrue(vector<std::size_t>{ 7, 6, 5, 0, 2, 1, 8, 9, 3, 4 } == entityIDsInBFS);
         Assert::IsTrue(vector<std::size_t>{ 0, 1, 8, 9, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS);
-        Assert::IsTrue(vector<std::size_t>{ 1, 8, 9, 10, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS_AfterErase);
+        Assert::IsTrue(vector<std::size_t>{ 1, 8, 10, 9, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS_AfterErase);
       }
 
       TEST_METHOD(BoxGeneral2DC_Example2)
@@ -594,7 +594,7 @@ namespace AdaptorTest
 
         Assert::IsTrue(vector<std::size_t>{ 7, 6, 5, 0, 2, 1, 8, 9, 3, 4 } == entityIDsInBFS);
         Assert::IsTrue(vector<std::size_t>{ 0, 1, 8, 9, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS);
-        Assert::IsTrue(vector<std::size_t>{ 1, 8, 9, 10, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS_AfterErase);
+        Assert::IsTrue(vector<std::size_t>{ 1, 8, 10, 9, 7, 6, 5, 2, 3, 4 } == entityIDsInDFS_AfterErase);
       }
 
       TEST_METHOD(BoxGeneral2DC_Example2)