Separate Rips_complex from Simplex_tree

Add Alpha_complex_UT


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

Former-commit-id: ae209f9e070dd3e27c8eb93f0a1edf2842e9c561

3 files changed, 68 insertions, 14 deletions

diff --git a/src/cython/test/Alpha_complex_UT.py b/src/cython/test/Alpha_complex_UT.py
new file mode 100755
index 00000000..96331991
--- /dev/null
+++ b/src/cython/test/Alpha_complex_UT.py
@@ -0,0 +1,44 @@
+import unittest
+
+import gudhi
+
+class TestAlphaComplex(unittest.TestCase):
+
+  def test_infinite_alpha(self):
+    point_list=[[0,0],[1,0],[0,1],[1,1]]
+    alpha_complex = gudhi.AlphaComplex(points=point_list)
+
+    self.assertEqual(alpha_complex.num_simplices(), 11)
+    self.assertEqual(alpha_complex.num_vertices(), 4)
+
+    self.assertEqual(alpha_complex.get_filtered_tree(), [([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), ([1, 2, 3], 0.5)])
+    self.assertEqual(alpha_complex.get_star_tree([0]), [([0], 0.0), ([0, 1], 0.25), ([0, 1, 2], 0.5), ([0, 2], 0.25)])
+    self.assertEqual(alpha_complex.get_coface_tree([0], 1), [([0, 1], 0.25), ([0, 2], 0.25)])
+
+    self.assertEqual(point_list[0], alpha_complex.get_point(0))
+    self.assertEqual(point_list[1], alpha_complex.get_point(1))
+    self.assertEqual(point_list[2], alpha_complex.get_point(2))
+    self.assertEqual(point_list[3], alpha_complex.get_point(3))
+    self.assertEqual([], alpha_complex.get_point(4))
+    self.assertEqual([], alpha_complex.get_point(125))
+
+  def test_filtered_alpha(self):
+    point_list=[[0,0],[1,0],[0,1],[1,1]]
+    filtered_alpha = gudhi.AlphaComplex(points=point_list,max_alpha_square=0.25)
+
+    self.assertEqual(filtered_alpha.num_simplices(), 8)
+    self.assertEqual(filtered_alpha.num_vertices(), 4)
+
+    self.assertEqual(point_list[0], filtered_alpha.get_point(0))
+    self.assertEqual(point_list[1], filtered_alpha.get_point(1))
+    self.assertEqual(point_list[2], filtered_alpha.get_point(2))
+    self.assertEqual(point_list[3], filtered_alpha.get_point(3))
+    self.assertEqual([], filtered_alpha.get_point(4))
+    self.assertEqual([], filtered_alpha.get_point(125))
+
+    self.assertEqual(filtered_alpha.get_filtered_tree(), [([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)])
+    self.assertEqual(filtered_alpha.get_star_tree([0]), [([0], 0.0), ([0, 1], 0.25), ([0, 2], 0.25)])
+    self.assertEqual(filtered_alpha.get_coface_tree([0], 1), [([0, 1], 0.25), ([0, 2], 0.25)])
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/src/cython/test/Rips_complex_UT.py b/src/cython/test/Rips_complex_UT.py
new file mode 100755
index 00000000..d27e180c
--- /dev/null
+++ b/src/cython/test/Rips_complex_UT.py
@@ -0,0 +1,24 @@
+import unittest
+
+import gudhi
+
+class TestRipsComplex(unittest.TestCase):
+
+  def test_rips(self):
+    point_list=[[0,0],[1,0],[0,1],[1,1]]
+    rips_complex = gudhi.RipsComplex(points=point_list,max_dimension=1,max_edge_length=42)
+
+    self.assertEqual(rips_complex.num_simplices(), 10)
+    self.assertEqual(rips_complex.num_vertices(), 4)
+
+    self.assertEqual(rips_complex.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)])
+    self.assertEqual(rips_complex.get_star_tree([0]), [([0], 0.0), ([0, 1], 1.0), ([0, 2], 1.0), ([0, 3], 1.4142135623730951)])
+    self.assertEqual(rips_complex.get_coface_tree([0], 1), [([0, 1], 1.0), ([0, 2], 1.0), ([0, 3], 1.4142135623730951)])
+
+    filtered_rips = gudhi.RipsComplex(points=point_list,max_dimension=1,max_edge_length=1.0)
+
+    self.assertEqual(filtered_rips.num_simplices(), 8)
+    self.assertEqual(filtered_rips.num_vertices(), 4)
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/src/cython/test/Simplex_tree_UT.py b/src/cython/test/Simplex_tree_UT.py
index 9a62e009..050ef289 100755
--- a/src/cython/test/Simplex_tree_UT.py
+++ b/src/cython/test/Simplex_tree_UT.py
@@ -53,20 +53,6 @@ class TestSimplexTree(unittest.TestCase):
     self.assertTrue(st.find([1]))
     self.assertTrue(st.find([2]))
 
-  def test_rips(self):
-    rips_complex = gudhi.SimplexTree(points=[[0,0],[1,0],[0,1],[1,1]],max_dimension=1,max_edge_length=42)
-
-    self.assertEqual(rips_complex.num_simplices(), 10)
-    self.assertEqual(rips_complex.num_vertices(), 4)
-
-    self.assertEqual(rips_complex.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)])
-    self.assertEqual(rips_complex.get_star_tree([0]), [([0], 0.0), ([0, 1], 1.0), ([0, 2], 1.0), ([0, 3], 1.4142135623730951)])
-    self.assertEqual(rips_complex.get_coface_tree([0], 1), [([0, 1], 1.0), ([0, 2], 1.0), ([0, 3], 1.4142135623730951)])
-
-    filtered_rips = gudhi.SimplexTree(points=[[0,0],[1,0],[0,1],[1,1]],max_dimension=1,max_edge_length=1.0)
-    self.assertEqual(filtered_rips.num_simplices(), 8)
-    self.assertEqual(filtered_rips.num_vertices(), 4)
-
   def test_mini(self):
     triangle012 = [0,1,2]
     edge03 = [0,3]