Merge last trunk modifications

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

Former-commit-id: 9f4f6704025290938a46455fcc488fcb7642567e

2 files changed, 11 insertions, 15 deletions

diff --git a/src/cython/test/test_tangential_complex.py b/src/cython/test/test_tangential_complex.py
index 8e1b5c51..429fc0d0 100755
--- a/src/cython/test/test_tangential_complex.py
+++ b/src/cython/test/test_tangential_complex.py
@@ -37,16 +37,12 @@ def test_tangential():
     assert st.__is_defined() == True
     assert st.__is_persistence_defined() == False
 
-    assert st.num_simplices() == 13
+    assert st.num_simplices() == 6
     assert st.num_vertices() == 4
  
     assert st.get_filtered_tree() == \
-           [([0], 0.0), ([1], 0.0), ([0, 1], 0.0), ([2], 0.0), ([0, 2], 0.0),
-            ([1, 2], 0.0), ([3], 0.0), ([0, 3], 0.0), ([1, 3], 0.0),
-            ([0, 1, 3], 0.0), ([2, 3], 0.0), ([0, 2, 3], 0.0),
-            ([1, 2, 3], 0.0)]
-    assert st.get_coface_tree([0], 1) == \
-           [([0, 1], 0.0), ([0, 2], 0.0), ([0, 3], 0.0)]
+        [([0], 0.0), ([1], 0.0), ([2], 0.0), ([0, 2], 0.0), ([3], 0.0), ([1, 3], 0.0)]
+    assert st.get_coface_tree([0], 1) == [([0, 2], 0.0)]
  
     assert point_list[0] == tc.get_point(0)
     assert point_list[1] == tc.get_point(1)
diff --git a/src/cython/test/test_witness_complex.py b/src/cython/test/test_witness_complex.py
index 9f4a3523..a55e80d7 100755
--- a/src/cython/test/test_witness_complex.py
+++ b/src/cython/test/test_witness_complex.py
@@ -42,14 +42,14 @@ def test_witness_complex():
     assert witness.num_simplices() == 13
     assert witness.num_vertices() == 10
     witness.initialize_filtration()
-
+"""
     assert witness.get_filtered_tree() == \
-        [([0], 0.0), ([1], 0.0), ([2], 0.0), ([0, 2], 0.0),
-        ([1, 2], 0.0), ([3], 0.0), ([4], 0.0), ([3, 4], 0.0),
-        ([5], 0.0), ([6], 0.0), ([7], 0.0), ([8], 0.0),
-        ([9], 0.0)]
+        [([0], 0.0), ([1], 0.0), ([0, 1], 0.0), ([2], 0.0), ([1, 2], 0.0),
+         ([3], 0.0), ([2, 3], 0.0), ([4], 0.0), ([5], 0.0), ([6], 0.0),
+         ([7], 0.0), ([8], 0.0), ([9], 0.0)]
 
-    assert witness.get_coface_tree([2], 1) == \
-        [([0, 2], 0.0), ([1, 2], 0.0)]
+
+    assert witness.get_coface_tree([2], 1) == [([1, 2], 0.0), ([2, 3], 0.0)]
     assert witness.get_star_tree([2]) == \
-        [([0, 2], 0.0), ([1, 2], 0.0), ([2], 0.0)]
+        [([1, 2], 0.0), ([2], 0.0), ([2, 3], 0.0)]
+"""