windows: unfriend scc_write

DavidLapous · Nov 26, 2024 · aed0384 · aed0384
1 parent e1de34b
commit aed0384
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/multipers/gudhi/scc_io.h b/multipers/gudhi/scc_io.h
@@ -206,7 +206,7 @@ inline void write_scc_file(const std::string& outFilePath,
 
   using Filtration_value = typename Slicer::Filtration_value;
 
-  auto& boundaries = slicer.structure;
+  const auto& boundaries = slicer.get_structure();
   int maxDim = boundaries.max_dimension();
   int minDim = maxDim;
 

diff --git a/multipers/gudhi/truc.h b/multipers/gudhi/truc.h
@@ -294,6 +294,8 @@ class Truc {
     return num_generators() == 0 ? 0 : this->generator_filtration_values[0].num_parameters();
   }
 
+  inline const Structure &get_structure() const { return structure; }
+
   template <class SubFiltration, bool original_order = true>
   inline void push_to_out(const SubFiltration &f,
                           std::vector<typename MultiFiltration::value_type> &filtration_container,
@@ -862,14 +864,14 @@ class Truc {
 
   // TODO: declare method here instead of scc_io.h
   // it is just temporary, until Truc is cleaned up
-  friend void write_scc_file<Truc>(const std::string &outFilePath,
-                                   const Truc &slicer,
-                                   int numberOfParameters,
-                                   int degree,
-                                   bool rivetCompatible,
-                                   bool IgnoreLastGenerators,
-                                   bool stripComments,
-                                   bool reverse);
+  // friend void write_scc_file<Truc>(const std::string &outFilePath,
+  //                                  const Truc &slicer,
+  //                                  int numberOfParameters,
+  //                                  int degree,
+  //                                  bool rivetCompatible,
+  //                                  bool IgnoreLastGenerators,
+  //                                  bool stripComments,
+  //                                  bool reverse);
 
  private:
   std::vector<MultiFiltration> generator_filtration_values;  // defined at construction time. Const

diff --git a/multipers/multiparameter_module_approximation/utilities.h b/multipers/multiparameter_module_approximation/utilities.h
@@ -20,7 +20,7 @@
 
 namespace Gudhi::multiparameter::mma {
 
-const bool verbose = false;
+constexpr const bool verbose = false;
 
 using index = unsigned int;
 using value_type = double;