multipers 2.3.3b5__cp310-cp310-win_amd64.whl → 2.3.3b7__cp310-cp310-win_amd64.whl

multipers/slicer.pyx

@@ -549,7 +549,7 @@ cdef class _KSlicer_Matrix0_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -1040,7 +1040,7 @@ cdef class _KSlicer_Matrix1_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -1531,7 +1531,7 @@ cdef class _KSlicer_Matrix0_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -2022,7 +2022,7 @@ cdef class _KSlicer_Matrix1_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -2514,7 +2514,7 @@ cdef class _KSlicer_Matrix0_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -3006,7 +3006,7 @@ cdef class _KSlicer_Matrix1_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -3498,7 +3498,7 @@ cdef class _KSlicer_Matrix0_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -3990,7 +3990,7 @@ cdef class _KSlicer_Matrix1_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -4472,7 +4472,7 @@ cdef class _Slicer_Matrix0_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -4976,7 +4976,7 @@ cdef class _Slicer_Matrix1_vine_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -5480,7 +5480,7 @@ cdef class _Slicer_Matrix0_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -5984,7 +5984,7 @@ cdef class _Slicer_Matrix1_vine_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -6489,7 +6489,7 @@ cdef class _Slicer_Matrix0_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -6994,7 +6994,7 @@ cdef class _Slicer_Matrix1_vine_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -7499,7 +7499,7 @@ cdef class _Slicer_Matrix0_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -8004,7 +8004,7 @@ cdef class _Slicer_Matrix1_vine_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -8517,7 +8517,7 @@ cdef class _KSlicer_Matrix0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -8990,7 +8990,7 @@ cdef class _KSlicer_Matrix1_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -9463,7 +9463,7 @@ cdef class _KSlicer_Matrix0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -9936,7 +9936,7 @@ cdef class _KSlicer_Matrix1_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -10410,7 +10410,7 @@ cdef class _KSlicer_Matrix0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -10884,7 +10884,7 @@ cdef class _KSlicer_Matrix1_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -11358,7 +11358,7 @@ cdef class _KSlicer_Matrix0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -11832,7 +11832,7 @@ cdef class _KSlicer_Matrix1_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -12296,7 +12296,7 @@ cdef class _Slicer_Matrix0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -12782,7 +12782,7 @@ cdef class _Slicer_Matrix1_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -13268,7 +13268,7 @@ cdef class _Slicer_Matrix0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -13754,7 +13754,7 @@ cdef class _Slicer_Matrix1_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -14241,7 +14241,7 @@ cdef class _Slicer_Matrix0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -14728,7 +14728,7 @@ cdef class _Slicer_Matrix1_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -15215,7 +15215,7 @@ cdef class _Slicer_Matrix0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -15702,7 +15702,7 @@ cdef class _Slicer_Matrix1_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -16197,7 +16197,7 @@ cdef class _KSlicer_GudhiCohomology0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -16670,7 +16670,7 @@ cdef class _KSlicer_GudhiCohomology0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -17144,7 +17144,7 @@ cdef class _KSlicer_GudhiCohomology0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -17618,7 +17618,7 @@ cdef class _KSlicer_GudhiCohomology0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -18082,7 +18082,7 @@ cdef class _Slicer_GudhiCohomology0_i32:
       filtration_array = np.asarray(filtration_array, dtype= np.int32)
       cdef int32_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -18568,7 +18568,7 @@ cdef class _Slicer_GudhiCohomology0_i64:
       filtration_array = np.asarray(filtration_array, dtype= np.int64)
       cdef int64_t[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -19055,7 +19055,7 @@ cdef class _Slicer_GudhiCohomology0_f32:
       filtration_array = np.asarray(filtration_array, dtype= np.float32)
       cdef float[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -19542,7 +19542,7 @@ cdef class _Slicer_GudhiCohomology0_f64:
       filtration_array = np.asarray(filtration_array, dtype= np.float64)
       cdef double[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -20067,6 +20067,7 @@ def from_function_delaunay(
     function_delaunay_presentation_to_slicer(s, points, grades, degree=degree, verbose=verbose,clear=clear)
     if degree >= 0:
         s.minpres_degree = degree
+        # s = s.minpres(degree=degree, force=True)
     return s
 
 def slicer2blocks(slicer, int degree = -1, bool reverse=True):

multipers/slicer.pyx.tp

@@ -342,7 +342,7 @@ cdef class {{D['PYTHON_TYPE']}}:
       filtration_array = np.asarray(filtration_array, dtype= {{D['PY_VALUE_TYPE']}})
       cdef {{D['C_VALUE_TYPE']}}[:,:] arr_view = filtration_array
       cdef int size = arr_view.shape[0]
-      if arr_view.shape[1] != self.truc.num_generators():
+      if <int>arr_view.shape[1] != <int>self.truc.num_generators():
           raise ValueError(f"Got filtration array of shape {filtration_array.shape=} / {arr_view.shape=}. Was expecting (-1, {len(self)=})")
 
       return tuple(tuple(np.array(bc_idx_degree, dtype=int) for bc_idx_degree in bc_idx) for bc_idx in self.truc.custom_persistences(&arr_view[0,0], size, ignore_inf))
@@ -785,6 +785,7 @@ def from_function_delaunay(
     function_delaunay_presentation_to_slicer(s, points, grades, degree=degree, verbose=verbose,clear=clear)
     if degree >= 0:
         s.minpres_degree = degree
+        # s = s.minpres(degree=degree, force=True)
     return s
 
 def slicer2blocks(slicer, int degree = -1, bool reverse=True):

{multipers-2.3.3b5.dist-info → multipers-2.3.3b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.3b5
+Version: 2.3.3b7
 Summary: Multiparameter Topological Persistence for Machine Learning
 Author-email: David Loiseaux <david.lapous@proton.me>, Hannah Schreiber <hannah.schreiber@inria.fr>
 Maintainer-email: David Loiseaux <david.lapous@proton.me>

{multipers-2.3.3b5.dist-info → multipers-2.3.3b7.dist-info}/RECORD

@@ -1,45 +1,45 @@
 multipers/__init__.py,sha256=y4BfbXAY2M2yZYob758IegZHwIbRgmKrph6lwe6WR6Q,733
-multipers/_signed_measure_meta.py,sha256=fscSXOekUX_TkxucOKpb3oNJoct_IrjMZcqiwxPvmSY,17930
+multipers/_signed_measure_meta.py,sha256=YgGhy6miY2sagJMzV8JAfos-aoR4JV6F7RUNjpmT3nU,17676
 multipers/_slicer_meta.py,sha256=mjIGR-B6HnQLSiMowEQ8EWQkD_IF3bBnDVzvwrZugZ4,7203
 multipers/distances.py,sha256=uAZj2GtUQp50OxN2qU7sl2JqsmJ74IG9j5tZapLO2Us,6220
 multipers/filtration_conversions.pxd,sha256=Je7a3F4zS1PQn6Ul1YCXgA6p39X2FouStru-XtN-aOw,10800
 multipers/filtration_conversions.pxd.tp,sha256=_9tUvZVUA7J_RUM3q7BxY48fYgDHCUA7Xhy4nBfLLs0,3309
 multipers/filtrations.pxd,sha256=08ONkZNCjs8Nme8lcD9myPz-K662sA-EDpSwzgC2_ts,9461
-multipers/function_rips.cp310-win_amd64.pyd,sha256=TDyyzw9eN85SozGdg6Aqy9vgrO_jeKUiA8Xf2HPnv0M,329728
+multipers/function_rips.cp310-win_amd64.pyd,sha256=O8pqsGzOR7BQAQdi7jr4VjfkCAVVIMtU1WTjuf8ZKTs,329728
 multipers/function_rips.pyx,sha256=j5NjbK3YrAv_2s8YHB1JB0k6m9NC7RQCSFlJe-w_kgE,5252
-multipers/grids.cp310-win_amd64.pyd,sha256=jDpMdmmTSRfwHGAJmOGwIf5ErPl4CdUYJcSWlc0a8O0,478720
-multipers/grids.pyx,sha256=ONN_RKkuxqwb9IaS9gd42FUGaiBLc8QWcd3L-ubZjKE,16575
-multipers/io.cp310-win_amd64.pyd,sha256=z4BQuigRTtDKshw620zayhmFpIa4a8nii5ff75kGN6s,223232
+multipers/grids.cp310-win_amd64.pyd,sha256=sP4bLq0BIiL6FFrhqMxsNr5EfnTfQHlrD75FUDi2Qj0,468992
+multipers/grids.pyx,sha256=4329-4IwlvZKEsmVXrG91kNl1pi-q5RzSrl8EHo2EKk,17981
+multipers/io.cp310-win_amd64.pyd,sha256=wzi4Ie9Kjkgr5Y9qnM769lnq0V8ubO0n1R6EhKJtDKs,223232
 multipers/io.pyx,sha256=pQBH_rSqaCZqDSxTLnhlyECP3fLbX2tR_RKJHydHm_0,22210
-multipers/mma_structures.cp310-win_amd64.pyd,sha256=P12FSaq7bI6mi5WW0U6j-_HySnmRhmY3LOiXGMujXVE,1324544
+multipers/mma_structures.cp310-win_amd64.pyd,sha256=Io7ZZxb0aKX6sqdMsIoiaqZPh2sCxDOtMDZinfKzajM,1324544
 multipers/mma_structures.pxd,sha256=jh1QnQRidt_VK0CK7losQi6rAl_1qG5DNuR23J42pUA,6595
-multipers/mma_structures.pyx,sha256=4zNC6ePfFKMvx0MrH-FqJVouyTMciRc49oevKDnsJhI,109530
-multipers/mma_structures.pyx.tp,sha256=hWuuk9USDFa8CbQVRHNjWSAdGgpkWKvSCNjTtVuSzwM,42299
+multipers/mma_structures.pyx,sha256=1FQ_sqkpHHkCyCLLKkR9lUgZKDZFt-YgjnDd8NGmw6Q,109526
+multipers/mma_structures.pyx.tp,sha256=QLo4ZZDnFuWNot771jYkYHc9ZQq6CJIpkRkeRwGi7XA,42297
 multipers/multiparameter_edge_collapse.py,sha256=MFt0eKQQSv2354omeIqOmzASYTKIMsYdxZHFZauQr8g,1229
-multipers/multiparameter_module_approximation.cp310-win_amd64.pyd,sha256=-nOjq5SvC53Ub9_9RjqCIhcSRZ9rqt8Jbd_3axzU3SU,447488
+multipers/multiparameter_module_approximation.cp310-win_amd64.pyd,sha256=zZQK9ztDE_T0K6xww7lE7yCCcZfvx2bcWP_Upsq-b30,447488
 multipers/multiparameter_module_approximation.pyx,sha256=wp7la7Z9wBngnfw6WOVddf93mPyXf4HfNT6dKW2Z0r0,9030
 multipers/pickle.py,sha256=YYVt4iHiD16E1x5Yn_4mX6P5P8rKi56pNGjJo5IzPhc,2579
-multipers/plots.py,sha256=zkJww-QCU7Ru22KhIa5xIi9zztWm-_tYjO0enP8ahBs,14721
-multipers/point_measure.cp310-win_amd64.pyd,sha256=67Fgpe6ov73lq5UfUOWjI4N4fDVBVHR-lkM8UgZmjmE,620032
+multipers/plots.py,sha256=ZJmOD5fgy0y_U-rjhR6pZ2WD8HFndpKMh5IKlU62QkI,14918
+multipers/point_measure.cp310-win_amd64.pyd,sha256=Y4se-MjjLgOCSim4MA8RefOhDWS_UWhaI53Py3SrxWE,620544
 multipers/point_measure.pyx,sha256=ovpyvjMdOPBOK_0TT0VoK4b2t8m5InFdKmRBB6biTts,14077
-multipers/simplex_tree_multi.cp310-win_amd64.pyd,sha256=XJWdN5V0wGEjdNVaorcOLLLG21GnNMM6U2HZI8__X_U,3756032
+multipers/simplex_tree_multi.cp310-win_amd64.pyd,sha256=xa_8IXOvwuYb4jOPxLuchO35_Bddm1YbTf5z3bqCxXM,3756544
 multipers/simplex_tree_multi.pxd,sha256=KpyDEQNPoMC2sOU9-d4LtrGXx_UVCJGxMJ1kk1AzHgU,6631
-multipers/simplex_tree_multi.pyx,sha256=reHyva5AR1lOQyiCs2_jQ2XfwHtktcQ1nmY_BNmyxhk,498156
-multipers/simplex_tree_multi.pyx.tp,sha256=fUTuIscfDlNjsImWU1YALVZ1Mf9OEkdl-IFKcRQqalI,89202
-multipers/slicer.cp310-win_amd64.pyd,sha256=7e7m0il8Y8CHUUh2Krb4YvDnXcxfzU6nxjYiT4OgWPY,11618816
-multipers/slicer.pxd,sha256=fzA-lL_QWyUMf9rRSpcKG35QNS9UXEmVC9r7kR0geho,185230
+multipers/simplex_tree_multi.pyx,sha256=13x2WFMExcukd_2CrLOJa3Edex3WNqaSSrGBmPhYoDM,499100
+multipers/simplex_tree_multi.pyx.tp,sha256=YFzVUJPWNOOpRiyOgaYlFR_DJ_57rAQLsOp2W0l71_s,89318
+multipers/slicer.cp310-win_amd64.pyd,sha256=OdgrxgeWs6fNRHV7KwUkev94jYZ206_2MEUP0e_NptU,11617792
+multipers/slicer.pxd,sha256=bHcV5COzDcjhaVcL3bWSHivUYtdkSx4bdj24fVOe_DU,185230
 multipers/slicer.pxd.tp,sha256=fLOUPtPGqiY9o1fPDyc_whBrgKLh_6HVfvl7OtE-34Y,10243
-multipers/slicer.pyx,sha256=SYjCsYtPY-16fwABZvZncNJ3tKU5shVkx_WCvqs467U,894041
-multipers/slicer.pyx.tp,sha256=jZOdsHKMpq0nclmvlzkZUDzdjffT3_mFDVY_mnsl9Es,44523
-multipers/tbb12.dll,sha256=6AsPR4GauU53hj2xqJNM0SfLkCKCDskjy-uKeS01tCk,338944
-multipers/tbbbind_2_5.dll,sha256=8TtH7JJZlCEKF0UwfyJoiyrFt9utOI_x5AFOxpP-pGw,23040
-multipers/tbbmalloc.dll,sha256=1MRBYYNzNcooog8__yuLq40l7kSgZ4lkNZhDFfTWM8A,112640
-multipers/tbbmalloc_proxy.dll,sha256=fcM6szEVHayvxKW8sPUTWoqEZx1_4FbWni81hbOcbi4,31232
+multipers/slicer.pyx,sha256=fQ0zZwgwWZPXWw_rKvMCwbHXw2RQTJFSLkxiEHrrzVE,894493
+multipers/slicer.pyx.tp,sha256=GCL7xUZccfmnIoY4bk05L5ODkSNzEzXgodp0VkH-xT8,44584
+multipers/tbb12.dll,sha256=flSoIAkNVECA5vNkh5jLn1jcZNxTw3yb2tuTtxn6oEE,344576
+multipers/tbbbind_2_5.dll,sha256=4JWlgl4aJJ3m5NIE85AgQi46REU3UkIJwNsKnh9aK_c,23552
+multipers/tbbmalloc.dll,sha256=r9y_3nR6Rpc68g1F7Oci8EpunjWIJQU-zjLIVXc9SDY,113664
+multipers/tbbmalloc_proxy.dll,sha256=5vcuiOpM9KTAY7daWxCsAc2MU_l8K3TWpw0kz-Xh0sk,30720
 multipers/tensor.pxd,sha256=MSmaMU0sOP9CHLmg4dym7nOGaI1S4cOdM01TQ9flI54,417
 multipers/test.pyx,sha256=-g7WU-jKrZK8H0c-6eAPsfrApjvTKrUoswVYFu8LoV4,1798
-multipers/array_api/__init__.py,sha256=072Lk60jfw3re6iCY3EorteHEoQ7vbUgpMpuGCpfh04,1109
-multipers/array_api/numpy.py,sha256=hhCyMH_jNZhCJeY35RX498AWgHSryZ8DCCgfnzZ1cek,677
-multipers/array_api/torch.py,sha256=J-OjqM4rDLvjSjY2uriBdUcOOb75p-IF17C5stdJHVg,589
+multipers/array_api/__init__.py,sha256=jyvi7Gzd7Si_imgaodz80fcA-68MikAGk8g79_vj6yo,1545
+multipers/array_api/numpy.py,sha256=HZHJitXSb2Y3f-JNg47afmYoExgqT6dOx7sfcM9vvaA,2324
+multipers/array_api/torch.py,sha256=7PKiSgA4TCaTspsC7wiMXUtHgSiTfSFyNtuMYU31xNo,2550
 multipers/data/MOL2.py,sha256=nLZHy2OSFN9Z2uJKsbqWOEG2R7G-uH6dCLHG48UjvR4,15428
 multipers/data/UCR.py,sha256=PuT8l3i26y0goBzIESwdgJAe6YFCyDiWSoxECcP5rhs,798
 multipers/data/__init__.py,sha256=w7uUe4LOHbdbKU4R8MNs7em65wZJN0v5ukoG1otFanQ,24
@@ -50,8 +50,8 @@ multipers/data/pytorch2simplextree.py,sha256=cvOJTUleK_qEbcpygRD77GuQl_0qDsSjjD6
 multipers/data/shape3d.py,sha256=AE-vvjKrhKxOwMo-lurUsFqqLjIg5obo-RTbRZF_5Mk,3893
 multipers/data/synthetic.py,sha256=RvLWIBE5j99kJSt-D7cnPGI3c7skD4p8_qofJbMIXM0,3078
 multipers/filtrations/__init__.py,sha256=Lg0EHe2cxT32UQAg0kr_Vpua-xPBZxGol8VIfz8UwWk,319
-multipers/filtrations/density.py,sha256=z_QwAi_5EdUoKXc6s7N-qWM7n6r5hWHiHeJkLPWhE-w,19818
-multipers/filtrations/filtrations.py,sha256=kkaUJOznzMmgQAW__lC2q6BOuiGj85_VIRP9C3TPMJk,13037
+multipers/filtrations/density.py,sha256=XNPHCwyC8FwAdSfNp1ofxcxfP5ZFGZ6K-DUeXsfM4eg,18155
+multipers/filtrations/filtrations.py,sha256=r3WS4GMBvcJ0ryIMbNHFgep0FCtl3h404V_SbMM8hN0,13333
 multipers/gudhi/Persistence_slices_interface.h,sha256=QnUeCCKi9K8CfqI3W5i3Ra1Jy2Z1IIivr3MIpnBsnYU,6562
 multipers/gudhi/Simplex_tree_interface.h,sha256=kkq8pE3jKGLY1dK7sYpb_uERHaWGurrRXfaw_ygs-mY,10217
 multipers/gudhi/Simplex_tree_multi_interface.h,sha256=7D9EqyO9dgi-VMTf-O8SR2UMQL95q_TL9ApmmN4ggFw,25484
@@ -146,7 +146,7 @@ multipers/ml/kernels.py,sha256=XWfvKY68-c9E-MpRzdNqGzGD6K24Aizx95TkiSeAtIY,6175
 multipers/ml/mma.py,sha256=mSwYqSHWGiboEiMnxArCuhHyrOExPYdML2Mbx4dTO7s,23950
 multipers/ml/one.py,sha256=np5jM8gywm65TsK1yeZ1BDWqP-Ym-7hz4brTXI_0imk,20119
 multipers/ml/point_clouds.py,sha256=nTkSjSzQy6S10-sZ0uwBp_Fs2EIWleB7yHncK2b_xLg,13770
-multipers/ml/signed_measures.py,sha256=LCf0gAfQ7y4q9gI7s72Y4nwgP6U8HZenwGrMDdK-azY,58339
+multipers/ml/signed_measures.py,sha256=pwV6-XAQnS5itlfGgA64qxPomBqOuqsd-ulnkoYFdto,60981
 multipers/ml/sliced_wasserstein.py,sha256=jgq4ND3EWwwJBopqRvfJLsoOptiMHjS3zEAENBmPJDc,18644
 multipers/ml/tools.py,sha256=DOPcqmvZP2bA7M08GrwccdebwDq1HEwYdhNRGT7eZMI,3453
 multipers/multi_parameter_rank_invariant/diff_helpers.h,sha256=wMCOhAewWd6-lulLND0y8M0MZoru6zn_8J3qfXDjLds,3477
@@ -178,8 +178,8 @@ multipers/tests/__init__.py,sha256=-7Fj-zFAfBJv18trg0CPglQTmYu_ehySZGqtJzPlN8U,1
 multipers/torch/__init__.py,sha256=OLxIiZ389uCqehpUxBPUI_x1SYu531onc4tiTscAuIw,27
 multipers/torch/diff_grids.py,sha256=2YK-c351tBpj8sfzjf26fbE1l0xlWse7oVVfDHD3zwM,7492
 multipers/torch/rips_density.py,sha256=H-kmSzY8hXhmVn15Oltc71DHs1IUHg5oPRgNyWW8L4Q,11706
-multipers-2.3.3b5.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
-multipers-2.3.3b5.dist-info/METADATA,sha256=bsID4OmdjPhV5Hi8YB2y1x9Sr5SWsjTmQ5XN-Oeysjg,9817
-multipers-2.3.3b5.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
-multipers-2.3.3b5.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
-multipers-2.3.3b5.dist-info/RECORD,,
+multipers-2.3.3b7.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
+multipers-2.3.3b7.dist-info/METADATA,sha256=rWZTaAJnyv6X11zYE1N_EMCUrmhHZ4bmaK_uG4E7Ma8,9817
+multipers-2.3.3b7.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+multipers-2.3.3b7.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
+multipers-2.3.3b7.dist-info/RECORD,,