Merge pull request #674 from guoxiliu/dev

Compact Triangulation Integration
topology-tool-kit · Dec 13, 2021 · 518dabb · 518dabb
2 parents 117a473 + 62e09a8
commit 518dabb
Show file tree

Hide file tree

Showing 30 changed files with 5,584 additions and 20 deletions.
diff --git a/CMake/debug_widgets.xml b/CMake/debug_widgets.xml
@@ -34,6 +34,19 @@
   <Documentation>Debug level.</Documentation>
 </IntVectorProperty>
 
+<DoubleVectorProperty
+    name="CompactTriangulationCacheSize"
+    label="Compact Triangulation Cache Size"
+    command="SetCompactTriangulationCacheSize"
+    number_of_elements="1"
+    default_values="0.2">
+  <DoubleRangeDomain name="range" min="0.0" max="1.0" />
+    <Documentation>
+      Set the cache size for the compact triangulation as a 
+      ratio with respect to the total cluster number.
+    </Documentation>
+</DoubleVectorProperty>
+
 <Property name='Debug_Execute'
           label='Execute'
           command='Modified'
@@ -50,5 +63,6 @@
   <Property name='Debug_UseAllCores' />
   <Property name='Debug_ThreadNumber' />
   <Property name='Debug_DebugLevel' />
+  <Property name='CompactTriangulationCacheSize' />
   <Property name='Debug_Execute' />
 </PropertyGroup>
diff --git a/core/base/abstractTriangulation/AbstractTriangulation.h b/core/base/abstractTriangulation/AbstractTriangulation.h
@@ -39,6 +39,8 @@
       ttk::Triangulation::Type::IMPLICIT, ttk::ImplicitTriangulation, call); \
     ttkTemplateMacroCase(ttk::Triangulation::Type::PERIODIC,                 \
                          ttk::PeriodicImplicitTriangulation, call);          \
+    ttkTemplateMacroCase(                                                    \
+      ttk::Triangulation::Type::COMPACT, ttk::CompactTriangulation, call);   \
   }
 
 namespace ttk {

diff --git a/core/base/common/DataTypes.h b/core/base/common/DataTypes.h
@@ -66,6 +66,9 @@ namespace ttk {
   const char PersistenceName[] = "Persistence";
   const char PersistencePairTypeName[] = "PairType";
 
+  // default name for compact triangulation index
+  const char compactTriangulationIndex[] = "ttkCompactTriangulationIndex";
+
   /// default value for critical index
   enum class CriticalType {
     Local_minimum = 0,

diff --git a/core/base/compactTriangulation/CMakeLists.txt b/core/base/compactTriangulation/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+ttk_add_base_library(compactTriangulation
+  SOURCES
+    CompactTriangulation.cpp
+  HEADERS
+    CompactTriangulation.h
+  DEPENDS
+    abstractTriangulation
+    skeleton
+    Boost::boost
+    )