[WIP] Path Mapping Barycenters

CMake/merge_tree_planar_layout.xml

@@ -17,6 +17,25 @@ panel_visibility="advanced">
   <BooleanDomain name="bool"/>
 </IntVectorProperty>
 
+<IntVectorProperty
+name="PathPlanarLayout"
+command="SetPathPlanarLayout"
+label="Path Planar Layout"
+number_of_elements="1"
+default_values="0"
+panel_visibility="advanced">
+  <Hints>
+  <PropertyWidgetDecorator type="GenericDecorator"
+                           mode="visibility"
+                           property="MergeTreePlanarLayout"
+                           value="1" />
+  </Hints>
+  <Documentation>
+
+  </Documentation>
+  <BooleanDomain name="bool"/>
+</IntVectorProperty>
+
 <DoubleVectorProperty
 name="BranchSpacing"
 command="SetBranchSpacing"
@@ -184,6 +203,7 @@ default_values="0.05">
 
 <PropertyGroup panel_widget="Line" label="Output options">
   <Property name="BranchDecompositionPlanarLayout"/>
+  <Property name="PathPlanarLayout"/>
   <Property name="BranchSpacing"/>
   <Property name="ImportantPairs"/>
   <Property name="MaximumImportantPairs"/>

CMake/merge_tree_preprocess.xml

@@ -20,6 +20,14 @@ panel_visibility="advanced">
                               mode="visibility"
                               property="Backend"
                               value="2" />
+      <PropertyWidgetDecorator type="GenericDecorator"
+                              mode="visibility"
+                              property="Backend"
+                              value="3" />
+      <PropertyWidgetDecorator type="GenericDecorator"
+                              mode="visibility"
+                              property="Backend"
+                              value="4" />
     </Expression>
   </PropertyWidgetDecorator>
   </Hints>
@@ -81,6 +89,14 @@ default_values="5">
                               mode="visibility"
                               property="Backend"
                               value="2" />
+      <PropertyWidgetDecorator type="GenericDecorator"
+                              mode="visibility"
+                              property="Backend"
+                              value="3" />
+      <PropertyWidgetDecorator type="GenericDecorator"
+                              mode="visibility"
+                              property="Backend"
+                              value="4" />
     </Expression>
   </PropertyWidgetDecorator>
   </Hints>
@@ -177,6 +193,14 @@ default_values="0">
                               mode="visibility"
                               property="Backend"
                               value="2" />
+      <PropertyWidgetDecorator type="GenericDecorator"
+                              mode="visibility"
+                              property="Backend"
+                              value="3" />
+      <PropertyWidgetDecorator type="GenericDecorator"
+                              mode="visibility"
+                              property="Backend"
+                              value="4" />
     </Expression>
   </PropertyWidgetDecorator>
   </Hints>

CMakePresets.json

@@ -1,41 +1,61 @@
 {
-  "version": 2,
-  "configurePresets": [
-    {
-      "name": "TTK-Default",
-      "hidden": true,
-      "binaryDir": "build",
-      "generator": "Ninja",
-      "cacheVariables": {
-        "TTK_ENABLE_DOUBLE_TEMPLATING": "ON"
-      }
-    },
-    {
-      "name": "TTK-Release",
-      "inherits": "TTK-Default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "TTK_ENABLE_CPU_OPTIMIZATION": "OFF",
-        "TTK_ENABLE_MPI": "OFF",
-        "TTK_ENABLE_KAMIKAZE": "ON"
-      }
-    },
-    {
-      "name": "TTK-PerformanceBenchmark",
-      "inherits": "TTK-Default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "TTK_ENABLE_CPU_OPTIMIZATION": "ON",
-        "TTK_ENABLE_KAMIKAZE": "ON"
-      }
-    },
-    {
-      "name": "TTK-Debug",
-      "inherits": "TTK-Default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "TTK_ENABLE_KAMIKAZE": "OFF"
-      }
-    }
-  ]
-}
+    "version": 6,
+    "configurePresets": [
+        {
+            "name": "TTK-Default",
+            "hidden": true,
+            "binaryDir": "build",
+            "generator": "Unix Makefiles",
+            "cacheVariables": {
+                "TTK_ENABLE_DOUBLE_TEMPLATING": "OFF"
+            }
+        },
+        {
+            "name": "TTK-Release",
+            "inherits": "TTK-Default",
+            "binaryDir": "build/release",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "TTK_ENABLE_CPU_OPTIMIZATION": "OFF",
+                "TTK_ENABLE_MPI": "OFF",
+                "TTK_ENABLE_KAMIKAZE": "ON",
+                "TTK_ENABLE_WEBSOCKETPP": "OFF",
+                "WEBSOCKETPP_DIR": "/home/wetzels/ttk/ttk-jonas/websocketpp/install/lib/cmake/websocketpp"
+            }
+        },
+        {
+            "name": "TTK-PerformanceBenchmark",
+            "inherits": "TTK-Default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "TTK_ENABLE_CPU_OPTIMIZATION": "ON",
+                "TTK_ENABLE_KAMIKAZE": "ON"
+            }
+        },
+        {
+            "name": "TTK-Debug",
+            "inherits": "TTK-Default",
+            "binaryDir": "build/debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "TTK_ENABLE_KAMIKAZE": "OFF"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "TTK-Release",
+            "description": "",
+            "displayName": "",
+            "configurePreset": "TTK-Release",
+            "jobs": 4
+        },
+        {
+            "name": "TTK-Debug",
+            "description": "",
+            "displayName": "",
+            "configurePreset": "TTK-Debug",
+            "jobs": 4
+        }
+    ]
+}

