multipers 1.0__cp311-cp311-manylinux_2_34_x86_64.whl

multipers/ml/sliced_wasserstein.py

@@ -0,0 +1,313 @@
+## This code was written by Mathieu Carrière.
+
+import numpy as np
+from sklearn.base import BaseEstimator, TransformerMixin
+from sklearn.metrics import pairwise_distances, pairwise_kernels
+from joblib import Parallel, delayed
+
+def _pairwise(fallback, skipdiag, X, Y, metric, n_jobs):
+    if Y is not None:
+        return fallback(X, Y, metric=metric, n_jobs=n_jobs)
+    triu = np.triu_indices(len(X), k=skipdiag)
+    tril = (triu[1], triu[0])
+    par = Parallel(n_jobs=n_jobs, prefer="threads")
+    d = par(delayed(metric)([triu[0][i]], [triu[1][i]]) for i in range(len(triu[0])))
+    m = np.empty((len(X), len(X)))
+    m[triu] = d
+    m[tril] = d
+    if skipdiag:
+        np.fill_diagonal(m, 0)
+    return m
+
+def _sklearn_wrapper(metric, X, Y, **kwargs):
+    """
+    This function is a wrapper for any metric between two signed measures that takes two numpy arrays of shapes (nxD) and (mxD) as arguments.
+    """
+    if Y is None:
+        def flat_metric(a, b):
+            return metric(X[int(a[0])], X[int(b[0])], **kwargs)
+    else:
+        def flat_metric(a, b):
+            return metric(X[int(a[0])], Y[int(b[0])], **kwargs)
+    return flat_metric
+
+def _compute_signed_measure_parts(X):
+    """
+    This is a function for separating the positive and negative points of a list of signed measures. This function can be used as a preprocessing step in order to speed up the running time for computing all pairwise (sliced) Wasserstein distances on a list of signed measures. 
+
+    Parameters:
+        X (list of n tuples): list of signed measures. 
+
+    Returns: 
+        list of n pairs of numpy arrays of shape (num x dimension): list of positive and negative signed measures.
+    """
+    XX = []
+    for (C,M) in X:
+        pos_idxs = np.argwhere(M > 0).ravel()
+        neg_idxs = np.setdiff1d(np.arange(len(M)), pos_idxs)
+        XX.append([ np.repeat(C[pos_idxs], M[pos_idxs], axis=0), np.repeat(C[neg_idxs], -M[neg_idxs], axis=0) ])
+    return XX
+
+def _compute_signed_measure_projections(X, num_directions, scales):
+    """
+    This is a function for projecting the points of a list of signed measures onto a fixed number of lines sampled uniformly. This function can be used as a preprocessing step in order to speed up the running time for computing all pairwise sliced Wasserstein distances on a list of signed measures. 
+
+    Parameters:
+        X (list of n tuples): list of signed measures. 
+        num_directions (int): number of lines evenly sampled from [-pi/2,pi/2] in order to approximate and speed up the distance computation.
+        scales (array of shape D): scales associated to the dimensions.
+
+    Returns: 
+        list of n pairs of numpy arrays of shape (num x num_directions): list of positive and negative projected signed measures.
+    """
+    dimension = X[0][0].shape[1]
+    np.random.seed(42)
+    thetas = np.random.normal(0,1,[num_directions, dimension])
+    lines = (thetas/np.linalg.norm(thetas, axis=1)[:,None]).T
+    weights = np.linalg.norm(np.multiply(scales[:,None], lines), axis=0) if scales is not None else np.ones(num_directions)
+    XX = []
+    for (C,M) in X:
+        pos_idxs = np.argwhere(M > 0).ravel()
+        neg_idxs = np.setdiff1d(np.arange(len(M)), pos_idxs)
+        XX.append( [np.matmul( np.repeat(C[pos_idxs], M[pos_idxs], axis=0), lines), np.matmul(np.repeat(C[neg_idxs], -M[neg_idxs], axis=0), lines), weights] )
+    return XX
+
+
+def pairwise_signed_measure_distances(X, Y=None, metric="sliced_wasserstein", n_jobs=None, **kwargs):
+    """
+    This function computes the distance matrix between two lists of signed measures given as numpy arrays of shape (nxD).
+
+    Parameters:
+        X (list of n tuples): first list of signed measures. 
+        Y (list of m tuples): second list of signed measures (optional). If None, pairwise distances are computed from the first list only.
+        metric: distance to use. It can be either a string ("sliced_wasserstein", "wasserstein") or a function taking two tuples as inputs. If it is a function, make sure that it is symmetric and that it outputs 0 if called on the same two tuples. 
+        n_jobs (int): number of jobs to use for the computation. This uses joblib.Parallel(prefer="threads"), so metrics that do not release the GIL may not scale unless run inside a `joblib.parallel_backend <https://joblib.readthedocs.io/en/latest/parallel.html#joblib.parallel_backend>`_ block.
+        **kwargs: optional keyword parameters. Any further parameters are passed directly to the distance function. See the docs of the various distance classes in this module.
+
+    Returns: 
+        numpy array of shape (nxm): distance matrix
+    """
+    XX = np.reshape(np.arange(len(X)), [-1,1])
+    YY = None if Y is None or Y is X else np.reshape(np.arange(len(Y)), [-1,1])
+    if metric == "sliced_wasserstein":
+        Xproj = _compute_signed_measure_projections(X, **kwargs)
+        Yproj = None if Y is None else _compute_signed_measure_projections(Y, **kwargs)
+        return _pairwise(pairwise_distances, True, XX, YY, metric=_sklearn_wrapper(_sliced_wasserstein_distance_on_projections, Xproj, Yproj), n_jobs=n_jobs)
+    elif metric == "wasserstein":
+        Xproj = _compute_signed_measure_parts(X)
+        Yproj = None if Y is None else _compute_signed_measure_parts(Y)
+        return _pairwise(pairwise_distances, True, XX, YY, metric=_sklearn_wrapper(_wasserstein_distance_on_parts(**kwargs), Xproj, Yproj), n_jobs=n_jobs)
+    else:
+        return _pairwise(pairwise_distances, True, XX, YY, metric=_sklearn_wrapper(metric, X, Y, **kwargs), n_jobs=n_jobs)
+
+def _wasserstein_distance_on_parts(ground_norm=1, epsilon=1.):
+    """
+    This is a function for computing the Wasserstein distance between two signed measures that have already been separated into their positive and negative parts.
+
+    Parameters: 
+        meas1: pair of (n x dimension) numpy.arrays containing the points of the positive and negative parts of the first measure.
+        meas2: pair of (m x dimension) numpy.arrays containing the points of the positive and negative parts of the second measure.
+
+    Returns: 
+        float: the sliced Wasserstein distance between the projected signed measures. 
+    """
+    def metric(meas1, meas2):
+        meas1_plus, meas1_minus = meas1[0], meas1[1]
+        meas2_plus, meas2_minus = meas2[0], meas2[1]
+        num_pts = len(meas1_plus) + len(meas2_minus)
+        meas_t1 = np.vstack([meas1_plus, meas2_minus])
+        meas_t2 = np.vstack([meas2_plus, meas1_minus])
+        import ot
+        if epsilon > 0:
+            wass = ot.sinkhorn2(1/num_pts * np.ones(num_pts), 1/num_pts * np.ones(num_pts), pairwise_distances(meas_t1, meas_t2, metric='minkowski', p=ground_norm), epsilon)
+            return wass[0]
+        else:
+            wass = ot.lp.emd2([],[], np.ascontiguousarray(pairwise_distances(meas_t1, meas_t2, metric='minkowski', p=ground_norm), dtype=np.float64))
+            return wass
+    return metric
+
+def _sliced_wasserstein_distance_on_projections(meas1, meas2, scales=None):
+    """
+    This is a function for computing the sliced Wasserstein distance between two signed measures that have already been projected onto some lines. It simply amounts to comparing the sorted projections with the 1-norm, and averaging over the lines. See http://proceedings.mlr.press/v70/carriere17a.html for more details.
+
+    Parameters: 
+        meas1: pair of (n x number_of_lines) numpy.arrays containing the projected points of the positive and negative parts of the first measure.
+        meas2: pair of (m x number_of_lines) numpy.arrays containing the projected points of the positive and negative parts of the second measure.
+        scales (array of shape D): scales associated to the dimensions.
+
+    Returns: 
+        float: the sliced Wasserstein distance between the projected signed measures. 
+    """
+    #assert np.array_equal(  meas1[2], meas2[2]  )
+    weights = meas1[2]
+    meas1_plus, meas1_minus = meas1[0], meas1[1]
+    meas2_plus, meas2_minus = meas2[0], meas2[1]
+    A = np.sort(np.vstack([meas1_plus, meas2_minus]), axis=0)
+    B = np.sort(np.vstack([meas2_plus, meas1_minus]), axis=0)
+    L1 = np.sum(np.abs(A-B), axis=0)
+    return np.mean(np.multiply(L1, weights))
+
+
+def _sliced_wasserstein_distance(meas1, meas2, num_directions, scales=None):
+    """
+    This is a function for computing the sliced Wasserstein distance from two signed measures. The Sliced Wasserstein distance is computed by projecting the signed measures onto lines, comparing the projections with the 1-norm, and finally averaging over the lines. See http://proceedings.mlr.press/v70/carriere17a.html for more details.
+    
+    Parameters:
+        meas1: ((n x D), (n)) tuple with numpy.array encoding the (finite points of the) first measure and their multiplicities. Must not contain essential points (i.e. with infinite coordinate).
+        meas2: ((m x D), (m)) tuple encoding the second measure.
+        num_directions (int): number of lines evenly sampled from [-pi/2,pi/2] in order to approximate and speed up the distance computation.
+        scales (array of shape D): scales associated to the dimensions.
+
+    Returns: 
+        float: the sliced Wasserstein distance between signed measures. 
+    """
+    C1, M1 = meas1[0], meas1[1]
+    C2, M2 = meas2[0], meas2[1]
+    dimension = C1.shape[1]
+    C1_plus_idxs, C2_plus_idxs = np.argwhere(M1 > 0).ravel(), np.argwhere(M2 > 0).ravel()
+    C1_minus_idxs, C2_minus_idxs = np.setdiff1d(np.arange(len(M1)), C1_plus_idxs), np.setdiff1d(np.arange(len(M2)), C2_plus_idxs)
+    np.random.seed(42)
+    thetas = np.random.normal(0,1,[num_directions, dimension])
+    lines = (thetas/np.linalg.norm(thetas, axis=1)[:,None]).T
+    weights = np.linalg.norm(np.multiply(scales[:,None], lines), axis=0) if scales is not None else np.ones(num_directions)
+    approx1 = np.matmul(np.vstack([ np.repeat(C1[C1_plus_idxs], M1[C1_plus_idxs], axis=0), np.repeat(C2[C2_minus_idxs], -M2[C2_minus_idxs], axis=0) ]), lines)
+    approx2 = np.matmul(np.vstack([ np.repeat(C2[C2_plus_idxs], M2[C2_plus_idxs], axis=0), np.repeat(C1[C1_minus_idxs], -M1[C1_minus_idxs], axis=0) ]), lines)
+    A = np.sort(approx1, axis=0)
+    B = np.sort(approx2, axis=0)
+    L1 = np.sum(np.abs(A-B), axis=0)
+    return np.mean(np.multiply(L1, weights))
+
+def _wasserstein_distance(meas1, meas2, epsilon, ground_norm):
+    """
+    This is a function for computing the Wasserstein distance from two signed measures.
+    
+    Parameters:
+        meas1: ((n x D), (n)) tuple with numpy.array encoding the (finite points of the) first measure and their multiplicities. Must not contain essential points (i.e. with infinite coordinate).
+        meas2: ((m x D), (m)) tuple encoding the second measure.
+        epsilon (float): entropy regularization parameter.
+        ground_norm (int): norm to use for ground metric cost.
+
+    Returns: 
+        float: the Wasserstein distance between signed measures. 
+    """
+    C1, M1 = meas1[0], meas1[1]
+    C2, M2 = meas2[0], meas2[1]
+    C1_plus_idxs, C2_plus_idxs = np.argwhere(M1 > 0).ravel(), np.argwhere(M2 > 0).ravel()
+    C1_minus_idxs, C2_minus_idxs = np.setdiff1d(np.arange(len(M1)), C1_plus_idxs), np.setdiff1d(np.arange(len(M2)), C2_plus_idxs)
+    approx1 = np.vstack([ np.repeat(C1[C1_plus_idxs], M1[C1_plus_idxs], axis=0), np.repeat(C2[C2_minus_idxs], -M2[C2_minus_idxs], axis=0) ])
+    approx2 = np.vstack([ np.repeat(C2[C2_plus_idxs], M2[C2_plus_idxs], axis=0), np.repeat(C1[C1_minus_idxs], -M1[C1_minus_idxs], axis=0) ])
+    num_pts = len(approx1)
+    import ot
+    if epsilon > 0:
+        wass = ot.sinkhorn2(1/num_pts * np.ones(num_pts), 1/num_pts * np.ones(num_pts), pairwise_distances(approx1, approx2, metric='minkowski', p=ground_norm), epsilon)
+        return wass[0]
+    else:
+        wass = ot.lp.emd2(1/num_pts * np.ones(num_pts), 1/num_pts * np.ones(num_pts), pairwise_distances(approx1, approx2, metric='minkowski', p=ground_norm))        
+        return wass
+
+class SlicedWassersteinDistance(BaseEstimator, TransformerMixin):
+    """
+    This is a class for computing the sliced Wasserstein distance matrix from a list of signed measures. The Sliced Wasserstein distance is computed by projecting the signed measures onto lines, comparing the projections with the 1-norm, and finally integrating over all possible lines. See http://proceedings.mlr.press/v70/carriere17a.html for more details. 
+    """
+    def __init__(self, num_directions=10, scales=None, n_jobs=None):
+        """
+        Constructor for the SlicedWassersteinDistance class.
+
+        Parameters:
+            num_directions (int): number of lines evenly sampled in order to approximate and speed up the distance computation (default 10). 
+            scales (array of shape D): scales associated to the dimensions.
+            n_jobs (int): number of jobs to use for the computation. See :func:`pairwise_signed_measure_distances` for details.
+        """
+        self.num_directions = num_directions
+        self.scales = scales
+        self.n_jobs = n_jobs
+
+    def fit(self, X, y=None):
+        """
+        Fit the SlicedWassersteinDistance class on a list of signed measures: signed measures are projected onto the different lines. The measures themselves are then stored in numpy arrays, called **measures_**.
+
+        Parameters:
+            X (list of tuples): input signed measures.
+            y (n x 1 array): signed measure labels (unused).
+        """
+        self.measures_ = X
+        return self
+
+    def transform(self, X):
+        """
+        Compute all sliced Wasserstein distances between the signed measures that were stored after calling the fit() method, and a given list of (possibly different) signed measures.
+
+        Parameters:
+            X (list of tuples): input signed measures.
+
+        Returns:
+            numpy array of shape (number of measures in **measures**) x (number of measures in X): matrix of pairwise sliced Wasserstein distances.
+        """
+        return pairwise_signed_measure_distances(X, self.measures_, metric="sliced_wasserstein", num_directions=self.num_directions, scales=self.scales, n_jobs=self.n_jobs)
+
+    def __call__(self, meas1, meas2):
+        """
+        Apply SlicedWassersteinDistance on a single pair of signed measures and outputs the result.
+
+        Parameters:
+            meas1: ((n x D), (n)) tuple with numpy.array encoding the (finite points of the) first measure and their multiplicities. Must not contain essential points (i.e. with infinite coordinate).
+            meas2: ((m x D), (m)) tuple encoding the second measure.
+
+        Returns:
+            float: sliced Wasserstein distance.
+        """
+        return _sliced_wasserstein_distance(meas1, meas2, num_directions=self.num_directions, scales=self.scales)
+
+class WassersteinDistance(BaseEstimator, TransformerMixin):
+    """
+    This is a class for computing the Wasserstein distance matrix from a list of signed measures.
+    """
+    def __init__(self, epsilon=1., ground_norm=1, n_jobs=None):
+        """
+        Constructor for the WassersteinDistance class.
+
+        Parameters:
+            epsilon (float): entropy regularization parameter.
+            ground_norm (int): norm to use for ground metric cost.
+            n_jobs (int): number of jobs to use for the computation. See :func:`pairwise_signed_measure_distances` for details.
+        """
+        self.epsilon = epsilon
+        self.ground_norm = ground_norm
+        self.n_jobs = n_jobs
+
+    def fit(self, X, y=None):
+        """
+        Fit the WassersteinDistance class on a list of signed measures. The measures themselves are then stored in numpy arrays, called **measures_**.
+
+        Parameters:
+            X (list of tuples): input signed measures.
+            y (n x 1 array): signed measure labels (unused).
+        """
+        self.measures_ = X
+        return self
+
+    def transform(self, X):
+        """
+        Compute all Wasserstein distances between the signed measures that were stored after calling the fit() method, and a given list of (possibly different) signed measures.
+
+        Parameters:
+            X (list of tuples): input signed measures.
+
+        Returns:
+            numpy array of shape (number of measures in **measures**) x (number of measures in X): matrix of pairwise Wasserstein distances.
+        """
+        return pairwise_signed_measure_distances(X, self.measures_, metric="wasserstein", epsilon=self.epsilon, ground_norm=self.ground_norm, n_jobs=self.n_jobs)
+
+    def __call__(self, meas1, meas2):
+        """
+        Apply WassersteinDistance on a single pair of signed measures and outputs the result.
+
+        Parameters:
+            meas1: ((n x D), (n)) tuple with numpy.array encoding the (finite points of the) first measure and their multiplicities. Must not contain essential points (i.e. with infinite coordinate).
+            meas2: ((m x D), (m)) tuple encoding the second measure.
+
+        Returns:
+            float: Wasserstein distance.
+        """
+        return _wasserstein_distance(meas1, meas2, epsilon=self.epsilon, ground_norm=self.ground_norm)
+

multipers/ml/tools.py

@@ -0,0 +1,99 @@
+from types import FunctionType
+from typing import  Iterable
+
+import numpy as np
+from joblib import Parallel, delayed
+from sklearn.base import BaseEstimator, TransformerMixin
+
+import multipers as mp
+from multipers.simplex_tree_multi import SimplexTreeMulti
+
+
+reduce_grid = SimplexTreeMulti._reduce_grid
+
+
+
+def get_simplex_tree_from_delayed(x)->mp.SimplexTreeMulti:
+	f,args, kwargs = x
+	return f(*args,**kwargs)
+
+def get_simplextree(x)->mp.SimplexTreeMulti:
+	if isinstance(x, mp.SimplexTreeMulti):
+		return x
+	if len(x) == 3 and isinstance(x[0],FunctionType):
+		return get_simplex_tree_from_delayed(x)
+	else:
+		raise TypeError("Not a valid SimplexTree !")
+
+
+
+def filtration_grid_to_coordinates(F, return_resolution):
+	# computes the mesh as a coordinate list
+	mesh = np.meshgrid(*F)
+	coordinates = np.concatenate([stuff.flatten()[:,None] for stuff in mesh], axis=1)
+	if return_resolution:
+		return coordinates, tuple(len(f) for f in F)
+	return coordinates
+
+def get_filtration_weights_grid(num_parameters:int=2, resolution:int|Iterable[int]=3,*,
+								min:float=0, max:float=20, dtype=float, 
+								remove_homothetie:bool=True, weights=None):
+	"""
+	Provides a grid of weights, for filtration rescaling.
+	 - num parameter : the dimension of the grid tensor
+	 - resolution :  the size of each coordinate
+	 - min : minimum weight
+	 - max : maximum weight
+	 - weights : custom weights (instead of linspace between min and max)
+	 - dtype : the type of the grid values (useful for int weights)
+	"""
+	from itertools import product
+
+	# if isinstance(resolution, int):
+	try:
+		float(resolution)
+		resolution = [resolution]*num_parameters
+	except:
+		pass
+	if weights is None:	
+		weights = [np.linspace(start=min,stop=max,num=r, dtype=dtype) for r in
+			resolution]
+	try:
+		float(weights[0]) # same weights for each filtrations
+		weights = [weights] * num_parameters
+	except:
+		None
+	out = np.asarray(list(product(*weights)))
+	if remove_homothetie:
+		_, indices = np.unique([x / x.max() for x in out if x.max() != 0],axis=0,
+						 return_index=True)
+		out = out[indices]
+	return list(out)
+
+
+
+
+class SimplexTreeEdgeCollapser(BaseEstimator, TransformerMixin):
+	def __init__(self, num_collapses:int=0, 
+			  full:bool=False, max_dimension:int|None=None, 
+			  n_jobs:int=1) -> None:
+		super().__init__()
+		self.full=full
+		self.num_collapses=num_collapses
+		self.max_dimension=max_dimension
+		self.n_jobs=n_jobs
+		return
+	def fit(self, X:np.ndarray|list, y=None):
+		return self
+	def transform(self,X):
+		edges_list = Parallel(n_jobs=-1,
+						prefer="threads")(delayed(mp.SimplextreeMulti.get_edge_list)(x)
+		for x in X)
+		collapsed_edge_lists = Parallel(n_jobs=self.n_jobs)(
+			delayed(mp._collapse_edge_list)(edges,full=self.full,
+			num=self.num_collapses) for edges in edges_list) ## 
+		collapsed_simplextrees = Parallel(n_jobs=-1,
+									prefer="threads")(delayed(mp.SimplexTreeMulti._reconstruct_from_edge_list)(collapsed_edge_lists,
+									swap=True,
+									expand_dim = self.max_dimension))
+		return collapsed_simplextrees

