multipers 2.3.2b1__cp313-cp313-win_amd64.whl → 2.3.3b1__cp313-cp313-win_amd64.whl

multipers/ml/mma.py

@@ -478,7 +478,7 @@ class MMAFormatter(BaseEstimator, TransformerMixin):
                 if self.weights is None
                 else np.asarray(self.weights)
             )
-            standard_box = PyBox_f64([0] * self._num_parameters, w)
+            standard_box = np.array([[0] * self._num_parameters, w])
 
             X_copy = [
                 [

multipers/multiparameter_module_approximation.pyx

@@ -168,7 +168,8 @@ def module_approximation(
                 delayed(module_approximation)(slicer, box, max_error, nlines, slicer_backend, minpres, degree, complete, threshold, verbose, ignore_warnings, id, direction, swap_box_coords)
                 for slicer in input
             ))
-        mod = PyModule_f64().set_box(PyBox_f64(*modules[0].get_box()))
+        box = modules[0].get_box()
+        mod = PyModule_f64().set_box(box)
         for i,m in enumerate(modules):
             mod.merge(m, input[i].minpres_degree)
         return mod

multipers/plots.py

@@ -2,13 +2,16 @@ from typing import Optional
 
 import matplotlib.pyplot as plt
 import numpy as np
+from numpy.typing import ArrayLike
 
 try:
     import torch
+
     istensor = torch.is_tensor
 except ImportError:
     istensor = lambda x: False
 
+
 def _plot_rectangle(rectangle: np.ndarray, weight, **plt_kwargs):
     rectangle = np.asarray(rectangle)
     x_axis = rectangle[[0, 2]]
@@ -137,7 +140,9 @@ def plot_signed_measure(signed_measure, threshold=None, ax=None, **plt_kwargs):
             else:
                 pts_ = pts
             threshold = np.max(np.ma.masked_invalid(pts_), axis=0)
-        threshold = np.max([threshold, [plt.gca().get_xlim()[1], plt.gca().get_ylim()[1]]], axis=0)
+        threshold = np.max(
+            [threshold, [plt.gca().get_xlim()[1], plt.gca().get_ylim()[1]]], axis=0
+        )
     if isinstance(pts, np.ndarray):
         pass
     else:
@@ -255,7 +260,7 @@ def plot2d_PyModule(
     dimension=-1,
     separated=False,
     min_persistence=0,
-    alpha=.8,
+    alpha=0.8,
     verbose=False,
     save=False,
     dpi=200,
@@ -341,3 +346,84 @@ def plot2d_PyModule(
         if dimension >= 0:
             plt.title(rf"$H_{dimension}$ $2$-persistence")
     return
+
+
+def plot_simplicial_complex(
+    st, pts: ArrayLike, x: float, y: float, mma=None, degree=None
+):
+    """
+    Scatters the points, with the simplices in the filtration at coordinates (x,y).
+    if an mma module is given, plots it in a second axis
+    """
+    if mma is not None:
+        fig, (a, b) = plt.subplots(ncols=2, figsize=(15, 5))
+        plt.sca(a)
+        plot_simplicial_complex(st, pts, x, y)
+        plt.sca(b)
+        mma.plot(degree=degree)
+        box = mma.get_box()
+        a, b, c, d = box.ravel()
+        mma.plot(degree=1, min_persistence=0.01)
+        plt.vlines(x, b, d, color="k", linestyle="--")
+        plt.hlines(y, a, c, color="k", linestyle="--")
+        plt.scatter([x], [y], c="r", zorder=10)
+        plt.text(x + 0.01 * (b - a), y + 0.01 * (d - c), f"({x},{y})")
+        return
+
+    pts = np.asarray(pts)
+    values = np.array([-f[1] for s, f in st.get_skeleton(0)])
+    qs = np.quantile(values, np.linspace(0, 1, 100))
+    color_idx = lambda d: np.searchsorted(qs, d) / 100
+
+    from matplotlib.pyplot import get_cmap
+
+    color = lambda d: get_cmap("viridis")([0, color_idx(d), 1])[1]
+    cols_pc = np.asarray([color(v) for v in values])
+    ax = plt.gca()
+    for s, f in st:  ## simplexe, filtration
+        density = -f[1]
+        if len(s) <= 1 or f[0] > x or density < -y:  ## simplexe  = point
+            continue
+        if len(s) == 2:  ## simplexe = segment
+            xx = np.array([pts[a, 0] for a in s])
+            yy = np.array([pts[a, 1] for a in s])
+            plt.plot(xx, yy, c=color(density), alpha=1, zorder=10 * density, lw=1.5)
+        if len(s) == 3:  ## simplexe = triangle
+            xx = np.array([pts[a, 0] for a in s])
+            yy = np.array([pts[a, 1] for a in s])
+            _c = color(density)
+            ax.fill(xx, yy, c=_c, alpha=0.3, zorder=0)
+    out = plt.scatter(pts[:, 0], pts[:, 1], c=cols_pc, zorder=10, s=10)
+    ax.set_aspect(1)
+    return out
+
+
+def plot_point_cloud(pts, function, x, y, mma=None, degree=None):
+    if mma is not None:
+        fig, (a, b) = plt.subplots(ncols=2, figsize=(15, 5))
+        plt.sca(a)
+        plot_point_cloud(pts, function, x, y)
+        plt.sca(b)
+        mma.plot(degree=degree)
+        box = mma.get_box()
+        a, b, c, d = box.ravel()
+        mma.plot(degree=1, min_persistence=0.01)
+        plt.vlines(x, b, d, color="k", linestyle="--")
+        plt.hlines(y, a, c, color="k", linestyle="--")
+        plt.scatter([x], [y], c="r", zorder=10)
+        plt.text(x + 0.01 * (b - a), y + 0.01 * (d - c), f"({x},{y})")
+        return
+    values = 1 - function
+    qs = np.quantile(values, np.linspace(0, 1, 100))
+    color_idx = lambda d: np.searchsorted(qs, d) / 100
+    from matplotlib.pyplot import get_cmap
+    from matplotlib.collections import PatchCollection
+
+    color = lambda d: get_cmap("viridis")([0, color_idx(d), 1])[1]
+    ax = plt.gca()
+    idx = function <= y
+    circles = [plt.Circle(pt, x, color=color(c)) for pt, c in zip(pts[idx], function)]
+    pc = PatchCollection(circles, alpha=0.3)
+    ax.add_collection(pc)
+    plt.scatter(*pts.T, c=-function, s=20)
+    ax.set_aspect(1)

multipers/simplex_tree_multi.pyx

@@ -881,10 +881,10 @@ cdef class SimplexTreeMulti_KFi32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFi32:
         """
@@ -1982,7 +1982,16 @@ cdef class SimplexTreeMulti_Fi32:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Fi32:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Fi32:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -2032,6 +2041,8 @@ cdef class SimplexTreeMulti_Fi32:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -2309,10 +2320,10 @@ cdef class SimplexTreeMulti_Fi32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Fi32:
         """
@@ -3458,10 +3469,10 @@ cdef class SimplexTreeMulti_KFi64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFi64:
         """
@@ -4559,7 +4570,16 @@ cdef class SimplexTreeMulti_Fi64:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Fi64:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Fi64:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -4609,6 +4629,8 @@ cdef class SimplexTreeMulti_Fi64:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -4886,10 +4908,10 @@ cdef class SimplexTreeMulti_Fi64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Fi64:
         """
@@ -6035,10 +6057,10 @@ cdef class SimplexTreeMulti_KFf32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFf32:
         """
@@ -7136,7 +7158,16 @@ cdef class SimplexTreeMulti_Ff32:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Ff32:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Ff32:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -7186,6 +7217,8 @@ cdef class SimplexTreeMulti_Ff32:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -7463,10 +7496,10 @@ cdef class SimplexTreeMulti_Ff32:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Ff32:
         """
@@ -8612,10 +8645,10 @@ cdef class SimplexTreeMulti_KFf64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_KFi32 | SimplexTreeMulti_KFf64:
         """
@@ -9713,7 +9746,16 @@ cdef class SimplexTreeMulti_Ff64:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_Ff64:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_Ff64:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -9763,6 +9805,8 @@ cdef class SimplexTreeMulti_Ff64:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -10040,10 +10084,10 @@ cdef class SimplexTreeMulti_Ff64:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_Fi32 | SimplexTreeMulti_Ff64:
         """

multipers/simplex_tree_multi.pyx.tp

@@ -972,7 +972,16 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             out = self.get_ptr().get_edge_list()
         return out
 
-    def collapse_edges(self, int num=1, int max_dimension = 0, bool progress=False, bool strong=True, bool full=False, bool ignore_warning=False)->SimplexTreeMulti_{{FSHORT}}:
+    def collapse_edges(
+            self,
+            int num=1,
+            int max_dimension = 0,
+            bool progress=False,
+            bool strong=True,
+            bool full=False,
+            bool ignore_warning=False,
+            bool auto_clean=True,
+        )->SimplexTreeMulti_{{FSHORT}}:
         """Edge collapse for 1-critical 2-parameter clique complex (see https://arxiv.org/abs/2211.05574).
         It uses the code from the github repository https://github.com/aj-alonso/filtration_domination .
 
@@ -1022,6 +1031,8 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
         edges = _collapse_edge_list(edges, num=num, full=full, strong=strong, progress=progress)
         # Retrieves the collapsed simplicial complex
         self._reconstruct_from_edge_list(edges, swap=True, expand_dimension=max_dimension)
+        if self.is_squeezed and auto_clean:
+            self._clean_filtration_grid()
         return self
 
     @cython.inline
@@ -1317,10 +1328,10 @@ cdef class SimplexTreeMulti_{{FSHORT}}:
             self,
             filtration_grid:np.ndarray|list|None=None,
             bool coordinate_values=True,
-            force=False,
-            strategy:_available_strategies = "exact",
+            bool force=False,
+            str strategy:_available_strategies = "exact",
             grid_strategy=None,
-            inplace=False,
+            bool inplace=False,
             **filtration_grid_kwargs
         )->SimplexTreeMulti_{{FSHORT[:-3] + "i32"}} | SimplexTreeMulti_{{FSHORT}}:
         """

multipers/slicer.pxd

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

multipers/slicer.pyx

@@ -19876,7 +19876,7 @@ cdef extern from "gudhi/cubical_to_boundary.h" namespace "":
   void _to_boundary(const vector[unsigned int]&, vector[vector[unsigned int]]&, vector[int]&) except + nogil
   void get_vertices(unsigned int, cset[unsigned int]&, const vector[vector[unsigned int]]&) nogil
 
-def _from_bitmapi32(image, **slicer_kwargs):
+def _from_bitmapf32(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -19894,9 +19894,9 @@ def _from_bitmapi32(image, **slicer_kwargs):
     cdef cset[unsigned int] vertices
 
     cdef unsigned int num_gens = gen_dims.size()
-    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.int32) - _Slicer._inf_value()
-    cdef int32_t[:,:] F = filtration_values
-    cdef int32_t[:,:] c_img = image.reshape(-1,num_parameters)
+    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float32) - _Slicer._inf_value()
+    cdef float[:,:] F = filtration_values
+    cdef float[:,:] c_img = image.reshape(-1,num_parameters)
     with nogil:
         for i in range(num_gens):
             # with gil:
@@ -19914,7 +19914,7 @@ def _from_bitmapi32(image, **slicer_kwargs):
             #     print(f"F = {np.asarray(F[i])}")
     slicer = _Slicer(gen_maps, gen_dims, filtration_values)
     return slicer
-def _from_bitmapf64(image, **slicer_kwargs):
+def _from_bitmapi32(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -19932,9 +19932,9 @@ def _from_bitmapf64(image, **slicer_kwargs):
     cdef cset[unsigned int] vertices
 
     cdef unsigned int num_gens = gen_dims.size()
-    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float64) - _Slicer._inf_value()
-    cdef double[:,:] F = filtration_values
-    cdef double[:,:] c_img = image.reshape(-1,num_parameters)
+    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.int32) - _Slicer._inf_value()
+    cdef int32_t[:,:] F = filtration_values
+    cdef int32_t[:,:] c_img = image.reshape(-1,num_parameters)
     with nogil:
         for i in range(num_gens):
             # with gil:
@@ -19990,7 +19990,7 @@ def _from_bitmapi64(image, **slicer_kwargs):
             #     print(f"F = {np.asarray(F[i])}")
     slicer = _Slicer(gen_maps, gen_dims, filtration_values)
     return slicer
-def _from_bitmapf32(image, **slicer_kwargs):
+def _from_bitmapf64(image, **slicer_kwargs):
     from multipers import Slicer
     dtype = slicer_kwargs.get("dtype", image.dtype)
     slicer_kwargs["dtype"] = dtype
@@ -20008,9 +20008,9 @@ def _from_bitmapf32(image, **slicer_kwargs):
     cdef cset[unsigned int] vertices
 
     cdef unsigned int num_gens = gen_dims.size()
-    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float32) - _Slicer._inf_value()
-    cdef float[:,:] F = filtration_values
-    cdef float[:,:] c_img = image.reshape(-1,num_parameters)
+    filtration_values = np.zeros(shape=(num_gens, num_parameters), dtype = np.float64) - _Slicer._inf_value()
+    cdef double[:,:] F = filtration_values
+    cdef double[:,:] c_img = image.reshape(-1,num_parameters)
     with nogil:
         for i in range(num_gens):
             # with gil:
