Make the new BettiCurve class compatible with the old interface

1 files changed, 10 insertions, 5 deletions

diff --git a/src/python/test/test_betti_curve_representations.py b/src/python/test/test_betti_curve_representations.py
index 3e77d760..6a45da4d 100755
--- a/src/python/test/test_betti_curve_representations.py
+++ b/src/python/test/test_betti_curve_representations.py
@@ -1,5 +1,6 @@
 import numpy as np
 import scipy.interpolate
+import pytest
 
 from gudhi.representations.vector_methods import BettiCurve
 
@@ -19,18 +20,18 @@ def test_betti_curve_is_irregular_betti_curve_followed_by_interpolation():
         pd[np.random.uniform(0, 1, n) < pinf, 1] = np.inf
         pds.append(pd)
     
-    bc = BettiCurve(None)
+    bc = BettiCurve(resolution=None, predefined_grid=None)
     bc.fit(pds)
     bettis = bc.transform(pds)
 
-    bc2 = BettiCurve(None)
+    bc2 = BettiCurve(resolution=None, predefined_grid=None)
     bettis2 = bc2.fit_transform(pds)
     assert((bc2.grid_ == bc.grid_).all())
     assert((bettis2 == bettis).all())
 
     for i in range(0, m):
         grid = np.linspace(pds[i][np.isfinite(pds[i])].min(), pds[i][np.isfinite(pds[i])].max() + 1, res)
-        bc_gridded = BettiCurve(grid)
+        bc_gridded = BettiCurve(predefined_grid=grid)
         bc_gridded.fit([])
         bettis_gridded = bc_gridded(pds[i])
 
@@ -41,14 +42,18 @@ def test_betti_curve_is_irregular_betti_curve_followed_by_interpolation():
 
 def test_empty_with_predefined_grid():
     random_grid = np.sort(np.random.uniform(0, 1, 100))
-    bc = BettiCurve(random_grid)
+    bc = BettiCurve(predefined_grid=random_grid)
     bettis = bc.fit_transform([])
     assert((bc.grid_ == random_grid).all())
     assert((bettis == 0).all())
 
     
 def test_empty():
-    bc = BettiCurve()
+    bc = BettiCurve(resolution=None, predefined_grid=None)
     bettis = bc.fit_transform([])
     assert(bc.grid_ == [-np.inf])
     assert((bettis == 0).all())
+
+def test_wrong_value_of_predefined_grid():
+    with pytest.raises(ValueError):
+        BettiCurve(predefined_grid=[1, 2, 3])