multipers 2.3.4__cp312-cp312-win_amd64.whl → 2.3.5b1__cp312-cp312-win_amd64.whl

multipers/simplex_tree_multi.pyx

@@ -479,10 +479,9 @@ cdef class SimplexTreeMulti_KFi32:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+       raise NotImplementedError("Not implemented for multicritical filtrations")
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -916,7 +915,6 @@ cdef class SimplexTreeMulti_KFi32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -932,8 +930,6 @@ cdef class SimplexTreeMulti_KFi32:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -943,7 +939,7 @@ cdef class SimplexTreeMulti_KFi32:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  
@@ -1777,10 +1773,25 @@ cdef class SimplexTreeMulti_Fi32:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+        if self.is_squeezed:
+            raise NotImplementedError("Not implemented for squeezed filtrations")
+        cdef int num_parameters = self.num_parameters
+        cdef int32_t[:,:] current_filtration = np.empty((self.num_simplices, self.num_parameters), dtype=self.dtype)
+
+        cdef Simplex_tree_multi_simplices_iterator[Fi32] it = self.get_ptr().get_simplices_iterator_begin()
+        cdef Simplex_tree_multi_simplices_iterator[Fi32] end = self.get_ptr().get_simplices_iterator_end()
+
+        cdef int i=0
+        with nogil:
+            while it != end:
+                pair_sf = <pair[simplex_type, Fi32*]> self.get_ptr().get_simplex_and_filtration(dereference(it))
+                for j in range(num_parameters):
+                    current_filtration[i,j] = dereference(pair_sf.second)[j]
+                preincrement(it)
+                i = i+1
+        return np.asarray(current_filtration, dtype=self.dtype)
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -2357,7 +2368,6 @@ cdef class SimplexTreeMulti_Fi32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -2373,8 +2383,6 @@ cdef class SimplexTreeMulti_Fi32:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -2384,7 +2392,7 @@ cdef class SimplexTreeMulti_Fi32:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  
@@ -3106,10 +3114,9 @@ cdef class SimplexTreeMulti_KFi64:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+       raise NotImplementedError("Not implemented for multicritical filtrations")
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -3543,7 +3550,6 @@ cdef class SimplexTreeMulti_KFi64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -3559,8 +3565,6 @@ cdef class SimplexTreeMulti_KFi64:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -3570,7 +3574,7 @@ cdef class SimplexTreeMulti_KFi64:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  
@@ -4404,10 +4408,25 @@ cdef class SimplexTreeMulti_Fi64:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+        if self.is_squeezed:
+            raise NotImplementedError("Not implemented for squeezed filtrations")
+        cdef int num_parameters = self.num_parameters
+        cdef int64_t[:,:] current_filtration = np.empty((self.num_simplices, self.num_parameters), dtype=self.dtype)
+
+        cdef Simplex_tree_multi_simplices_iterator[Fi64] it = self.get_ptr().get_simplices_iterator_begin()
+        cdef Simplex_tree_multi_simplices_iterator[Fi64] end = self.get_ptr().get_simplices_iterator_end()
+
+        cdef int i=0
+        with nogil:
+            while it != end:
+                pair_sf = <pair[simplex_type, Fi64*]> self.get_ptr().get_simplex_and_filtration(dereference(it))
+                for j in range(num_parameters):
+                    current_filtration[i,j] = dereference(pair_sf.second)[j]
+                preincrement(it)
+                i = i+1
+        return np.asarray(current_filtration, dtype=self.dtype)
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -4984,7 +5003,6 @@ cdef class SimplexTreeMulti_Fi64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -5000,8 +5018,6 @@ cdef class SimplexTreeMulti_Fi64:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -5011,7 +5027,7 @@ cdef class SimplexTreeMulti_Fi64:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  
@@ -5733,10 +5749,9 @@ cdef class SimplexTreeMulti_KFf32:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+       raise NotImplementedError("Not implemented for multicritical filtrations")
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -6170,7 +6185,6 @@ cdef class SimplexTreeMulti_KFf32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -6186,8 +6200,6 @@ cdef class SimplexTreeMulti_KFf32:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -6197,7 +6209,7 @@ cdef class SimplexTreeMulti_KFf32:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  
@@ -7031,10 +7043,25 @@ cdef class SimplexTreeMulti_Ff32:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+        if self.is_squeezed:
+            raise NotImplementedError("Not implemented for squeezed filtrations")
+        cdef int num_parameters = self.num_parameters
+        cdef float[:,:] current_filtration = np.empty((self.num_simplices, self.num_parameters), dtype=self.dtype)
+
+        cdef Simplex_tree_multi_simplices_iterator[Ff32] it = self.get_ptr().get_simplices_iterator_begin()
+        cdef Simplex_tree_multi_simplices_iterator[Ff32] end = self.get_ptr().get_simplices_iterator_end()
+
+        cdef int i=0
+        with nogil:
+            while it != end:
+                pair_sf = <pair[simplex_type, Ff32*]> self.get_ptr().get_simplex_and_filtration(dereference(it))
+                for j in range(num_parameters):
+                    current_filtration[i,j] = dereference(pair_sf.second)[j]
+                preincrement(it)
+                i = i+1
+        return np.asarray(current_filtration, dtype=self.dtype)
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -7611,7 +7638,6 @@ cdef class SimplexTreeMulti_Ff32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -7627,8 +7653,6 @@ cdef class SimplexTreeMulti_Ff32:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -7638,7 +7662,7 @@ cdef class SimplexTreeMulti_Ff32:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  
@@ -8360,10 +8384,9 @@ cdef class SimplexTreeMulti_KFf64:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+       raise NotImplementedError("Not implemented for multicritical filtrations")
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -8797,7 +8820,6 @@ cdef class SimplexTreeMulti_KFf64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -8813,8 +8835,6 @@ cdef class SimplexTreeMulti_KFf64:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -8824,7 +8844,7 @@ cdef class SimplexTreeMulti_KFf64:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  
@@ -9658,10 +9678,25 @@ cdef class SimplexTreeMulti_Ff64:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+        if self.is_squeezed:
+            raise NotImplementedError("Not implemented for squeezed filtrations")
+        cdef int num_parameters = self.num_parameters
+        cdef double[:,:] current_filtration = np.empty((self.num_simplices, self.num_parameters), dtype=self.dtype)
+
+        cdef Simplex_tree_multi_simplices_iterator[Ff64] it = self.get_ptr().get_simplices_iterator_begin()
+        cdef Simplex_tree_multi_simplices_iterator[Ff64] end = self.get_ptr().get_simplices_iterator_end()
+
+        cdef int i=0
+        with nogil:
+            while it != end:
+                pair_sf = <pair[simplex_type, Ff64*]> self.get_ptr().get_simplex_and_filtration(dereference(it))
+                for j in range(num_parameters):
+                    current_filtration[i,j] = dereference(pair_sf.second)[j]
+                preincrement(it)
+                i = i+1
+        return np.asarray(current_filtration, dtype=self.dtype)
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -10238,7 +10273,6 @@ cdef class SimplexTreeMulti_Ff64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -10254,8 +10288,6 @@ cdef class SimplexTreeMulti_Ff64:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -10265,7 +10297,7 @@ cdef class SimplexTreeMulti_Ff64:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None:  

