multipers 2.3.2b1__cp312-cp312-win_amd64.whl → 2.3.3__cp312-cp312-win_amd64.whl

multipers/simplex_tree_multi.pyx

@@ -625,6 +625,41 @@ cdef class SimplexTreeMulti_KFi32:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFi32:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFi32:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -881,10 +916,12 @@ cdef class SimplexTreeMulti_KFi32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFi32:
         """
@@ -910,7 +947,7 @@ cdef class SimplexTreeMulti_KFi32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -1982,7 +2019,16 @@ cdef class SimplexTreeMulti_Fi32:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Fi32:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Fi32:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -2032,6 +2078,8 @@ cdef class SimplexTreeMulti_Fi32:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -2309,10 +2357,12 @@ cdef class SimplexTreeMulti_Fi32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Fi32:
         """
@@ -2338,7 +2388,7 @@ cdef class SimplexTreeMulti_Fi32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -3202,6 +3252,41 @@ cdef class SimplexTreeMulti_KFi64:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFi64:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFi64:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -3458,10 +3543,12 @@ cdef class SimplexTreeMulti_KFi64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFi64:
         """
@@ -3487,7 +3574,7 @@ cdef class SimplexTreeMulti_KFi64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -4559,7 +4646,16 @@ cdef class SimplexTreeMulti_Fi64:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Fi64:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Fi64:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -4609,6 +4705,8 @@ cdef class SimplexTreeMulti_Fi64:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -4886,10 +4984,12 @@ cdef class SimplexTreeMulti_Fi64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Fi64:
         """
@@ -4915,7 +5015,7 @@ cdef class SimplexTreeMulti_Fi64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -5779,6 +5879,41 @@ cdef class SimplexTreeMulti_KFf32:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFf32:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFf32:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -6035,10 +6170,12 @@ cdef class SimplexTreeMulti_KFf32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFf32:
         """
@@ -6064,7 +6201,7 @@ cdef class SimplexTreeMulti_KFf32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -7136,7 +7273,16 @@ cdef class SimplexTreeMulti_Ff32:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Ff32:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Ff32:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -7186,6 +7332,8 @@ cdef class SimplexTreeMulti_Ff32:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -7463,10 +7611,12 @@ cdef class SimplexTreeMulti_Ff32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Ff32:
         """
@@ -7492,7 +7642,7 @@ cdef class SimplexTreeMulti_Ff32:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -8356,6 +8506,41 @@ cdef class SimplexTreeMulti_KFf64:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
+    def expansion(self, int max_dim)->SimplexTreeMulti_KFf64:
+        """Expands the simplex tree containing only its one skeleton
+        until dimension max_dim.
+
+        The expanded simplicial complex until dimension :math:`d`
+        attached to a graph :math:`G` is the maximal simplicial complex of
+        dimension at most :math:`d` admitting the graph :math:`G` as
+        :math:`1`-skeleton.
+        The filtration value assigned to a simplex is the maximal filtration
+        value of one of its edges.
+
+        The simplex tree must contain no simplex of dimension bigger than
+        1 when calling the method.
+
+        :param max_dim: The maximal dimension.
+        :type max_dim: int
+        """
+        with nogil:
+            self.get_ptr().expansion(max_dim)
+            # This is a fix for multipersistence. FIXME expansion in c++
+            self.get_ptr().make_filtration_non_decreasing()
+        return self
+
+    def make_filtration_non_decreasing(self)->bool: 
+        """This function ensures that each simplex has a higher filtration
+        value than its faces by increasing the filtration values.
+
+        :returns: True if any filtration value was modified,
+            False if the filtration was already non-decreasing.
+        :rtype: bool
+        """
+        cdef bool out
+        with nogil:
+            out = self.get_ptr().make_filtration_non_decreasing()
+        return out
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_KFf64:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -8612,10 +8797,12 @@ cdef class SimplexTreeMulti_KFf64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFf64:
         """
@@ -8641,7 +8828,7 @@ cdef class SimplexTreeMulti_KFf64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:
@@ -9713,7 +9900,16 @@ cdef class SimplexTreeMulti_Ff64:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Ff64:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Ff64:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -9763,6 +9959,8 @@ cdef class SimplexTreeMulti_Ff64:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -10040,10 +10238,12 @@ cdef class SimplexTreeMulti_Ff64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Ff64:
         """
