multipers 2.2.3__cp312-cp312-win_amd64.whl → 2.3.1__cp312-cp312-win_amd64.whl

multipers/simplex_tree_multi.pyx

@@ -51,15 +51,14 @@ cimport cython
 from gudhi.simplex_tree import SimplexTree ## Small hack for typing
 from typing import Iterable,Literal,Optional
 from tqdm import tqdm
-import multipers.grids as mpg
-
+from multipers.grids import Lstrategies, compute_grid
 from multipers.point_measure import signed_betti, rank_decomposition_by_rectangles, sparsify
 
 from warnings import warn
 
 SAFE_CONVERSION=False #Slower but at least it works everywhere
 
-_available_strategies =mpg.Lstrategies
+_available_strategies =Lstrategies
 
 
 
@@ -90,7 +89,7 @@ cdef class SimplexTreeMulti_KFi32:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -115,7 +114,7 @@ cdef class SimplexTreeMulti_KFi32:
     def is_kcritical(self)->bool:
       return True
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_KFi32.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -128,10 +127,13 @@ cdef class SimplexTreeMulti_KFi32:
             if isinstance(other, SimplexTreeMulti_KFi32):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFi32, int32_t](dereference(<Simplex_tree_multi_interface[KFi32, int32_t]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFi32, int32_t]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_KFi32(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -146,8 +148,10 @@ cdef class SimplexTreeMulti_KFi32:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFi32, int32_t]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -159,6 +163,9 @@ cdef class SimplexTreeMulti_KFi32:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -796,7 +803,8 @@ cdef class SimplexTreeMulti_KFi32:
                         file.write(str(i) + " ")
                     file.write("; ")
                     for f in F:
-                        file.write(str(f) + " ")
+                        for fi in f:
+                            file.write(str(fi) + " ")
                     file.write("\n")
                     bar.update(1)
         file.close()
@@ -850,7 +858,7 @@ cdef class SimplexTreeMulti_KFi32:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -1185,7 +1193,7 @@ cdef class SimplexTreeMulti_Fi32:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -1210,7 +1218,7 @@ cdef class SimplexTreeMulti_Fi32:
     def is_kcritical(self)->bool:
       return False
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_Fi32.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -1223,10 +1231,13 @@ cdef class SimplexTreeMulti_Fi32:
             if isinstance(other, SimplexTreeMulti_Fi32):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Fi32, int32_t](dereference(<Simplex_tree_multi_interface[Fi32, int32_t]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Fi32, int32_t]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_Fi32(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -1241,8 +1252,10 @@ cdef class SimplexTreeMulti_Fi32:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Fi32, int32_t]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -1254,6 +1267,9 @@ cdef class SimplexTreeMulti_Fi32:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -2223,7 +2239,7 @@ cdef class SimplexTreeMulti_Fi32:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -2556,7 +2572,7 @@ cdef class SimplexTreeMulti_KFi64:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -2581,7 +2597,7 @@ cdef class SimplexTreeMulti_KFi64:
     def is_kcritical(self)->bool:
       return True
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_KFi64.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -2594,10 +2610,13 @@ cdef class SimplexTreeMulti_KFi64:
             if isinstance(other, SimplexTreeMulti_KFi64):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFi64, int64_t](dereference(<Simplex_tree_multi_interface[KFi64, int64_t]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFi64, int64_t]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_KFi64(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -2612,8 +2631,10 @@ cdef class SimplexTreeMulti_KFi64:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFi64, int64_t]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -2625,6 +2646,9 @@ cdef class SimplexTreeMulti_KFi64:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -3262,7 +3286,8 @@ cdef class SimplexTreeMulti_KFi64:
                         file.write(str(i) + " ")
                     file.write("; ")
                     for f in F:
-                        file.write(str(f) + " ")
+                        for fi in f:
+                            file.write(str(fi) + " ")
                     file.write("\n")
                     bar.update(1)
         file.close()
@@ -3316,7 +3341,7 @@ cdef class SimplexTreeMulti_KFi64:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -3651,7 +3676,7 @@ cdef class SimplexTreeMulti_Fi64:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -3676,7 +3701,7 @@ cdef class SimplexTreeMulti_Fi64:
     def is_kcritical(self)->bool:
       return False
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_Fi64.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -3689,10 +3714,13 @@ cdef class SimplexTreeMulti_Fi64:
             if isinstance(other, SimplexTreeMulti_Fi64):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Fi64, int64_t](dereference(<Simplex_tree_multi_interface[Fi64, int64_t]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Fi64, int64_t]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_Fi64(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -3707,8 +3735,10 @@ cdef class SimplexTreeMulti_Fi64:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Fi64, int64_t]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -3720,6 +3750,9 @@ cdef class SimplexTreeMulti_Fi64:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -4689,7 +4722,7 @@ cdef class SimplexTreeMulti_Fi64:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -5022,7 +5055,7 @@ cdef class SimplexTreeMulti_KFf32:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -5047,7 +5080,7 @@ cdef class SimplexTreeMulti_KFf32:
     def is_kcritical(self)->bool:
       return True
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_KFf32.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -5060,10 +5093,13 @@ cdef class SimplexTreeMulti_KFf32:
             if isinstance(other, SimplexTreeMulti_KFf32):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFf32, float](dereference(<Simplex_tree_multi_interface[KFf32, float]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFf32, float]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_KFf32(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -5078,8 +5114,10 @@ cdef class SimplexTreeMulti_KFf32:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFf32, float]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -5091,6 +5129,9 @@ cdef class SimplexTreeMulti_KFf32:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -5728,7 +5769,8 @@ cdef class SimplexTreeMulti_KFf32:
                         file.write(str(i) + " ")
                     file.write("; ")
                     for f in F:
-                        file.write(str(f) + " ")
+                        for fi in f:
+                            file.write(str(fi) + " ")
                     file.write("\n")
                     bar.update(1)
         file.close()
@@ -5782,7 +5824,7 @@ cdef class SimplexTreeMulti_KFf32:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -6117,7 +6159,7 @@ cdef class SimplexTreeMulti_Ff32:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -6142,7 +6184,7 @@ cdef class SimplexTreeMulti_Ff32:
     def is_kcritical(self)->bool:
       return False
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_Ff32.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -6155,10 +6197,13 @@ cdef class SimplexTreeMulti_Ff32:
             if isinstance(other, SimplexTreeMulti_Ff32):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Ff32, float](dereference(<Simplex_tree_multi_interface[Ff32, float]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Ff32, float]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_Ff32(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -6173,8 +6218,10 @@ cdef class SimplexTreeMulti_Ff32:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Ff32, float]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -6186,6 +6233,9 @@ cdef class SimplexTreeMulti_Ff32:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -7155,7 +7205,7 @@ cdef class SimplexTreeMulti_Ff32:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -7488,7 +7538,7 @@ cdef class SimplexTreeMulti_KFf64:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -7513,7 +7563,7 @@ cdef class SimplexTreeMulti_KFf64:
     def is_kcritical(self)->bool:
       return True
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_KFf64.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -7526,10 +7576,13 @@ cdef class SimplexTreeMulti_KFf64:
             if isinstance(other, SimplexTreeMulti_KFf64):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFf64, double](dereference(<Simplex_tree_multi_interface[KFf64, double]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFf64, double]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_KFf64(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -7544,8 +7597,10 @@ cdef class SimplexTreeMulti_KFf64:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[KFf64, double]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -7557,6 +7612,9 @@ cdef class SimplexTreeMulti_KFf64:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -8194,7 +8252,8 @@ cdef class SimplexTreeMulti_KFf64:
                         file.write(str(i) + " ")
                     file.write("; ")
                     for f in F:
-                        file.write(str(f) + " ")
+                        for fi in f:
+                            file.write(str(fi) + " ")
                     file.write("\n")
                     bar.update(1)
         file.close()
@@ -8248,7 +8307,7 @@ cdef class SimplexTreeMulti_KFf64:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -8583,7 +8642,7 @@ cdef class SimplexTreeMulti_Ff64:
 
     # cdef Simplex_tree_persistence_interface * pcohptr
     # Fake constructor that does nothing but documenting the constructor
-    def __init__(self, other = None, num_parameters:int=2,default_values=[], safe_conversion=False):
+    def __init__(self, other = None, num_parameters:int=-1,default_values=[], safe_conversion=False):
         """SimplexTreeMulti constructor.
 
         :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.
@@ -8608,7 +8667,7 @@ cdef class SimplexTreeMulti_Ff64:
     def is_kcritical(self)->bool:
       return False
     # The real cython constructor
-    def __cinit__(self, other = None, int num_parameters=2, 
+    def __cinit__(self, other = None, int num_parameters=-1, 
                   default_values=np.asarray([SimplexTreeMulti_Ff64.T_minus_inf()]), # I'm not sure why `[]` does not work. Cython bug ? 
                   bool safe_conversion=False,
                   ): #TODO doc
@@ -8621,10 +8680,13 @@ cdef class SimplexTreeMulti_Ff64:
             if isinstance(other, SimplexTreeMulti_Ff64):
                 other_ptr = other.thisptr
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Ff64, double](dereference(<Simplex_tree_multi_interface[Ff64, double]*>other_ptr))) ## prevents calling destructor of other
-                num_parameters = other.num_parameters
+                if num_parameters <=0:
+                    num_parameters = other.num_parameters
                 self.filtration_grid = other.filtration_grid
             elif isinstance(other, SimplexTree): # Constructs a SimplexTreeMulti from a SimplexTree
                 self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Ff64, double]())
+                if num_parameters <= 0:
+                    num_parameters = 1
                 if safe_conversion or SAFE_CONVERSION:
                     new_st_multi  = _safe_simplextree_multify_Ff64(other, num_parameters = num_parameters, default_values=np.asarray(default_values))
                     self.thisptr, new_st_multi.thisptr = new_st_multi.thisptr, self.thisptr
@@ -8639,8 +8701,10 @@ cdef class SimplexTreeMulti_Ff64:
             else:
                 raise TypeError("`other` argument requires to be of type `SimplexTree`, `SimplexTreeMulti`, or `None`.")
         else:
+            if num_parameters <=0:
+                num_parameters = 2 # I don't know how dangerous this is, but this is mostly used.
             self.thisptr = <intptr_t>(new Simplex_tree_multi_interface[Ff64, double]())
-        self.get_ptr().set_number_of_parameters(num_parameters)
+        self.set_num_parameter(num_parameters)
         self._is_function_simplextree = False
         self.filtration_grid=[[]*num_parameters]
 
@@ -8652,6 +8716,9 @@ cdef class SimplexTreeMulti_Ff64:
 
     def __repr__(self):
         return f"SimplexTreeMulti[dtype={np.dtype(self.dtype).name},num_param={self.num_parameters},kcritical={self.is_kcritical},is_squeezed={self.is_squeezed},max_dim={self.dimension}]" 
+    def __len__(self):
+        return self.num_simplices
+
     def __getstate__(self):
         """:returns: Serialized (or flattened) SimplexTree data structure in order to pickle SimplexTree.
         :rtype: numpy.array of shape (n,)
@@ -9621,7 +9688,7 @@ cdef class SimplexTreeMulti_Ff64:
         # removes nan
         filtrations_values = [filtration[:-1] if np.isnan(filtration[-1]) else filtration for filtration in filtrations_values]
 
-        return mpg.compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
+        return compute_grid(filtrations_values, resolution=resolution,strategy=grid_strategy,drop_quantiles=drop_quantiles)
 
 
 
@@ -9965,7 +10032,7 @@ def is_simplextree_multi(input)->bool:
 
 
 
-def SimplexTreeMulti(input=None, int num_parameters=2, dtype:type = np.float64, bool kcritical = False,**kwargs) ->  SimplexTreeMulti_type:
+def SimplexTreeMulti(input=None, int num_parameters=-1, dtype:type = np.float64, bool kcritical = False,**kwargs) ->  SimplexTreeMulti_type:
     """SimplexTreeMulti constructor.
 
     :param other: If `other` is `None` (default value), an empty `SimplexTreeMulti` is created.