4 files changed, 81 insertions, 1 deletions
diff --git a/src/python/test/test_cubical_complex.py b/src/python/test/test_cubical_complex.py
index 5c59db8f..d0e4e9e8 100755
--- a/src/python/test/test_cubical_complex.py
+++ b/src/python/test/test_cubical_complex.py
@@ -157,3 +157,20 @@ def test_cubical_generators():
     assert np.array_equal(g[0][0], np.empty(shape=[0,2]))
     assert np.array_equal(g[0][1], np.array([[7, 4]]))
     assert np.array_equal(g[1][0], np.array([8]))
+
+def test_cubical_cofaces_of_persistence_pairs_when_pd_has_no_paired_birth_and_death():
+    cubCpx = CubicalComplex(dimensions=[1,2], top_dimensional_cells=[0.0, 1.0])
+    Diag = cubCpx.persistence(homology_coeff_field=2, min_persistence=0)
+    pairs = cubCpx.cofaces_of_persistence_pairs()
+    assert pairs[0] == []
+    assert np.array_equal(pairs[1][0], np.array([0]))
+
+def test_periodic_cofaces_of_persistence_pairs_when_pd_has_no_paired_birth_and_death():
+    perCubCpx = PeriodicCubicalComplex(dimensions=[1,2], top_dimensional_cells=[0.0, 1.0],
+                                       periodic_dimensions=[True, True])
+    Diag = perCubCpx.persistence(homology_coeff_field=2, min_persistence=0)
+    pairs = perCubCpx.cofaces_of_persistence_pairs()
+    assert pairs[0] == []
+    assert np.array_equal(pairs[1][0], np.array([0]))
+    assert np.array_equal(pairs[1][1], np.array([0, 1]))
+    assert np.array_equal(pairs[1][2], np.array([1]))
diff --git a/src/python/test/test_dtm_rips_complex.py b/src/python/test/test_dtm_rips_complex.py
new file mode 100644
index 00000000..e1c0ee44
--- /dev/null
+++ b/src/python/test/test_dtm_rips_complex.py
@@ -0,0 +1,32 @@
+""" This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
+    See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
+    Author(s):       Yuichi Ike
+
+    Copyright (C) 2020 Inria, Copyright (C) 2020 FUjitsu Laboratories Ltd.
+
+    Modification(s):
+      - YYYY/MM Author: Description of the modification
+"""
+
+from gudhi.dtm_rips_complex import DTMRipsComplex
+from gudhi import RipsComplex
+import numpy as np
+from math import sqrt
+import pytest
+
+def test_dtm_rips_complex():
+    pts = np.array([[2.0, 2.0], [0.0, 1.0], [3.0, 4.0]])
+    dtm_rips = DTMRipsComplex(points=pts, k=2)
+    st = dtm_rips.create_simplex_tree(max_dimension=2)
+    st.persistence()
+    persistence_intervals0 = st.persistence_intervals_in_dimension(0)
+    assert persistence_intervals0 == pytest.approx(np.array([[3.16227766, 5.39834564],[3.16227766, 5.39834564], [3.16227766, float("inf")]]))
+    
+def test_compatibility_with_rips():
+    distance_matrix = np.array([[0, 1, 1, sqrt(2)], [1, 0, sqrt(2), 1], [1, sqrt(2), 0, 1], [sqrt(2), 1, 1, 0]])
+    dtm_rips = DTMRipsComplex(distance_matrix=distance_matrix, max_filtration=42)
+    st = dtm_rips.create_simplex_tree(max_dimension=1)
+    rips_complex = RipsComplex(distance_matrix=distance_matrix, max_edge_length=42)
+    st_from_rips = rips_complex.create_simplex_tree(max_dimension=1)
+    assert list(st.get_filtration()) == list(st_from_rips.get_filtration())
+
diff --git a/src/python/test/test_representations.py b/src/python/test/test_representations.py
index dba7f952..589cee00 100755
--- a/src/python/test/test_representations.py
+++ b/src/python/test/test_representations.py
@@ -1,12 +1,43 @@
 import os
 import sys
 import matplotlib.pyplot as plt
+import numpy as np
+import pytest
+
 
 def test_representations_examples():
     # Disable graphics for testing purposes
-    plt.show = lambda:None
+    plt.show = lambda: None
     here = os.path.dirname(os.path.realpath(__file__))
     sys.path.append(here + "/../example")
     import diagram_vectorizations_distances_kernels
 
     return None
+
+
+from gudhi.representations.metrics import *
+from gudhi.representations.kernel_methods import *
+
+
+def _n_diags(n):
+    l = []
+    for _ in range(n):
+        a = np.random.rand(50, 2)
+        a[:, 1] += a[:, 0]  # So that y >= x
+        l.append(a)
+    return l
+
+
+def test_multiple():
+    l1 = _n_diags(9)
+    l2 = _n_diags(11)
+    l1b = l1.copy()
+    d1 = pairwise_persistence_diagram_distances(l1, e=0.00001, n_jobs=4)
+    d2 = BottleneckDistance(epsilon=0.00001).fit_transform(l1)
+    d3 = pairwise_persistence_diagram_distances(l1, l1b, e=0.00001, n_jobs=4)
+    assert d1 == pytest.approx(d2)
+    assert d3 == pytest.approx(d2, abs=1e-5) # Because of 0 entries (on the diagonal)
+    d1 = pairwise_persistence_diagram_distances(l1, l2, metric="wasserstein", order=2, internal_p=2)
+    d2 = WassersteinDistance(order=2, internal_p=2, n_jobs=4).fit(l2).transform(l1)
+    print(d1.shape, d2.shape)
+    assert d1 == pytest.approx(d2, rel=.02)
diff --git a/src/python/test/test_weighted_rips.py b/src/python/test/test_weighted_rips_complex.py
index 7ef48333..7ef48333 100644
--- a/src/python/test/test_weighted_rips.py
+++ b/src/python/test/test_weighted_rips_complex.py