@@ -10069,7 +10269,7 @@ cdef class SimplexTreeMulti_Ff64:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:

multipers/simplex_tree_multi.pyx.tp

@@ -869,7 +869,6 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
         """
         return self.get_ptr().prune_above_dimension(dimension)
 
-    {{if not is_kcritical}}
     def expansion(self, int max_dim)->SimplexTreeMulti_{{FSHORT}}:
         """Expands the simplex tree containing only its one skeleton
         until dimension max_dim.
@@ -905,7 +904,6 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
         with nogil:
             out = self.get_ptr().make_filtration_non_decreasing()
         return out
-    {{endif}}
 
     def reset_filtration(self, filtration, min_dim = 0)->SimplexTreeMulti_{{FSHORT}}:
         """This function resets the filtration value of all the simplices of dimension at least min_dim. Resets all the
@@ -972,7 +970,16 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_{{FSHORT}}:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_{{FSHORT}}:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -1022,6 +1029,8 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -1317,10 +1326,12 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_{{FSHORT[:-3] + "i32"}} | SimplexTreeMulti_{{FSHORT}}:
         """
@@ -1346,7 +1357,7 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
 
         #TODO : multi-critical
         if filtration_grid is None:  
-            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, **filtration_grid_kwargs)
+            filtration_grid = self.get_filtration_grid(grid_strategy=strategy, resolution=resolution, **filtration_grid_kwargs)
         else:
             filtration_grid = sanitize_grid(filtration_grid)
             if len(filtration_grid) != self.num_parameters:

multipers/slicer.pxd

@@ -2013,51 +2013,51 @@ cdef extern from "multiparameter_module_approximation/approximation.h" namespace
 
 import multipers.slicer as mps
 from cython.operator cimport dereference
-cdef inline Module[float] _multiparameter_module_approximation_f32(object slicer, One_critical_filtration[float] direction, float max_error, Box[float] box, bool threshold, bool complete, bool verbose):
+cdef inline Module[double] _multiparameter_module_approximation_f64(object slicer, One_critical_filtration[double] direction, double max_error, Box[double] box, bool threshold, bool complete, bool verbose):
   import multipers.slicer as mps
   cdef intptr_t slicer_ptr = <intptr_t>(slicer.get_ptr())
-  cdef Module[float] mod
+  cdef Module[double] mod
   if False:
     pass
-  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f32):
+  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f32):
+  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f32):
+  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f32):
+  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f64):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
   else:
     raise ValueError(f"Unsupported slicer type {type(slicer)}")
-cdef inline Module[double] _multiparameter_module_approximation_f64(object slicer, One_critical_filtration[double] direction, double max_error, Box[double] box, bool threshold, bool complete, bool verbose):
+cdef inline Module[float] _multiparameter_module_approximation_f32(object slicer, One_critical_filtration[float] direction, float max_error, Box[float] box, bool threshold, bool complete, bool verbose):
   import multipers.slicer as mps
   cdef intptr_t slicer_ptr = <intptr_t>(slicer.get_ptr())
-  cdef Module[double] mod
+  cdef Module[float] mod
   if False:
     pass
-  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f64):
+  elif isinstance(slicer, mps._KSlicer_Matrix0_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f64):
+  elif isinstance(slicer, mps._KSlicer_Matrix1_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_KSlicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f64):
+  elif isinstance(slicer, mps._Slicer_Matrix0_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix0_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
-  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f64):
+  elif isinstance(slicer, mps._Slicer_Matrix1_vine_f32):
     with nogil:
-      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f64*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
+      mod = multiparameter_module_approximation(dereference(<C_Slicer_Matrix1_vine_f32*>(slicer_ptr)), direction, max_error, box, threshold, complete, verbose)
     return mod
   else:
     raise ValueError(f"Unsupported slicer type {type(slicer)}")