Changeset f3eb6a

Timestamp:

Apr 23, 2021, 8:34:22 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

9f55b9

Parents:

ef0f8f

git-author:

Frederik Heber <frederik.heber@…> (10/03/20 21:54:41)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 20:34:22)

Message:

FIX: LinkedCell_model executes deletes right away.

• we use the memory address as key in the queue map. If an atom is removed and another new one happens to land at the same address, this will confuse the queue and end in an assertion failure as the update will be overriden and the atom is already present.

Location:

src/LinkedCell

Files:

• LinkedCell_Model.cpp (modified) (1 diff)
• LinkedCell_Model_changeModel.cpp (modified) (1 diff)
• LinkedCell_Model_changeModel.hpp (modified) (1 diff)

src/LinkedCell/LinkedCell_Model.cpp

@@ -333 +333 @@
 void LinkedCell::LinkedCell_Model::deleteNode(const TesselPoint *Walker)
 {
-  LOG(2, "INFO: Requesting update to delete node " << *Walker << ".");
-  Changes->addUpdate(Walker, 0, boost::bind(&LinkedCell_Model::deleteNode_internal, this, _1), "delete");
+  LOG(2, "INFO: Deleting node " << *Walker << ".");
+  deleteNode_internal(Walker);
+  Changes->removeUpdates(Walker);
 }
 

src/LinkedCell/LinkedCell_Model_changeModel.cpp

@@ -93 +93 @@
 }
 
+/**
+ * Removes all contained updates for a specific tesselpoint.
+ *
+ */
+void LinkedCell::LinkedCell_Model::changeModel::removeUpdates(const TesselPoint *Walker)
+{
+  queue.erase(Walker);
+}
+
 /** Empties changeModel::queue by performing all update functions.
  *

src/LinkedCell/LinkedCell_Model_changeModel.hpp

@@ -46 +46 @@
         const std::string name=""
         );
+
+    void removeUpdates(const TesselPoint *Walker);
   private:
     //!> grant LinkedCell_Model access to bind LinkedCellArrayCache to update funcation