core/base/ftmTree/FTMTreeUtils_Template.h

@@ -39,21 +39,63 @@ namespace ttk {
                                      double threshold,
                                      std::vector<double> &excludeLower,
                                      std::vector<double> &excludeHigher) {
-      dataType rootPers = this->getNodePersistence<dataType>(this->getRoot());
-      if(threshold > 1)
-        threshold /= 100.0;
+      idNode treeRoot = this->getRoot();
+      dataType rootValue = this->getValue<dataType>(treeRoot);
+      dataType lowestNodeValue
+        = this->getValue<dataType>(this->getLowestNode<dataType>(treeRoot));
+      dataType rootPers
+        = (rootValue > lowestNodeValue ? rootValue - lowestNodeValue
+                                       : lowestNodeValue - rootValue);
+      threshold /= 100.0;
       threshold = rootPers * threshold;
-      auto pers = this->getNodePersistence<dataType>(nodeId);
-
-      // Excluded pairs
-      bool isExcluded = false;
-      if(excludeLower.size() == excludeHigher.size())
-        for(unsigned i = 0; i < excludeLower.size(); ++i) {
-          isExcluded |= (pers > rootPers * excludeLower[i] / 100.0
-                         and pers < rootPers * excludeHigher[i] / 100.0);
-        }
 
-      return pers > threshold and not isExcluded;
+      auto isImportantPairOneNode = [&](idNode node) {
+        auto pers = this->getNodePersistence<dataType>(node);
+
+        // Excluded pairs
+        bool isExcluded = false;
+        if(excludeLower.size() == excludeHigher.size())
+          for(unsigned i = 0; i < excludeLower.size(); ++i) {
+            isExcluded |= (pers > rootPers * excludeLower[i] / 100.0
+                           and pers < rootPers * excludeHigher[i] / 100.0);
+          }
+        return (pers > threshold and not isExcluded);
+      };
+
+      if(isImportantPairOneNode(nodeId))
+        return true;
+
+      // Test if it is a parent of an important pair (for not persistence based
+      // branch decomposition)
+      idNode saddleNode
+        = (this->isLeaf(nodeId) ? this->getNode(nodeId)->getOrigin() : nodeId);
+      idNode leafNode
+        = (this->isLeaf(nodeId) ? nodeId : this->getNode(nodeId)->getOrigin());
+      std::queue<idNode> queue;
+      std::vector<bool> nodeDone(this->getNumberOfNodes(), false);
+      queue.emplace(leafNode);
+      while(!queue.empty()) {
+        idNode node = queue.front();
+        queue.pop();
+
+        if(isImportantPairOneNode(node))
+          return true;
+
+        nodeDone[node] = true;
+
+        idNode parent = this->getParentSafe(node);
+        if(parent != saddleNode)
+          if(not nodeDone[parent])
+            queue.emplace(parent);
+
+        std::vector<idNode> children;
+        this->getChildren(node, children);
+        for(auto child : children)
+          if(not nodeDone[child])
+            queue.emplace(child);
+      }
+
+      return false;
     }
 
     template <class dataType>