Fix rips complex with the new interface

Remove mini simplex tree
Fix persistent cohomology doc - only simplex tree used
Remove useless type definition in Cython C++ interfaces


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

Former-commit-id: fff43192b00df1c70d59109a6c14932013992ff1

2 files changed, 19 insertions, 66 deletions

diff --git a/src/cython/test/test_mini_simplex_tree.py b/src/cython/test/test_mini_simplex_tree.py
deleted file mode 100755
index e44bfdbc..00000000
--- a/src/cython/test/test_mini_simplex_tree.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from gudhi import MiniSimplexTree
-
-"""This file is part of the Gudhi Library. The Gudhi library
-   (Geometric Understanding in Higher Dimensions) is a generic C++
-   library for computational topology.
-
-   Author(s):       Vincent Rouvreau
-
-   Copyright (C) 2016 INRIA
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-__author__ = "Vincent Rouvreau"
-__copyright__ = "Copyright (C) 2016 INRIA"
-__license__ = "GPL v3"
-
-
-def test_mini():
-    triangle012 = [0, 1, 2]
-    edge03 = [0, 3]
-    mini_st = MiniSimplexTree()
-    assert mini_st.__is_defined() == True
-    assert mini_st.__is_persistence_defined() == False
-    assert mini_st.insert(triangle012) == True
-    assert mini_st.insert(edge03) == True
-    # FIXME: Remove this line
-    mini_st.set_dimension(2)
-
-    edge02 = [0, 2]
-    assert mini_st.find(edge02) == True
-    assert mini_st.get_coface_tree(edge02, 1) == \
-            [([0, 1, 2], 0.0)]
-
-    # remove_maximal_simplex test
-    assert mini_st.get_coface_tree(triangle012, 1) == []
-    mini_st.remove_maximal_simplex(triangle012)
-    assert mini_st.find(edge02) == True
-    assert mini_st.find(triangle012) == False
diff --git a/src/cython/test/test_rips_complex.py b/src/cython/test/test_rips_complex.py
index 877289cf..687e8529 100755
--- a/src/cython/test/test_rips_complex.py
+++ b/src/cython/test/test_rips_complex.py
@@ -30,36 +30,39 @@ __license__ = "GPL v3"
 def test_empty_rips():
     rips_complex = RipsComplex()
     assert rips_complex.__is_defined() == True
-    assert rips_complex.__is_persistence_defined() == False
 
 def test_rips():
     point_list = [[0, 0], [1, 0], [0, 1], [1, 1]]
-    rips_complex = RipsComplex(points=point_list, max_dimension=1,
-                               max_edge_length=42)
-    assert rips_complex.__is_defined() == True
-    assert rips_complex.__is_persistence_defined() == False
+    rips_complex = RipsComplex(points=point_list, max_edge_length=42)
+
+    simplex_tree = rips_complex.create_simplex_tree(max_dimension=1)
+
+    assert simplex_tree.__is_defined() == True
+    assert simplex_tree.__is_persistence_defined() == False
 
-    assert rips_complex.num_simplices() == 10
-    assert rips_complex.num_vertices() == 4
+    assert simplex_tree.num_simplices() == 10
+    assert simplex_tree.num_vertices() == 4
 
-    assert rips_complex.get_filtered_tree() == \
+    assert simplex_tree.get_filtered_tree() == \
            [([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),
             ([0, 3], 1.4142135623730951)]
-    assert rips_complex.get_star_tree([0]) == \
+    assert simplex_tree.get_star_tree([0]) == \
            [([0], 0.0), ([0, 1], 1.0), ([0, 2], 1.0),
             ([0, 3], 1.4142135623730951)]
-    assert rips_complex.get_coface_tree([0], 1) == \
+    assert simplex_tree.get_coface_tree([0], 1) == \
            [([0, 1], 1.0), ([0, 2], 1.0),
             ([0, 3], 1.4142135623730951)]
 
 def test_filtered_rips():
     point_list = [[0, 0], [1, 0], [0, 1], [1, 1]]
-    filtered_rips = RipsComplex(points=point_list, max_dimension=1,
-                                      max_edge_length=1.0)
-    assert filtered_rips.__is_defined() == True
-    assert filtered_rips.__is_persistence_defined() == False
+    filtered_rips = RipsComplex(points=point_list, max_edge_length=1.0)
+
+    simplex_tree = filtered_rips.create_simplex_tree(max_dimension=1)
+
+    assert simplex_tree.__is_defined() == True
+    assert simplex_tree.__is_persistence_defined() == False
 
-    assert filtered_rips.num_simplices() == 8
-    assert filtered_rips.num_vertices() == 4
+    assert simplex_tree.num_simplices() == 8
+    assert simplex_tree.num_vertices() == 4