multipers/simplex_tree_multi.pyx.tp

@@ -715,10 +715,29 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             preincrement(it)
 
 
+    def _get_raw_filtration(self):
+       {{if is_kcritical}}
+       raise NotImplementedError("Not implemented for multicritical filtrations")
+       {{else}}
+        if self.is_squeezed:
+            raise NotImplementedError("Not implemented for squeezed filtrations")
+        cdef int num_parameters = self.num_parameters
+        cdef {{CTYPE}}[:,:] current_filtration = np.empty((self.num_simplices, self.num_parameters), dtype=self.dtype)
+
+        cdef Simplex_tree_multi_simplices_iterator[{{FSHORT}}] it = self.get_ptr().get_simplices_iterator_begin()
+        cdef Simplex_tree_multi_simplices_iterator[{{FSHORT}}] end = self.get_ptr().get_simplices_iterator_end()
+
+        cdef int i=0
+        with nogil:
+            while it != end:
+                pair_sf = <pair[simplex_type, {{FSHORT}}*]> self.get_ptr().get_simplex_and_filtration(dereference(it))
+                for j in range(num_parameters):
+                    current_filtration[i,j] = dereference(pair_sf.second)[j]
+                preincrement(it)
+                i = i+1
+        return np.asarray(current_filtration, dtype=self.dtype)
+        {{endif}}
 
-    def persistence_approximation(self, **kwargs):
-        from multipers.multiparameter_module_approximation import module_approximation
-        return module_approximation(self, **kwargs)
 
 
     def get_skeleton(self, dimension)->Iterable[tuple[np.ndarray,np.ndarray]]:
@@ -1326,7 +1345,6 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            bool force=False,
             str strategy:_available_strategies = "exact",
             resolution:Optional[int|list[int]] = None,
             bool coordinates = False,
@@ -1342,8 +1360,6 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
         :param coordinate_values: If true, the filtrations values of the simplices will be set to the coordinate of the filtration grid.
         :type coordinate_values: bool
         """
-        if not force and self.is_squeezed:
-            raise Exception("SimplexTree already squeezed, use `force=True` if that's really what you want to do.") 
 
         if grid_strategy is not None:
             warn("`grid_strategy` is deprecated, use `strategy` instead.",DeprecationWarning)
@@ -1353,7 +1369,7 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             warn("(copy warning) Squeezing an already squeezed slicer.")
             temp = self.unsqueeze()
             subgrid = compute_grid(self.filtration_grid, strategy=strategy, resolution=resolution)
-            return temp.grid_squeeze(subgrid, coordinates=coordinates, inplace=inplace)
+            return temp.grid_squeeze(sanitize_grid(subgrid, numpyfy=True), coordinates=coordinates, inplace=inplace)
 
         #TODO : multi-critical
         if filtration_grid is None: