remove bad named *_tree() functions

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

Former-commit-id: 512403fe0838fb2691e0af94c55772bff942b740

5 files changed, 15 insertions, 16 deletions

diff --git a/src/cython/test/test_alpha_complex.py b/src/cython/test/test_alpha_complex.py
index 2625d529..2c76d9d7 100755
--- a/src/cython/test/test_alpha_complex.py
+++ b/src/cython/test/test_alpha_complex.py
@@ -42,7 +42,7 @@ def test_infinite_alpha():
     assert simplex_tree.num_simplices() == 11
     assert simplex_tree.num_vertices() == 4
  
-    assert simplex_tree.get_filtered_tree() == \
+    assert simplex_tree.get_filtration() == \
            [([0], 0.0), ([1], 0.0), ([2], 0.0), ([3], 0.0),
             ([0, 1], 0.25), ([0, 2], 0.25), ([1, 3], 0.25),
             ([2, 3], 0.25), ([1, 2], 0.5), ([0, 1, 2], 0.5),
@@ -76,7 +76,7 @@ def test_filtered_alpha():
     assert filtered_alpha.get_point(4) == []
     assert filtered_alpha.get_point(125) == []
 
-    assert simplex_tree.get_filtered_tree() == \
+    assert simplex_tree.get_filtration() == \
            [([0], 0.0), ([1], 0.0), ([2], 0.0), ([3], 0.0),
             ([0, 1], 0.25), ([0, 2], 0.25), ([1, 3], 0.25),
             ([2, 3], 0.25)]
diff --git a/src/cython/test/test_euclidean_witness_complex.py b/src/cython/test/test_euclidean_witness_complex.py
index 0947cc09..737f1ef4 100755
--- a/src/cython/test/test_euclidean_witness_complex.py
+++ b/src/cython/test/test_euclidean_witness_complex.py
@@ -42,7 +42,7 @@ def test_witness_complex():
     assert landmarks[1] == euclidean_witness_complex.get_point(1)
     assert landmarks[2] == euclidean_witness_complex.get_point(2)
 
-    assert simplex_tree.get_filtered_tree() == [([0], 0.0), ([1], 0.0),
+    assert simplex_tree.get_filtration() == [([0], 0.0), ([1], 0.0),
         ([0, 1], 0.0), ([2], 0.0), ([0, 2], 0.0), ([1, 2], 0.0),
         ([0, 1, 2], 0.0)]
 
@@ -61,11 +61,11 @@ def test_strong_witness_complex():
     assert landmarks[1] == euclidean_strong_witness_complex.get_point(1)
     assert landmarks[2] == euclidean_strong_witness_complex.get_point(2)
 
-    assert simplex_tree.get_filtered_tree() == [([0], 0.0), ([1], 0.0), ([2], 0.0)]
+    assert simplex_tree.get_filtration() == [([0], 0.0), ([1], 0.0), ([2], 0.0)]
 
     simplex_tree = euclidean_strong_witness_complex.create_simplex_tree(max_alpha_square=100.0)
 
-    assert simplex_tree.get_filtered_tree() == [([0], 0.0), ([1], 0.0),
+    assert simplex_tree.get_filtration() == [([0], 0.0), ([1], 0.0),
     ([2], 0.0), ([1, 2], 15.0), ([0, 2], 34.0), ([0, 1], 37.0),
     ([0, 1, 2], 37.0)]
 
diff --git a/src/cython/test/test_rips_complex.py b/src/cython/test/test_rips_complex.py
index 286a645b..c7d2ead4 100755
--- a/src/cython/test/test_rips_complex.py
+++ b/src/cython/test/test_rips_complex.py
@@ -44,7 +44,7 @@ def test_rips_from_points():
     assert simplex_tree.num_simplices() == 10
     assert simplex_tree.num_vertices() == 4
 
-    assert simplex_tree.get_filtered_tree() == \
+    assert simplex_tree.get_filtration() == \
            [([0], 0.0), ([1], 0.0), ([2], 0.0), ([3], 0.0),
             ([0, 1], 1.0), ([0, 2], 1.0), ([1, 3], 1.0),
             ([2, 3], 1.0), ([1, 2], 1.4142135623730951),
@@ -83,7 +83,7 @@ def test_rips_from_distance_matrix():
     assert simplex_tree.num_simplices() == 10
     assert simplex_tree.num_vertices() == 4
 
-    assert simplex_tree.get_filtered_tree() == \
+    assert simplex_tree.get_filtration() == \
            [([0], 0.0), ([1], 0.0), ([2], 0.0), ([3], 0.0),
             ([0, 1], 1.0), ([0, 2], 1.0), ([1, 3], 1.0),
             ([2, 3], 1.0), ([1, 2], 1.4142135623730951),
diff --git a/src/cython/test/test_simplex_tree.py b/src/cython/test/test_simplex_tree.py
index db61f84c..3ae537e3 100755
--- a/src/cython/test/test_simplex_tree.py
+++ b/src/cython/test/test_simplex_tree.py
@@ -55,7 +55,6 @@ def test_insertion():
     # filtration test
     st.set_filtration(5.0)
     st.initialize_filtration()
-    assert st.get_filtration() == 5.0
     assert st.filtration([0, 1, 2]) == 4.0
     assert st.filtration([0, 2]) == 4.0
     assert st.filtration([1, 2]) == 4.0
@@ -64,20 +63,20 @@ def test_insertion():
     assert st.filtration([0]) == 0.0
     assert st.filtration([1]) == 0.0
 
-    # skeleton_tree test
-    assert st.get_skeleton_tree(2) == \
+    # skeleton test
+    assert st.get_skeleton(2) == \
         [([0, 1, 2], 4.0), ([0, 1], 0.0), ([0, 2], 4.0),
         ([0], 0.0), ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)]
-    assert st.get_skeleton_tree(1) == \
+    assert st.get_skeleton(1) == \
         [([0, 1], 0.0), ([0, 2], 4.0), ([0], 0.0),
         ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)]
-    assert st.get_skeleton_tree(0) == \
+    assert st.get_skeleton(0) == \
         [([0], 0.0), ([1], 0.0), ([2], 4.0)]
 
     # remove_maximal_simplex test
     assert st.get_cofaces([0, 1, 2], 1) == []
     st.remove_maximal_simplex([0, 1, 2])
-    assert st.get_skeleton_tree(2) == \
+    assert st.get_skeleton(2) == \
         [([0, 1], 0.0), ([0, 2], 4.0), ([0], 0.0),
         ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)]
     assert st.find([0, 1, 2]) == False
@@ -116,7 +115,7 @@ def test_expansion():
 
     assert st.num_vertices() == 7
     assert st.num_simplices() == 17
-    assert st.get_filtered_tree() == [([2], 0.1), ([3], 0.1), ([2, 3], 0.1),
+    assert st.get_filtration() == [([2], 0.1), ([3], 0.1), ([2, 3], 0.1),
     ([0], 0.2), ([0, 2], 0.2), ([1], 0.3), ([0, 1], 0.3), ([1, 3], 0.4),
     ([1, 2], 0.5), ([5], 0.6), ([6], 0.6), ([5, 6], 0.6), ([4], 0.7),
     ([2, 4], 0.7), ([0, 3], 0.8), ([4, 6], 0.9), ([3, 6], 1.0)]
@@ -126,7 +125,7 @@ def test_expansion():
     assert st.num_simplices() == 22
     st.initialize_filtration()
 
-    assert st.get_filtered_tree() == [([2], 0.1), ([3], 0.1), ([2, 3], 0.1),
+    assert st.get_filtration() == [([2], 0.1), ([3], 0.1), ([2, 3], 0.1),
     ([0], 0.2), ([0, 2], 0.2), ([1], 0.3), ([0, 1], 0.3), ([1, 3], 0.4),
     ([1, 2], 0.5), ([0, 1, 2], 0.5), ([1, 2, 3], 0.5), ([5], 0.6), ([6], 0.6),
     ([5, 6], 0.6), ([4], 0.7), ([2, 4], 0.7), ([0, 3], 0.8), ([0, 1, 3], 0.8),
diff --git a/src/cython/test/test_tangential_complex.py b/src/cython/test/test_tangential_complex.py
index c191baa4..8aa4023c 100755
--- a/src/cython/test/test_tangential_complex.py
+++ b/src/cython/test/test_tangential_complex.py
@@ -40,7 +40,7 @@ def test_tangential():
     assert st.num_simplices() == 6
     assert st.num_vertices() == 4
  
-    assert st.get_filtered_tree() == \
+    assert st.get_filtration() == \
         [([0], 0.0), ([1], 0.0), ([2], 0.0), ([0, 2], 0.0), ([3], 0.0), ([1, 3], 0.0)]
     assert st.get_cofaces([0], 1) == [([0, 2], 0.0)]