Changeset ef0f8f

Timestamp:

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

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

f3eb6a

Parents:

d9e1d1

git-author:

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

git-committer:

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

Message:

LinkCell model has name on update for debugging.

Location:

src/LinkedCell

Files:

• LinkedCell_Model.cpp (modified) (3 diffs)
• LinkedCell_Model_Update.cpp (modified) (1 diff)
• LinkedCell_Model_Update.hpp (modified) (4 diffs)
• LinkedCell_Model_changeModel.cpp (modified) (4 diffs)
• LinkedCell_Model_changeModel.hpp (modified) (1 diff)

src/LinkedCell/LinkedCell_Model.cpp

@@ -322 +322 @@
 {
   LOG(2, "INFO: Requesting update to add node " << *Walker << ".");
-  Changes->addUpdate(Walker, 0, boost::bind(&LinkedCell_Model::addNode_internal, this, _1));
+  Changes->addUpdate(Walker, 0, boost::bind(&LinkedCell_Model::addNode_internal, this, _1), "add");
 }
 
@@ -334 +334 @@
 {
   LOG(2, "INFO: Requesting update to delete node " << *Walker << ".");
-  Changes->addUpdate(Walker, 0, boost::bind(&LinkedCell_Model::deleteNode_internal, this, _1));
+  Changes->addUpdate(Walker, 0, boost::bind(&LinkedCell_Model::deleteNode_internal, this, _1), "delete");
 }
 
@@ -345 +345 @@
   LOG(2, "INFO: Requesting update to move node " << *Walker << " to position "
       << Walker->getPosition() << ".");
-  Changes->addUpdate(Walker, 10, boost::bind(&LinkedCell_Model::moveNode_internal, this, _1));
+  Changes->addUpdate(Walker, 10, boost::bind(&LinkedCell_Model::moveNode_internal, this, _1), "move");
 }
 

src/LinkedCell/LinkedCell_Model_Update.cpp

@@ -44 +44 @@
  * @param _priority priority of the update (the lower, the more important)
  */
-LinkedCell::LinkedCell_Model::Update::Update(boost::function<void (const TesselPoint *)> _updateMethod, const TesselPoint *_Walker, const PriorityLevel _priority) :
+LinkedCell::LinkedCell_Model::Update::Update(boost::function<void (const TesselPoint *)> _updateMethod, const TesselPoint *_Walker, const PriorityLevel _priority, const std::string _name) :
   updateMethod(_updateMethod),
   Walker(_Walker),
-  priority(_priority)
+  priority(_priority),
+  name(_name)
 {}
 

src/LinkedCell/LinkedCell_Model_Update.hpp

@@ -13 +13 @@
 #include <config.h>
 #endif
+
+#include <string>
 
 #include <boost/function.hpp>
@@ -32 +34 @@
     typedef size_t PriorityLevel;
 
-    Update(boost::function<void (const TesselPoint *)> _updateMethod, const TesselPoint *_Walker, const PriorityLevel _priority);
+    Update(boost::function<void (const TesselPoint *)> _updateMethod, const TesselPoint *_Walker, const PriorityLevel _priority, const std::string name="");
     ~Update();
 
@@ -38 +40 @@
 
     size_t getPriority() const { return priority; }
+
+    std::string getName() { return name; }
 
   private:
@@ -53 +57 @@
     //!> priority level of this Update (the lower, the more important)
     PriorityLevel priority;
+    //!> name of the update
+    const std::string name;
   };
 } // namespace LinkedCell

src/LinkedCell/LinkedCell_Model_changeModel.cpp

@@ -40 +40 @@
 #include "CodePatterns/toString.hpp"
 
+#include "Atom/TesselPoint.hpp"
+
 /** Constructor of LinkedCell_Model::changeModel.
  *
@@ -69 +71 @@
     const TesselPoint *Walker,
     const LinkedCell_Model::Update::PriorityLevel priority,
-    boost::function<void (const TesselPoint *)> _updateMethod
+    boost::function<void (const TesselPoint *)> _updateMethod,
+    const std::string name
     )
 {
@@ -78 +81 @@
       OBSERVE;
       delete iter->second;
-      iter->second = new Update(_updateMethod, Walker, priority);
+      iter->second = new Update(_updateMethod, Walker, priority, name);
     } else {
-      LOG(2, "INFO: Rejecting update for LinkedCell_Model as higher prioritized one is present.");
+      LOG(2, "INFO: Rejecting update '" << name << "' for LinkedCell_Model as higher prioritized one is present.");
     }
   } else {
     // insert new update
-    LOG(2, "INFO: Placing new update into queue for LinkedCell_Model.");
+    LOG(2, "INFO: Placing new update '" << name << "' into queue for LinkedCell_Model.");
     OBSERVE;
-    queue.insert( std::make_pair(Walker, new Update(_updateMethod, Walker, priority)) );
+    queue.insert( std::make_pair(Walker, new Update(_updateMethod, Walker, priority, name)) );
   }
 }
@@ -99 +102 @@
       !queue.empty();
       iter = queue.begin()) {
-    LOG(2, "INFO: Performing update ...");
+    LOG(2, "INFO: Performing update '"+iter->second->getName()+"' on "
+        +toString(iter->first)+"...");
     // perform update
     (*iter->second)();

src/LinkedCell/LinkedCell_Model_changeModel.hpp

@@ -43 +43 @@
         const TesselPoint *Walker,
         const Update::PriorityLevel priority,
-        boost::function<void (const TesselPoint *)> _updateMethod
+        boost::function<void (const TesselPoint *)> _updateMethod,
+        const std::string name=""
         );
   private: