Merge pull request #1043 from MohamedKISSI/topologicalOptimization

add Topological Optimization code

.github/workflows/test.yml

@@ -482,7 +482,7 @@ jobs:
  - name: Create & configure TTK build directory
  shell: cmd
  run: |
- set CMAKE_PREFIX_PATH=%CONDA_ROOT%\Library\lib\cmake;%CONDA_ROOT%\Library\share\eigen3\cmake;%CONDA_ROOT%\Library\share\Qull\cmake;%CONDA_ROOT%\Library\cmake;%ProgramFiles%\TTK-ParaView\lib\cmake
+ set CMAKE_PREFIX_PATH=%CONDA_ROOT%\Library\lib\cmake;%CONDA_ROOT%\Library\share\eigen3\cmake;%CONDA_ROOT%\Library\share\Qull\cmake;%CONDA_ROOT%\Library\cmake;%ProgramFiles%\TTK-ParaView\lib\cmake;
  set CC=clang-cl.exe
  set CXX=clang-cl.exe
  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"

core/base/persistenceDiagramClustering/PersistenceDiagramClustering.h

@@ -53,6 +53,46 @@ namespace ttk {
  return this->distances;
  }
 
+ void setTimeLimit(double timeLimit) {
+ this->TimeLimit = timeLimit;
+ }
+
+ void setForceUseOfAlgorithm(bool forceUseOfAlgorithm) {
+ this->ForceUseOfAlgorithm = forceUseOfAlgorithm;
+ }
+
+ void setDeltaLim(double DeltaLimNew) {
+ this->DeltaLim = DeltaLimNew;
+ }
+
+ void setUseAdditionalPrecision(bool Precision) {
+ this->UseAdditionalPrecision = Precision;
+ }
+
+ void setUseProgressive(bool UseProgressive_) {
+ this->UseProgressive = UseProgressive_;
+ }
+
+ void setUseInterruptible(bool UseInterruptible_) {
+ this->UseInterruptible = UseInterruptible_;
+ }
+
+ void setDeterministic(bool Deterministic_) {
+ this->Deterministic = Deterministic_;
+ }
+
+ void setAlpha(double Alpha_) {
+ this->Alpha = Alpha_;
+ }
+
+ void setUseAccelerated(bool UseAccelerated_) {
+ this->UseAccelerated = UseAccelerated_;
+ }
+
+ void setUseKmeansppInit(bool UseKmeansppInit_) {
+ this->UseKmeansppInit = UseKmeansppInit_;
+ }
+
  protected:
  // Critical pairs used for clustering
  // 0:min-saddles ; 1:saddles-saddles ; 2:sad-max ; else : all

core/base/topologicalOptimization/CMakeLists.txt

@@ -0,0 +1,17 @@
+ttk_add_base_library(topologicalOptimization
+ SOURCES
+ TopologicalOptimization.cpp
+ HEADERS
+ TopologicalOptimization.h 
+ DEPENDS
+ triangulation
+ persistenceDiagram
+ persistenceDiagramClustering
+ )
+
+if(TTK_ENABLE_TORCH)
+ target_include_directories(topologicalOptimization PUBLIC ${TORCH_INCLUDE_DIRS})
+ target_compile_options(topologicalOptimization PUBLIC "${TORCH_CXX_FLAGS}")
+ target_link_libraries(topologicalOptimization PUBLIC "${TORCH_LIBRARIES}")
+ target_compile_definitions(topologicalOptimization PUBLIC TTK_ENABLE_TORCH)
+endif()

core/base/topologicalOptimization/TopologicalOptimization.cpp

@@ -0,0 +1,5 @@
+#include <TopologicalOptimization.h>
+
+ttk::TopologicalOptimization::TopologicalOptimization() {
+ this->setDebugMsgPrefix("TopologicalOptimization");
+}