Introducing additional backends for integral line computation (discrete & numerical)

.github/workflows/check.yml

@@ -15,7 +15,7 @@ jobs:
   # Check source formatting #
   # ----------------------- #
   check-formatting:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-26.04
     steps:
     - uses: actions/checkout@v4
 

core/base/common/welcomeMsg.inl

@@ -12,7 +12,8 @@ printMsg(
   debug::LineMode::NEW,
   stream);
 printMsg(debug::output::BOLD
-  + "|_   _|_   _| |/ /                   / /__\\ \\  |___ \\ / _ \\___ \\ / /_"
+           + "|_   _|_   _| |/ /                   / /__\\ \\  |___ \\ / _ "
+             "\\___ \\ / /_"
            + debug::output::ENDCOLOR,
          debug::Priority::PERFORMANCE,
          debug::LineMode::NEW,
@@ -32,7 +33,8 @@ printMsg(
   debug::LineMode::NEW,
   stream);
 printMsg(debug::output::BOLD
-    + "  |_|   |_| |_|\\_\\                  | |\\___| | |_____|\\___/_____|\\___/"
+           + "  |_|   |_| |_|\\_\\                  | |\\___| | "
+             "|_____|\\___/_____|\\___/"
            + debug::output::ENDCOLOR,
          debug::Priority::PERFORMANCE,
          debug::LineMode::NEW,

core/base/continuousScatterPlot/ContinuousScatterPlot.h

@@ -499,7 +499,7 @@ int ttk::ContinuousScatterPlot::execute(
             if(v < 0.0 or (u + v) > 1.0)
               continue;
 
-              // triangle/ray intersection below
+            // triangle/ray intersection below
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp atomic update
 #endif

core/base/contourTree/ContourTree.cpp

@@ -2704,17 +2704,23 @@ int ContourTree::computeSkeleton(unsigned int arcResolution) {
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { SubLevelSetTree::computeSkeleton(arcResolution); }
+    {
+      SubLevelSetTree::computeSkeleton(arcResolution);
+    }
 
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { mergeTree_.computeSkeleton(arcResolution); }
+    {
+      mergeTree_.computeSkeleton(arcResolution);
+    }
 
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { splitTree_.computeSkeleton(arcResolution); }
+    {
+      splitTree_.computeSkeleton(arcResolution);
+    }
   }
 
   return 0;
@@ -2728,17 +2734,23 @@ int ContourTree::smoothSkeleton(unsigned int skeletonSmoothing) {
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { SubLevelSetTree::smoothSkeleton(skeletonSmoothing); }
+    {
+      SubLevelSetTree::smoothSkeleton(skeletonSmoothing);
+    }
 
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { mergeTree_.smoothSkeleton(skeletonSmoothing); }
+    {
+      mergeTree_.smoothSkeleton(skeletonSmoothing);
+    }
 
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { splitTree_.smoothSkeleton(skeletonSmoothing); }
+    {
+      splitTree_.smoothSkeleton(skeletonSmoothing);
+    }
   }
 
   return 0;
@@ -2752,17 +2764,23 @@ int ContourTree::clearSkeleton() {
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { SubLevelSetTree::clearSkeleton(); }
+    {
+      SubLevelSetTree::clearSkeleton();
+    }
 
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { mergeTree_.clearSkeleton(); }
+    {
+      mergeTree_.clearSkeleton();
+    }
 
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { splitTree_.clearSkeleton(); }
+    {
+      splitTree_.clearSkeleton();
+    }
   }
 
   return 0;
@@ -2893,12 +2911,16 @@ int ContourTree::simplify(const double &simplificationThreshold,
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { mergeTree_.simplify(simplificationThreshold, metric); }
+    {
+      mergeTree_.simplify(simplificationThreshold, metric);
+    }
 
 #ifdef TTK_ENABLE_OPENMP
 #pragma omp section
 #endif
-    { splitTree_.simplify(simplificationThreshold, metric); }
+    {
+      splitTree_.simplify(simplificationThreshold, metric);
+    }
   }
 
   return 0;

core/base/delaunayRipsPersistenceDiagram/geoPHUtils.h

@@ -3,15 +3,15 @@
 #include <RipsPersistenceDiagramUtils.h>
 
 #include <boost/version.hpp>
-#if((BOOST_VERSION / 100) % 1000) >= 81
+#if ((BOOST_VERSION / 100) % 1000) >= 81
 #include <boost/unordered/unordered_flat_map.hpp>
 #include <boost/unordered/unordered_flat_set.hpp>
 #else
 #include <boost/unordered/unordered_map.hpp>
 #include <boost/unordered/unordered_set.hpp>
 #endif
 
-#if((BOOST_VERSION / 100) % 1000) >= 84
+#if ((BOOST_VERSION / 100) % 1000) >= 84
 #include <boost/unordered/concurrent_flat_map.hpp>
 #define TTK_CONCURRENT_HASHTABLE_AVAILABLE
 #endif
@@ -47,7 +47,7 @@ namespace ttk::gph {
   template <unsigned DIM>
   using PointCloud = std::vector<PointD<DIM>>;
 
-#if((BOOST_VERSION / 100) % 1000) >= 81
+#if ((BOOST_VERSION / 100) % 1000) >= 81
   template <typename X, typename Y>
   using HashMap = boost::unordered_flat_map<X, Y>;
   template <typename X>
@@ -59,7 +59,7 @@ namespace ttk::gph {
   using HashSet = boost::unordered_set<X>;
 #endif
 
-#if((BOOST_VERSION / 100) % 1000) >= 84
+#if ((BOOST_VERSION / 100) % 1000) >= 84
   template <typename X, typename Y>
   using ConcurrentHashMap = boost::concurrent_flat_map<X, Y>;
 #endif

core/base/depthImageBasedGeometryApproximation/DepthImageBasedGeometryApproximation.h

@@ -253,16 +253,16 @@ int ttk::DepthImageBasedGeometryApproximation::execute(
         triangleDistortions[triangleDistortionOffset++]
           = isNaN(i0Depth) || isNaN(i2Depth) || isNaN(i1Depth)
               ? myNan
-              : std::max(
-                absDiff(i0Depth, i1Depth),
-                std::max(absDiff(i1Depth, i2Depth), absDiff(i0Depth, i2Depth)));
+              : std::max(absDiff(i0Depth, i1Depth),
+                         std::max(absDiff(i1Depth, i2Depth),
+                                  absDiff(i0Depth, i2Depth)));
 
         triangleDistortions[triangleDistortionOffset++]
           = isNaN(i1Depth) || isNaN(i2Depth) || isNaN(i3Depth)
               ? myNan
-              : std::max(
-                absDiff(i1Depth, i3Depth),
-                std::max(absDiff(i3Depth, i2Depth), absDiff(i2Depth, i1Depth)));
+              : std::max(absDiff(i1Depth, i3Depth),
+                         std::max(absDiff(i3Depth, i2Depth),
+                                  absDiff(i2Depth, i1Depth)));
       }
     }
   }

core/base/discreteGradient/DiscreteGradient.h

@@ -428,6 +428,14 @@ user in the gradient.
                            const triangulationType &triangulation,
                            const bool enableCycleDetector = false) const;
 
+      /**
+       * Return all VPath coming from the given cell.
+       */
+      template <typename triangulationType>
+      int getAllAscendingPaths(const Cell &cell,
+                               std::vector<std::vector<Cell>> &vpaths,
+                               const triangulationType &triangulation) const;
+
       /**
        * Return the VPath terminating at the given cell.
        */
@@ -436,6 +444,14 @@ user in the gradient.
                             std::vector<Cell> &vpath,
                             const triangulationType &triangulation) const;
 
+      /**
+       * Return all VPath terminating at the given cell.
+       */
+      template <typename triangulationType>
+      int getAllDescendingPaths(const Cell &cell,
+                                std::vector<std::vector<Cell>> &vpaths,
+                                const triangulationType &triangulation) const;
+
       /**
        * Return the VPath terminating at the given 2-saddle restricted to the
 2-separatrice of the 1-saddle.