multipers 2.3.2__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
@@ -883,6 +918,8 @@ cdef class SimplexTreeMulti_KFi32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -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:
@@ -2322,6 +2359,8 @@ cdef class SimplexTreeMulti_Fi32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -2349,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:
@@ -3213,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
@@ -3471,6 +3545,8 @@ cdef class SimplexTreeMulti_KFi64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -3498,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:
@@ -4910,6 +4986,8 @@ cdef class SimplexTreeMulti_Fi64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -4937,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:
@@ -5801,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
@@ -6059,6 +6172,8 @@ cdef class SimplexTreeMulti_KFf32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -6086,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:
@@ -7498,6 +7613,8 @@ cdef class SimplexTreeMulti_Ff32:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -7525,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:
@@ -8389,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
@@ -8647,6 +8799,8 @@ cdef class SimplexTreeMulti_KFf64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -8674,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:
@@ -10086,6 +10240,8 @@ cdef class SimplexTreeMulti_Ff64:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -10113,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
@@ -1330,6 +1328,8 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             bool coordinate_values=True,
             bool force=False,
             str strategy:_available_strategies = "exact",
+            resolution:Optional[int|list[int]] = None,
+            bool coordinates = False,
             grid_strategy=None,
             bool inplace=False,
             **filtration_grid_kwargs
@@ -1357,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: