Separate Mini_simplex_tree from Simplex_tree

persistence function for everybody


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

Former-commit-id: db3a6446593acd319d15315f63eb9568447db9da

4 files changed, 50 insertions, 21 deletions

diff --git a/src/cython/example/Alpha_complex_example.py b/src/cython/example/Alpha_complex_example.py
index da55bfd4..cf5eed55 100755
--- a/src/cython/example/Alpha_complex_example.py
+++ b/src/cython/example/Alpha_complex_example.py
@@ -39,4 +39,7 @@ print("coface([0],1)=", alpha_complex.get_coface_tree([0], 1))
 print("point[0]=", alpha_complex.get_point(0))
 print("point[5]=", alpha_complex.get_point(5))
 
+alpha_complex.initialize_filtration()
+print("persistence(2)=", alpha_complex.persistence(2))
+
 print("#######################################################################")
diff --git a/src/cython/example/Mini_simplex_tree_example.py b/src/cython/example/Mini_simplex_tree_example.py
new file mode 100755
index 00000000..87407317
--- /dev/null
+++ b/src/cython/example/Mini_simplex_tree_example.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+import gudhi
+
+print("#######################################################################")
+print("MiniSimplexTree creation from insertion")
+
+""" Complex to build.
+     1   3
+     o---o
+    /X\ /
+   o---o   o
+   2   0   4 """
+
+triangle012 = [0, 1, 2]
+edge03 = [0, 3]
+edge13 = [1, 3]
+vertex4 = [4]
+mini_st = gudhi.MiniSimplexTree()
+mini_st.insert(triangle012)
+mini_st.insert(edge03)
+mini_st.insert(edge13)
+mini_st.insert(vertex4)
+
+# FIXME: Remove this line
+mini_st.set_dimension(2);
+
+# initialize_filtration required before plain_homology
+mini_st.initialize_filtration()
+
+print("plain_homology(2)=", mini_st.plain_homology(2))
+
+edge02 = [0, 2]
+if mini_st.find(edge02):
+  # Only coface is 012
+  print("coface(edge02,1)=", mini_st.get_coface_tree(edge02, 1))
+
+if mini_st.get_coface_tree(triangle012, 1) == []:
+  # Precondition: Check the simplex has no coface before removing it.
+  mini_st.remove_maximal_simplex(triangle012)
+
+# initialize_filtration required after removing
+mini_st.initialize_filtration()
+
+print("filtered_tree after triangle012 removal =", mini_st.get_filtered_tree())
diff --git a/src/cython/example/Rips_complex_example.py b/src/cython/example/Rips_complex_example.py
index 0e8a0968..4713b62b 100755
--- a/src/cython/example/Rips_complex_example.py
+++ b/src/cython/example/Rips_complex_example.py
@@ -9,3 +9,5 @@ rips = gudhi.RipsComplex(points=[[0,0],[1,0],[0,1],[1,1]],max_dimension=1,max_ed
 print("filtered_tree=", rips.get_filtered_tree())
 print("star([0])=", rips.get_star_tree([0]))
 print("coface([0],1)=", rips.get_coface_tree([0], 1))
+
+print("persistence(2)=", rips.persistence(2))
diff --git a/src/cython/example/Simplex_tree_example.py b/src/cython/example/Simplex_tree_example.py
index 90a4a433..fa40fbe6 100755
--- a/src/cython/example/Simplex_tree_example.py
+++ b/src/cython/example/Simplex_tree_example.py
@@ -39,24 +39,3 @@ print("skeleton_tree[1]=", st.get_skeleton_tree(1))
 print("skeleton_tree[0]=", st.get_skeleton_tree(0))
 
 print("persistence(2)=", st.persistence(2))
-
-print("#######################################################################")
-print("MiniSimplexTree creation from insertion")
-triangle012 = [0, 1, 2]
-edge03 = [0, 3]
-mini_st = gudhi.MiniSimplexTree()
-mini_st.insert(triangle012)
-mini_st.insert(edge03)
-# FIXME: Remove this line
-mini_st.set_dimension(2);
-
-edge02 = [0, 2]
-if mini_st.find(edge02):
-  # Only coface is 012
-  print("coface(edge02,1)=", mini_st.get_coface_tree(edge02, 1))
-
-if mini_st.get_coface_tree(triangle012, 1) == []:
-  # Precondition: Check the simplex has no coface before removing it.
-  mini_st.remove_maximal_simplex(triangle012)
-
-print("filtered_tree after triangle012 removal =", mini_st.get_filtered_tree())