Merge last trunk modifications and resolve conflict on src/Alpha_complex/utilities/alphacomplex.md

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alpha_complex_3d_module_vincent@3979 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 2a63709432810154d7939e9bdd74f9d55d0aee43

1 files changed, 17 insertions, 3 deletions

diff --git a/src/cython/test/test_rips_complex.py b/src/cython/test/test_rips_complex.py
index c37b5400..05dfcaf7 100755
--- a/src/cython/test/test_rips_complex.py
+++ b/src/cython/test/test_rips_complex.py
@@ -30,7 +30,6 @@ __license__ = "GPL v3"
 
 def test_empty_rips():
     rips_complex = RipsComplex()
-    assert rips_complex.__is_defined() == True
 
 def test_rips_from_points():
     point_list = [[0, 0], [1, 0], [0, 1], [1, 1]]
@@ -68,12 +67,26 @@ def test_filtered_rips_from_points():
     assert simplex_tree.num_simplices() == 8
     assert simplex_tree.num_vertices() == 4
 
+def test_sparse_filtered_rips_from_points():
+    point_list = [[0, 0], [1, 0], [0, 1], [1, 1]]
+    filtered_rips = RipsComplex(points=point_list, max_edge_length=1.0,
+                                sparse=.001)
+
+    simplex_tree = filtered_rips.create_simplex_tree(max_dimension=1)
+
+    assert simplex_tree.__is_defined() == True
+    assert simplex_tree.__is_persistence_defined() == False
+
+    assert simplex_tree.num_simplices() == 8
+    assert simplex_tree.num_vertices() == 4
+
 def test_rips_from_distance_matrix():
     distance_matrix = [[0],
                        [1, 0],
                        [1, sqrt(2), 0],
                        [sqrt(2), 1, 1, 0]]
-    rips_complex = RipsComplex(distance_matrix=distance_matrix, max_edge_length=42)
+    rips_complex = RipsComplex(distance_matrix=distance_matrix,
+                               max_edge_length=42)
 
     simplex_tree = rips_complex.create_simplex_tree(max_dimension=1)
 
@@ -100,7 +113,8 @@ def test_filtered_rips_from_distance_matrix():
                        [1, 0],
                        [1, sqrt(2), 0],
                        [sqrt(2), 1, 1, 0]]
-    filtered_rips = RipsComplex(distance_matrix=distance_matrix, max_edge_length=1.0)
+    filtered_rips = RipsComplex(distance_matrix=distance_matrix,
+                                max_edge_length=1.0)
 
     simplex_tree = filtered_rips.create_simplex_tree(max_dimension=1)