multipers/multiparameter_edge_collapse.py

@@ -0,0 +1,29 @@
+from tqdm import tqdm
+
+def _collapse_edge_list(edges, num:int=0, full:bool=False, strong:bool=False, progress:bool=False):
+	"""
+	Given an edge list defining a 1 critical 2 parameter 1 dimensional simplicial complex, simplificates this filtered simplicial complex, using filtration-domination's edge collapser.
+	"""
+	from filtration_domination import remove_strongly_filtration_dominated, remove_filtration_dominated
+	n = len(edges)
+	if full:
+		num = 100
+	with tqdm(range(num), total=num, desc="Removing edges", disable=not(progress)) as I:
+		for i in I:
+			if strong:
+				edges = remove_strongly_filtration_dominated(edges) # nogil ?
+			else:
+				edges = remove_filtration_dominated(edges)
+			# Prevents doing useless collapses
+			if len(edges) >= n:
+				if full and strong:
+					strong = False
+					n = len(edges)
+					# n = edges.size() # len(edges)
+				else : 
+					break
+			else:
+				n = len(edges)
+				# n = edges.size()
+	return edges
+

multipers/multiparameter_module_approximation.pxd

@@ -0,0 +1,147 @@
+from libcpp.utility cimport pair
+from libcpp cimport bool
+from libcpp.vector cimport vector
+from libcpp cimport tuple
+
+ctypedef float value_type
+
+ctypedef pair[vector[value_type],vector[value_type]] interval
+ctypedef vector[value_type] corner_type
+ctypedef vector[vector[value_type]] image_type
+ctypedef int dimension_type
+ctypedef vector[value_type] point_type
+ctypedef pair[vector[point_type], vector[point_type]] corner_list
+ctypedef value_type filtration_value_type
+ctypedef pair[corner_type, corner_type] bar
+ctypedef vector[bar] barcode
+ctypedef pair[vector[pair[value_type, value_type]], vector[unsigned int]] plot_interface_type
+ctypedef vector[value_type] multipers_bar
+ctypedef vector[multipers_bar] multipers_barcode
+ctypedef vector[barcode] barcodes
+ctypedef vector[int] euler_curve_type
+ctypedef vector[value_type] filtration_type
+ctypedef vector[filtration_type] multifiltration
+ctypedef vector[pair[int,pair[value_type,value_type]]] barcoded
+ctypedef vector[unsigned int] boundary_type
+ctypedef vector[boundary_type] boundary_matrix
+ctypedef pair[pair[value_type,value_type],pair[value_type,value_type]] interval_2
+
+ctypedef vector[Summand] summand_list_type
+ctypedef vector[summand_list_type] approx_summand_type
+ctypedef vector[int] simplex_type
+
+
+cdef extern from "gudhi/Simplex_tree/multi_filtrations/Finitely_critical_filtrations.h" namespace "Gudhi::multiparameter::multi_filtrations":
+	cdef cppclass Finitely_critical_multi_filtration "Gudhi::multiparameter::multi_filtrations::Finitely_critical_multi_filtration<Gudhi::multiparameter::Simplex_tree_options_multidimensional_filtration::value_type>":
+		Finitely_critical_multi_filtration()  except + nogil
+		Finitely_critical_multi_filtration(filtration_type) except +
+		Finitely_critical_multi_filtration& operator=(const Finitely_critical_multi_filtration&) except +
+		filtration_type get_vector() nogil const 
+		int size() nogil
+		@staticmethod
+		multifiltration& to_python(vector[Finitely_critical_multi_filtration]&) nogil const 
+		@staticmethod
+		vector[Finitely_critical_multi_filtration]& from_python(multifiltration&) nogil const 
+		vector[value_type]& _convert_back() nogil
+		filtration_type __filtration_type__(self):
+			return self.get_vector()
+
+ctypedef Finitely_critical_multi_filtration cfiltration_type
+ctypedef vector[cfiltration_type] cmultifiltration_type
+
+cdef extern from "gudhi/Simplex_tree/multi_filtrations/Box.h" namespace "Gudhi::multiparameter::mma":
+	cdef cppclass Box[value_type]:
+		Box()   except +
+		Box(const corner_type&, const corner_type&) nogil 
+		Box(const pair[corner_type, corner_type]&) nogil  
+		void inflate(value_type)  nogil 
+		const Finitely_critical_multi_filtration& get_bottom_corner()  nogil 
+		const Finitely_critical_multi_filtration& get_upper_corner()  nogil 
+		bool contains(corner_type&)  nogil
+		pair[Finitely_critical_multi_filtration, Finitely_critical_multi_filtration] get_pair() nogil
+
+cdef extern from "gudhi/Simplex_tree/multi_filtrations/Line.h" namespace "Gudhi::multiparameter::mma":
+	cdef cppclass Line[value_type]:
+		Line()   except + nogil
+		Line(point_type&)   except + nogil
+		Line(point_type&, point_type&)   except + nogil
+
+cdef extern from "multiparameter_module_approximation/approximation.h" namespace "Gudhi::multiparameter::mma":
+	cdef cppclass Summand:
+		Summand() except +
+		Summand(vector[Finitely_critical_multi_filtration]&, vector[Finitely_critical_multi_filtration]&, int)  except + nogil
+		value_type get_interleaving() nogil
+		value_type get_local_weight(const corner_type&, const value_type)  nogil
+		void add_bar(value_type, value_type, const corner_type&, corner_type&, corner_type&, const bool, const interval&) nogil
+		bool is_empty() nogil
+		cmultifiltration_type& get_birth_list() nogil
+		cmultifiltration_type& get_death_list() nogil
+		void complete_birth(const value_type)  nogil
+		void complete_death(const value_type)  nogil
+		dimension_type get_dimension()  nogil const 
+		void set_dimension(int) nogil
+		bool contains(const corner_type&)  nogil const
+		Box[value_type] get_bounds() nogil const
+		void rescale(const vector[value_type]&) nogil
+
+
+
+
+
+cdef extern from "multiparameter_module_approximation/utilities.h" namespace "Gudhi::multiparameter::mma":
+	cdef cppclass MultiDiagram_point:
+		MultiDiagram_point()   except + nogil
+		MultiDiagram_point(dimension_type , corner_type , corner_type )   except + nogil
+		filtration_type get_birth()    nogil const
+		filtration_type get_death()  nogil const 
+		dimension_type get_dimension() nogil  const 
+
+cdef extern from "multiparameter_module_approximation/utilities.h" namespace "Gudhi::multiparameter::mma":
+	cdef cppclass MultiDiagram:
+		MultiDiagram()   except + nogil
+		barcode get_points(const dimension_type) const  
+		multipers_barcode to_multipers(const dimension_type) nogil const   
+		vector[MultiDiagram_point].const_iterator begin()  
+		vector[MultiDiagram_point].const_iterator end()  
+		unsigned int size() const  
+		MultiDiagram_point& at(unsigned int)  nogil
+
+cdef extern from "multiparameter_module_approximation/utilities.h" namespace "Gudhi::multiparameter::mma":
+	cdef cppclass MultiDiagrams:
+		MultiDiagrams()  except + nogil
+		vector[vector[vector[value_type]]] to_multipers() nogil const    
+		MultiDiagram& at(const unsigned int)  nogil
+		unsigned int size() nogil const  
+		vector[MultiDiagram].const_iterator begin()
+		vector[MultiDiagram].const_iterator end()
+		plot_interface_type _for_python_plot(dimension_type, value_type)  nogil
+		barcodes get_points()  nogil
+
+cdef extern from "multiparameter_module_approximation/approximation.h" namespace "Gudhi::multiparameter::mma":
+	cdef cppclass Module:
+		Module()  except + nogil
+		void resize(unsigned int)  nogil
+		Summand& at(unsigned int)  nogil
+		vector[Summand].iterator begin()
+		vector[Summand].iterator end() 
+		void clean(const bool)  nogil
+		void fill(const value_type)  nogil
+		# vector[image_type] get_vectorization(const value_type,const value_type, unsigned int,unsigned int,const Box&)
+		# image_type get_vectorization_in_dimension(const int,const value_type,unsigned int,unsigned int,const Box&)
+		void add_summand(Summand)  nogil
+		unsigned int size() const  
+		Box[value_type] get_box() const  
+		Box[value_type] get_bounds() nogil const
+		void set_box(Box[value_type] &box)  nogil
+		int get_dimension() const 
+		vector[corner_list] get_corners_of_dimension(unsigned int)  nogil
+		image_type get_vectorization_in_dimension(const dimension_type, const value_type, const value_type, const bool, Box[value_type]&, unsigned int, unsigned int)  nogil
+		vector[image_type] get_vectorization(const value_type, const value_type, const bool, Box[value_type], unsigned int, unsigned int)  nogil
+		MultiDiagram get_barcode(Line[value_type]&, const dimension_type, const bool)  nogil
+		MultiDiagrams get_barcodes(const vector[Finitely_critical_multi_filtration]& , const dimension_type, const bool )  nogil
+		image_type get_landscape(const dimension_type,const unsigned int,Box[value_type]&,const vector[unsigned int]&)  nogil
+		vector[image_type] get_landscapes(const dimension_type,const vector[unsigned int],Box[value_type]&,const vector[unsigned int]&)  nogil
+		euler_curve_type euler_curve(const vector[Finitely_critical_multi_filtration]&) nogil
+		void rescale(const vector[value_type]&, int) nogil
+		void translate(const vector[value_type]&, int) nogil
+		vector[vector[value_type]] compute_pixels(const vector[vector[value_type]], vector[int], Box[value_type], value_type, value_type, bool,int) nogil