diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-05-25 09:42:09 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-05-25 09:42:09 +0000 |
commit | a232e35a50e02fc479509e8fda45c16da5032740 (patch) | |
tree | ab06ab95d32d2a0974003ac885073085fc563e07 /src/cython/test | |
parent | d101d16e7ebc4614389bbbf162133b27207f2cf4 (diff) |
PEP8 conformity
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1195 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8d2e24e07694508853feb677e5fd2294a663a2d5
Diffstat (limited to 'src/cython/test')
-rwxr-xr-x | src/cython/test/Alpha_complex_UT.py | 86 | ||||
-rwxr-xr-x | src/cython/test/Mini_simplex_tree_UT.py | 36 | ||||
-rwxr-xr-x | src/cython/test/Rips_complex_UT.py | 35 | ||||
-rwxr-xr-x | src/cython/test/Simplex_tree_UT.py | 106 |
4 files changed, 149 insertions, 114 deletions
diff --git a/src/cython/test/Alpha_complex_UT.py b/src/cython/test/Alpha_complex_UT.py index 96331991..c14c43e2 100755 --- a/src/cython/test/Alpha_complex_UT.py +++ b/src/cython/test/Alpha_complex_UT.py @@ -2,43 +2,57 @@ 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)) +class TestAlphaComplex(unittest.TestCase): - 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)]) + 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 + unittest.main() diff --git a/src/cython/test/Mini_simplex_tree_UT.py b/src/cython/test/Mini_simplex_tree_UT.py index 0d2ce3c3..8f2f56df 100755 --- a/src/cython/test/Mini_simplex_tree_UT.py +++ b/src/cython/test/Mini_simplex_tree_UT.py @@ -2,26 +2,28 @@ import unittest import gudhi + class TestMiniSimplexTree(unittest.TestCase): - def test_mini(self): - triangle012 = [0,1,2] - edge03 = [0,3] - mini_st = gudhi.MiniSimplexTree() - self.assertTrue(mini_st.insert(triangle012)) - self.assertTrue(mini_st.insert(edge03)) - # FIXME: Remove this line - mini_st.set_dimension(2); + def test_mini(self): + triangle012 = [0, 1, 2] + edge03 = [0, 3] + mini_st = gudhi.MiniSimplexTree() + self.assertTrue(mini_st.insert(triangle012)) + self.assertTrue(mini_st.insert(edge03)) + # FIXME: Remove this line + mini_st.set_dimension(2) - edge02 = [0,2] - self.assertTrue(mini_st.find(edge02)) - self.assertEqual(mini_st.get_coface_tree(edge02, 1), [([0, 1, 2], 0.0)]) + edge02 = [0, 2] + self.assertTrue(mini_st.find(edge02)) + self.assertEqual(mini_st.get_coface_tree(edge02, 1), + [([0, 1, 2], 0.0)]) - # remove_maximal_simplex test - self.assertEqual(mini_st.get_coface_tree(triangle012, 1), []) - mini_st.remove_maximal_simplex(triangle012) - self.assertTrue(mini_st.find(edge02)) - self.assertFalse(mini_st.find(triangle012)) + # remove_maximal_simplex test + self.assertEqual(mini_st.get_coface_tree(triangle012, 1), []) + mini_st.remove_maximal_simplex(triangle012) + self.assertTrue(mini_st.find(edge02)) + self.assertFalse(mini_st.find(triangle012)) if __name__ == '__main__': - unittest.main()
\ No newline at end of file + unittest.main() diff --git a/src/cython/test/Rips_complex_UT.py b/src/cython/test/Rips_complex_UT.py index d27e180c..ccff5c2d 100755 --- a/src/cython/test/Rips_complex_UT.py +++ b/src/cython/test/Rips_complex_UT.py @@ -2,23 +2,34 @@ 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) + 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.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)]) + 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) + 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) + 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 + unittest.main() diff --git a/src/cython/test/Simplex_tree_UT.py b/src/cython/test/Simplex_tree_UT.py index b3ded581..392c6d71 100755 --- a/src/cython/test/Simplex_tree_UT.py +++ b/src/cython/test/Simplex_tree_UT.py @@ -2,56 +2,64 @@ import unittest import gudhi + class TestSimplexTree(unittest.TestCase): - def test_insertion(self): - st = gudhi.SimplexTree() - - # insert test - self.assertTrue(st.insert([0,1])) - self.assertTrue(st.insert([0,1,2], filtration=4.0)) - self.assertEqual(st.num_simplices(), 7) - self.assertEqual(st.num_vertices(), 3) - - # find test - self.assertTrue(st.find([0,1,2])) - self.assertTrue(st.find([0,1])) - self.assertTrue(st.find([0,2])) - self.assertTrue(st.find([0])) - self.assertTrue(st.find([1])) - self.assertTrue(st.find([2])) - self.assertFalse(st.find([3])) - self.assertFalse(st.find([0,3])) - self.assertFalse(st.find([1,3])) - self.assertFalse(st.find([2,3])) - - # filtration test - st.set_filtration(5.0) - st.initialize_filtration() - self.assertEqual(st.get_filtration(), 5.0) - self.assertEqual(st.filtration([0,1,2]), 4.0) - self.assertEqual(st.filtration([0,2]), 4.0) - self.assertEqual(st.filtration([1,2]), 4.0) - self.assertEqual(st.filtration([2]), 4.0) - self.assertEqual(st.filtration([0,1]), 0.0) - self.assertEqual(st.filtration([0]), 0.0) - self.assertEqual(st.filtration([1]), 0.0) - - # skeleton_tree test - self.assertEqual(st.get_skeleton_tree(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)]) - self.assertEqual(st.get_skeleton_tree(1), [([0, 1], 0.0), ([0, 2], 4.0), ([0], 0.0), ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)]) - self.assertEqual(st.get_skeleton_tree(0), [([0], 0.0), ([1], 0.0), ([2], 4.0)]) - - # remove_maximal_simplex test - self.assertEqual(st.get_coface_tree([0,1,2], 1), []) - st.remove_maximal_simplex([0,1,2]) - self.assertEqual(st.get_skeleton_tree(2), [([0, 1], 0.0), ([0, 2], 4.0), ([0], 0.0), ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)]) - self.assertFalse(st.find([0,1,2])) - self.assertTrue(st.find([0,1])) - self.assertTrue(st.find([0,2])) - self.assertTrue(st.find([0])) - self.assertTrue(st.find([1])) - self.assertTrue(st.find([2])) + def test_insertion(self): + st = gudhi.SimplexTree() + + # insert test + self.assertTrue(st.insert([0, 1])) + self.assertTrue(st.insert([0, 1, 2], filtration=4.0)) + self.assertEqual(st.num_simplices(), 7) + self.assertEqual(st.num_vertices(), 3) + + # find test + self.assertTrue(st.find([0, 1, 2])) + self.assertTrue(st.find([0, 1])) + self.assertTrue(st.find([0, 2])) + self.assertTrue(st.find([0])) + self.assertTrue(st.find([1])) + self.assertTrue(st.find([2])) + self.assertFalse(st.find([3])) + self.assertFalse(st.find([0, 3])) + self.assertFalse(st.find([1, 3])) + self.assertFalse(st.find([2, 3])) + + # filtration test + st.set_filtration(5.0) + st.initialize_filtration() + self.assertEqual(st.get_filtration(), 5.0) + self.assertEqual(st.filtration([0, 1, 2]), 4.0) + self.assertEqual(st.filtration([0, 2]), 4.0) + self.assertEqual(st.filtration([1, 2]), 4.0) + self.assertEqual(st.filtration([2]), 4.0) + self.assertEqual(st.filtration([0, 1]), 0.0) + self.assertEqual(st.filtration([0]), 0.0) + self.assertEqual(st.filtration([1]), 0.0) + + # skeleton_tree test + self.assertEqual(st.get_skeleton_tree(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)]) + self.assertEqual(st.get_skeleton_tree(1), + [([0, 1], 0.0), ([0, 2], 4.0), ([0], 0.0), + ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)]) + self.assertEqual(st.get_skeleton_tree(0), + [([0], 0.0), ([1], 0.0), ([2], 4.0)]) + + # remove_maximal_simplex test + self.assertEqual(st.get_coface_tree([0, 1, 2], 1), []) + st.remove_maximal_simplex([0, 1, 2]) + self.assertEqual(st.get_skeleton_tree(2), + [([0, 1], 0.0), ([0, 2], 4.0), ([0], 0.0), + ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)]) + self.assertFalse(st.find([0, 1, 2])) + self.assertTrue(st.find([0, 1])) + self.assertTrue(st.find([0, 2])) + self.assertTrue(st.find([0])) + self.assertTrue(st.find([1])) + self.assertTrue(st.find([2])) if __name__ == '__main__': - unittest.main()
\ No newline at end of file + unittest.main() |