Merge pull request #1109 from thom-dani/critical-point-tracking

Critical point tracking

Author: julien-tierny

core/base/assignmentSolver/AssignmentAuction.h

@@ -62,6 +62,10 @@ namespace ttk {
       epsilon = eps;
     }
 
+    inline void setDeltaLim(double delta) {
+      delta_lim = delta;
+    }
+
     inline void setEpsilonDiviserMultiplier(double div) {
       epsilonDiviserMultiplier = div;
     }

core/base/trackingFromCriticalPoints/TrackingFromCriticalPoints.cpp

@@ -427,6 +427,7 @@ void ttk::TrackingFromCriticalPoints::assignmentSolver(
     if(assignmentMethod_ == 0) {
       ttk::AssignmentAuction<double> solver;
       solver.setInput(costMatrix);
+      solver.setDeltaLim(assignmentPrecision);
       solver.run(matching);
       solver.clearMatrix();
     } else if(assignmentMethod_ == 1) {

core/base/trackingFromCriticalPoints/TrackingFromCriticalPoints.h

@@ -26,6 +26,7 @@ namespace ttk {
     double meshDiameter_{1};
     double tolerance_{10e-3};
     int assignmentMethod_{0};
+    double assignmentPrecision{0.01};
     double xWeight_{1};
     double yWeight_{1};
     double zWeight_{1};
@@ -48,6 +49,10 @@ namespace ttk {
       tolerance_ = t;
     }
 
+    void setAssignmentPrecision(double p) {
+      assignmentPrecision = p;
+    }
+
     void setAssignmentMethod(int a) {
       if(a == 0 || a == 1) {
         assignmentMethod_ = a;

core/vtk/ttkTrackingFromFields/ttkTrackingFromFields.cpp

@@ -138,6 +138,7 @@ int ttkTrackingFromFields::trackWithCriticalPointMatching(
   tracker.setEpsilon(relativeDestructionCost);
   tracker.setAssignmentMethod(assignmentMethod);
   tracker.setWeights(PX, PY, PZ, PF);
+  tracker.setAssignmentPrecision(AssignmentPrecision);
 
   tracker.setThreadNumber(this->threadNumber_);
   tracker.setDebugLevel(this->debugLevel_);

core/vtk/ttkTrackingFromFields/ttkTrackingFromFields.h

@@ -83,6 +83,10 @@ class TTKTRACKINGFROMFIELDS_EXPORT ttkTrackingFromFields
   vtkGetMacro(RelativeDestructionCost, double);
   /// @}
 
+  vtkSetMacro(AssignmentPrecision, double);
+  vtkGetMacro(AssignmentPrecision, double);
+  /// @}
+
   /// @brief Importance weight for the X component of the extremum.
   /// @{
   vtkSetMacro(PX, double);
@@ -193,6 +197,7 @@ class TTKTRACKINGFROMFIELDS_EXPORT ttkTrackingFromFields
   double PF{0};
 
   double RelativeDestructionCost{0.1};
+  double AssignmentPrecision{0.01};
   int AssignmentMethod{0};
 
   // Bottleneck config.

doc/img/splash.png

@@ -153,25 +153,19 @@ by a list of scalar fields) and which computes a tracking mesh."
         default_values="0.1"
         panel_visibility="advanced">
         <Hints>
-          <PropertyWidgetDecorator type="CompositeDecorator">
-            <Expression type="and">
-              <PropertyWidgetDecorator type="GenericDecorator"
-                                   mode="visibility"
-                                   property="Backend"
-                                   value="2" />
-              <PropertyWidgetDecorator type="GenericDecorator"
-                                    mode="visibility"
-                                    property="adaptDeathBirthCost"
-                                    value="0" />
-            </Expression>
-          </PropertyWidgetDecorator>                                                      
+          <PropertyWidgetDecorator type="GenericDecorator"
+                               mode="visibility"
+                               property="Backend"
+                               value="2" />                                                 
         </Hints>
         <Documentation>
-        Relative cost (with regard to the data span, between 0 and 1) associated with the destruction of a critical point. Set this parameter to larger values to allow for larger displcements for a critical point from one time step to another. Set this parameter to smaller values to prevent a critical point from jumping too far from one time step to another.
+        Relative cost (with regard to the data span, between 0 and 1) associated with the destruction of a critical point. Set this parameter to larger values to allow for larger displacements for a critical point from one time step to another. Set this parameter to smaller values to prevent a critical point from jumping too far from one time step to another.
         </Documentation>
         <DoubleRangeDomain name="range" min="0" max="1" />
       </DoubleVectorProperty>
 
+      
+
       <DoubleVectorProperty
         name="spe"
         label="Extremum weight"
@@ -275,6 +269,32 @@ the critical point.</Documentation>
         <Documentation>Importance weight for the function value of the critical point.</Documentation>
       </DoubleVectorProperty>
 
+      <DoubleVectorProperty
+        name="deltalim"
+        label="Assignment Precision"
+        command="SetAssignmentPrecision"
+        number_of_elements="1"
+        default_values="0.01"
+        panel_visibility="advanced">
+        <Hints>
+          <PropertyWidgetDecorator type="CompositeDecorator">
+            <Expression type="and">
+              <PropertyWidgetDecorator type="GenericDecorator"
+                                       mode="visibility"
+                                       property="Backend"
+                                       value="2" />
+              <PropertyWidgetDecorator type="GenericDecorator"
+                                       mode="visibility"
+                                       property="AssignmentMethod"
+                                       value="0" />
+              </Expression>
+            </PropertyWidgetDecorator>                          
+          </Hints>
+          <Documentation>
+            Set the relative precision for the optimal assignment approximation solver (auction algorithm).
+          </Documentation>
+          <DoubleRangeDomain name="range" min="0.000001" max="1" />
+        </DoubleVectorProperty>
 
       <IntVectorProperty
       name="Use spacing"