@@ -20031,14 +20031,14 @@ def _from_bitmapf32(image, **slicer_kwargs):
 
 def from_bitmap(img, **kwargs):
     img = np.asarray(img)
+    if img.dtype == np.float32:
+        return _from_bitmapf32(img, **kwargs)
     if img.dtype == np.int32:
         return _from_bitmapi32(img, **kwargs)
-    if img.dtype == np.float64:
-        return _from_bitmapf64(img, **kwargs)
     if img.dtype == np.int64:
         return _from_bitmapi64(img, **kwargs)
-    if img.dtype == np.float32:
-        return _from_bitmapf32(img, **kwargs)
+    if img.dtype == np.float64:
+        return _from_bitmapf64(img, **kwargs)
     raise ValueError(f"Invalid dtype. Got {img.dtype=}, was expecting {available_dtype=}.")
 
 def from_function_delaunay(
@@ -20100,6 +20100,7 @@ def minimal_presentation(
         dtype:type|_valid_dtypes=None,
         int n_jobs = -1,
         bool force=False,
+        bool auto_clean = True,
         **minpres_kwargs
         ):
     """
@@ -20138,6 +20139,8 @@ def minimal_presentation(
 
     new_slicer.minpres_degree = degree
     new_slicer.filtration_grid = slicer.filtration_grid if slicer.is_squeezed else None
+    if new_slicer.is_squeezed and auto_clean:
+        new_slicer = new_slicer._clean_filtration_grid()
     return new_slicer
 
 

multipers/slicer.pyx.tp

@@ -818,6 +818,7 @@ def minimal_presentation(
         dtype:type|_valid_dtypes=None,
         int n_jobs = -1,
         bool force=False,
+        bool auto_clean = True,
         **minpres_kwargs
         ):
     """
@@ -856,6 +857,8 @@ def minimal_presentation(
 
     new_slicer.minpres_degree = degree
     new_slicer.filtration_grid = slicer.filtration_grid if slicer.is_squeezed else None
+    if new_slicer.is_squeezed and auto_clean:
+        new_slicer = new_slicer._clean_filtration_grid()
     return new_slicer
 
 

{multipers-2.3.2b1.dist-info → multipers-2.3.3b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multipers
-Version: 2.3.2b1
+Version: 2.3.3b1
 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.2b1.dist-info → multipers-2.3.3b1.dist-info}/RECORD

@@ -5,32 +5,32 @@ 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.cp313-win_amd64.pyd,sha256=E07VhvzfgPxPlMMVxQDm0q70kd9yDvw3JuDB8YIknko,332800
+multipers/function_rips.cp313-win_amd64.pyd,sha256=4CygDQQN_t5nsfXNsozoqR1ArtbxQaQ6OS_HWh9fX2w,332800
 multipers/function_rips.pyx,sha256=j5NjbK3YrAv_2s8YHB1JB0k6m9NC7RQCSFlJe-w_kgE,5252
-multipers/grids.cp313-win_amd64.pyd,sha256=jEI4woWKHpVkthzoyxWtCEfNYELP7Cdy1xNgukz7Enk,480768
+multipers/grids.cp313-win_amd64.pyd,sha256=n4UM7QfQY-yuI9ZvoOnQzzjHqlGiOp6WLVJofxQFSA4,480768
 multipers/grids.pyx,sha256=ONN_RKkuxqwb9IaS9gd42FUGaiBLc8QWcd3L-ubZjKE,16575
-multipers/io.cp313-win_amd64.pyd,sha256=MRvfaoK3sywjEJxTHkzvvgbO66CoMqbMjdJ5EjRxGgA,221696
+multipers/io.cp313-win_amd64.pyd,sha256=LErGBShjAZieqNU4chR2ZprMVkI9rijWAeJlVwkgiFY,221696
 multipers/io.pyx,sha256=pQBH_rSqaCZqDSxTLnhlyECP3fLbX2tR_RKJHydHm_0,22210
-multipers/mma_structures.cp313-win_amd64.pyd,sha256=VAxko-eyftWHFKtxIEU7yvVoGflEpYnVisT0WMlK5kU,1302528
+multipers/mma_structures.cp313-win_amd64.pyd,sha256=zGcv95AD29KrQs7JS2SdODt0QsB_LzhsNyqfKgWyhrM,1302528
 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/multiparameter_edge_collapse.py,sha256=MFt0eKQQSv2354omeIqOmzASYTKIMsYdxZHFZauQr8g,1229
-multipers/multiparameter_module_approximation.cp313-win_amd64.pyd,sha256=eqsJLh5o6fqsf0IhbTFMJtt0PrFL4263MbEbI_6f9PY,457216
-multipers/multiparameter_module_approximation.pyx,sha256=HcQyT8aeCxDA_QcODz3Bk6rXyX6NPOYM5vRkYx1_tIo,9024
+multipers/multiparameter_module_approximation.cp313-win_amd64.pyd,sha256=9AKU9VkCOyioTEmau3HlGpnEphSm5DtjA3jsF9JXQIg,456704
+multipers/multiparameter_module_approximation.pyx,sha256=wp7la7Z9wBngnfw6WOVddf93mPyXf4HfNT6dKW2Z0r0,9030
 multipers/pickle.py,sha256=YYVt4iHiD16E1x5Yn_4mX6P5P8rKi56pNGjJo5IzPhc,2579
-multipers/plots.py,sha256=qE08IhzCIDBUsqbxbuxDsMf2T1SBRCSeeys2dpn7I9U,11236
-multipers/point_measure.cp313-win_amd64.pyd,sha256=vqkJZRsuW6O9ILwoPPqAmeWDqu69p89AhPRmHukJaSw,587264
+multipers/plots.py,sha256=9yLuNLJ3XefALKTbdtGu6cJfOt0faXyE0bMGDyFRL4g,14417
+multipers/point_measure.cp313-win_amd64.pyd,sha256=x_2NRlgF0Pqx3MAcnt31qycDxCg6ea7WKp2nkj_71F4,587264
 multipers/point_measure.pyx,sha256=DVhal6HgCCuALSJMcHHKOW16CwDQCVTc2PpK8cGCqx8,12109
-multipers/simplex_tree_multi.cp313-win_amd64.pyd,sha256=wzuHdFPjLd2U8pSNs3urTaCL8arOp_3OkkIhOnPGR9o,3596800
+multipers/simplex_tree_multi.cp313-win_amd64.pyd,sha256=CkgyuH5p0ffN8yRjjhCnpOzxZz5B15h5fSUIsX2BZ54,3599872
 multipers/simplex_tree_multi.pxd,sha256=KpyDEQNPoMC2sOU9-d4LtrGXx_UVCJGxMJ1kk1AzHgU,6631
-multipers/simplex_tree_multi.pyx,sha256=kHcy0PgQSE6OZOhXSeIt9vRA7uYQ_mP59zDO0uchWco,497140
-multipers/simplex_tree_multi.pyx.tp,sha256=5dCPI0jUZrCfCIHaGR7rwCu4trG_MvUxt1drJWJuI3Y,88973
-multipers/slicer.cp313-win_amd64.pyd,sha256=PJZDJKS6qBuEuw800aU2E6trR5WhHN1EK49mGgDq54A,11775488
-multipers/slicer.pxd,sha256=fzA-lL_QWyUMf9rRSpcKG35QNS9UXEmVC9r7kR0geho,185230
+multipers/simplex_tree_multi.pyx,sha256=reHyva5AR1lOQyiCs2_jQ2XfwHtktcQ1nmY_BNmyxhk,498156
+multipers/simplex_tree_multi.pyx.tp,sha256=fUTuIscfDlNjsImWU1YALVZ1Mf9OEkdl-IFKcRQqalI,89202
+multipers/slicer.cp313-win_amd64.pyd,sha256=vp1-NXjDx0vDl9zMFcP6kvnHQ1s3vMvCUJrNP0M2ABA,11775488
+multipers/slicer.pxd,sha256=bHcV5COzDcjhaVcL3bWSHivUYtdkSx4bdj24fVOe_DU,185230
 multipers/slicer.pxd.tp,sha256=fLOUPtPGqiY9o1fPDyc_whBrgKLh_6HVfvl7OtE-34Y,10243
-multipers/slicer.pyx,sha256=m5EF0WanqmNZ_2Nz3fJ2gcNMZFccpP-etiLrouP0xTU,893930
-multipers/slicer.pyx.tp,sha256=r4JUXH4eUMtM0uEETSlko590LhNH5bpjRxcqUeNHeJA,44415
+multipers/slicer.pyx,sha256=lR1XDmAGA10rwuZKNX6BoMPQeMmCapoEqZtQ5izLJ7Y,894068
+multipers/slicer.pyx.tp,sha256=0oSaqT6-traFiDW9R3IFRQ-u0kYle9Hum8xVzkVsa3c,44550
 multipers/tbb12.dll,sha256=6AsPR4GauU53hj2xqJNM0SfLkCKCDskjy-uKeS01tCk,338944
 multipers/tbbbind_2_5.dll,sha256=8TtH7JJZlCEKF0UwfyJoiyrFt9utOI_x5AFOxpP-pGw,23040
 multipers/tbbmalloc.dll,sha256=1MRBYYNzNcooog8__yuLq40l7kSgZ4lkNZhDFfTWM8A,112640
@@ -143,7 +143,7 @@ multipers/ml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 multipers/ml/accuracies.py,sha256=4KfH7EB6-3KjXhOcleHcCP_2OOA6mC9v7DI7MSA2PnU,2940
 multipers/ml/invariants_with_persistable.py,sha256=HL0_IIrcJdAmCIqcyHPg0PNLle_pa2esnGQJsK2hnHc,2261
 multipers/ml/kernels.py,sha256=XWfvKY68-c9E-MpRzdNqGzGD6K24Aizx95TkiSeAtIY,6175
-multipers/ml/mma.py,sha256=IqgTqp_ML7mjKyUul9xrhuY-PH6cw_7x_e2RZlbpCTc,23949
+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=MGxteZRNFvOPuNxCeJEp3iFKLLqHgfOk9EVeqM1OqIU,58131
@@ -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.2b1.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
-multipers-2.3.2b1.dist-info/METADATA,sha256=Y4BzuXQAWL9SPwMjnQb--IS_hRgF02yt7LNavqCIpYs,9672
-multipers-2.3.2b1.dist-info/WHEEL,sha256=bs-xhrmTp6GOYHnarwiqzzaLhy3P3WRx2sA2M-7RxtA,101
-multipers-2.3.2b1.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
-multipers-2.3.2b1.dist-info/RECORD,,
+multipers-2.3.3b1.dist-info/licenses/LICENSE,sha256=UsQRnvlo_9wpQS9DNt52GEraERHwK2GIRwuqr2Yv5JI,1071
+multipers-2.3.3b1.dist-info/METADATA,sha256=MU-U7yqOEIFamD8-E2ctFsjHx2xpWJXSpbV6JEiSPXQ,9672
+multipers-2.3.3b1.dist-info/WHEEL,sha256=qV0EIPljj1XC_vuSatRWjn02nZIz3N1t8jsZz7HBr2U,101
+multipers-2.3.3b1.dist-info/top_level.txt,sha256=L9e0AGmhRzrNw9FpuUx-zlqi5NcBOmrI9wYY8kYWr8A,10
+multipers-2.3.3b1.dist-info/RECORD,,

{multipers-2.3.2b1.dist-info → multipers-2.3.3b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp313-cp313-win_amd64