minor changes

DavidLapous · Sep 18, 2024 · b64d74e · b64d74e
1 parent 5928833
commit b64d74e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 33 deletions.
diff --git a/multipers/filtrations.pxd b/multipers/filtrations.pxd
@@ -172,11 +172,6 @@ cdef extern from "gudhi/One_critical_filtration.h" namespace "Gudhi::multi_filtr
         vector[vector[value_type]] to_python(vector[One_critical_filtration]&) nogil const 
         @staticmethod
         vector[value_type]& vector[value_type]() nogil
-        # overloading += not yet supported.
-        # One_critical_filtration[T]& operator+=(One_critical_filtration[T]&, const One_critical_filtration[T]&)
-        #
-        # One_critical_filtration[T]& operator-=(One_critical_filtration[T]&, const One_critical_filtration[T]&)
-        # One_critical_filtration[T]& operator*=(One_critical_filtration[T]&, const One_critical_filtration[T]&)
 
         void push_to_least_common_upper_bound(One_critical_filtration[T]&) nogil
         void pull_to_greatest_common_lower_bound(One_critical_filtration[T]&) nogil
@@ -196,17 +191,6 @@ cdef extern from "gudhi/Multi_critical_filtration.h" namespace "Gudhi::multi_fil
         void reserve(size_t) nogil
         void set_num_generators(size_t) nogil
         One_critical_filtration[T]& operator[](int) nogil
-        # @staticmethod
-        # multifiltration& to_python(vector[Multi_critical_filtration]&) nogil const 
-        # @staticmethod
-        # vector[Multi_critical_filtration]& from_python(multifiltration&) nogil const 
-        # vector[value_type]& _convert_back() nogil
-        # filtration_type __filtration_type__(self):
-        #     return self.get_vector()
-        # Multi_critical_filtration[T]& operator+=(Multi_critical_filtration[T]&, const Multi_critical_filtration[T]&)
-        #
-        # Multi_critical_filtration[T]& operator-=(Multi_critical_filtration[T]&, const Multi_critical_filtration[T]&)
-        # Multi_critical_filtration[T]& operator*=(Multi_critical_filtration[T]&, const Multi_critical_filtration[T]&)
 
         void push_to_least_common_upper_bound(One_critical_filtration[T]&) except + nogil
         void pull_to_greatest_common_lower_bound(One_critical_filtration[T]&) except + nogil

diff --git a/multipers/gudhi/truc.h b/multipers/gudhi/truc.h
@@ -23,9 +23,6 @@
 
 namespace Gudhi::multiparameter::interface {
 
-// using Filtration_value =
-//     multi_filtration::One_critical_filtration<float>;
-
 class PresentationStructure {
 public:
   PresentationStructure() {}

diff --git a/multipers/multiparameter_module_approximation/approximation.h b/multipers/multiparameter_module_approximation/approximation.h
@@ -1406,7 +1406,7 @@ inline std::vector<value_type> Module<value_type>::compute_pixels_of_degree(
   } // Timer death
   if (verbose)
     std::cout << "Module " << start->get_dimension()
-              << " has weight : " << moduleWeight << std::endl;
+              << " has weight : " << moduleWeight << "\n";
   if (!moduleWeight)
     return out;
 
@@ -1625,19 +1625,6 @@ inline void Module<value_type>::_compute_2D_image(
   { // for Timer
     Debug::Timer timer("Computing pixel values ...", verbose);
 
-    // #pragma omp parallel for collapse(2)
-    // for (unsigned int i = 0; i < horizontalResolution; i++)
-    // {
-    // 	for (unsigned int j = 0; j < verticalResolution; j++)
-    // 	{
-    // 		image[i][j] = _get_pixel_value(
-    // 			start,
-    // 			end,
-    // 			{box.get_lower_corner()[0] + stepX * i,
-    // box.get_lower_corner()[1] + stepY * j}, 			delta,
-    // p, 			normalize, 			moduleWeight);
-    // 	}
-    // }
     tbb::parallel_for(0U, horizontalResolution, [&](unsigned int i) {
       tbb::parallel_for(0U, verticalResolution, [&](unsigned int j) {
         image[i][j] = _get_pixel_value(start, end,