diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-22 07:39:11 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-22 07:39:11 +0000 |
commit | 3ffe80a4d17b59422dab18b0898e3f9ca4131672 (patch) | |
tree | e498dbd3bc433141ead2496e8007cfc502d7cf07 /src/cython/test | |
parent | cd0f1b7513be17bfca4de6ea4744a3d931694a8f (diff) |
Interface insert_simplex and insert_simplex_and_subfaces in SimplexTree
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2217 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1e426a8cbcba192a50b05b5cc7fa4a0fd50d8c9b
Diffstat (limited to 'src/cython/test')
-rwxr-xr-x | src/cython/test/test_simplex_tree.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/cython/test/test_simplex_tree.py b/src/cython/test/test_simplex_tree.py index db61f84c..af5b639a 100755 --- a/src/cython/test/test_simplex_tree.py +++ b/src/cython/test/test_simplex_tree.py @@ -33,8 +33,8 @@ def test_insertion(): assert st.__is_persistence_defined() == False # insert test - assert st.insert([0, 1]) == True - assert st.insert([0, 1, 2], filtration=4.0) == True + assert st.insert_simplex([0, 1]) == True + assert st.insert_simplex_and_subfaces([0, 1, 2], filtration=4.0) == True # FIXME: Remove this line st.set_dimension(2) assert st.num_simplices() == 7 @@ -62,24 +62,24 @@ def test_insertion(): assert st.filtration([2]) == 4.0 assert st.filtration([0, 1]) == 0.0 assert st.filtration([0]) == 0.0 - assert st.filtration([1]) == 0.0 + assert st.filtration([1]) == 4.0 # skeleton_tree test assert 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)] + ([0], 0.0), ([1, 2], 4.0), ([1], 4.0), ([2], 4.0)] assert 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)] + ([1, 2], 4.0), ([1], 4.0), ([2], 4.0)] assert st.get_skeleton_tree(0) == \ - [([0], 0.0), ([1], 0.0), ([2], 4.0)] + [([0], 0.0), ([1], 4.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) == \ [([0, 1], 0.0), ([0, 2], 4.0), ([0], 0.0), - ([1, 2], 4.0), ([1], 0.0), ([2], 4.0)] + ([1, 2], 4.0), ([1], 4.0), ([2], 4.0)] assert st.find([0, 1, 2]) == False assert st.find([0, 1]) == True assert st.find([0, 2]) == True @@ -103,16 +103,16 @@ def test_expansion(): assert st.__is_persistence_defined() == False # insert test - assert st.insert([3, 2], 0.1) == True - assert st.insert([2, 0], 0.2) == True - assert st.insert([1, 0], 0.3) == True - assert st.insert([3, 1], 0.4) == True - assert st.insert([2, 1], 0.5) == True - assert st.insert([6, 5], 0.6) == True - assert st.insert([4, 2], 0.7) == True - assert st.insert([3, 0], 0.8) == True - assert st.insert([6, 4], 0.9) == True - assert st.insert([6, 3], 1.0) == True + assert st.insert_simplex_and_subfaces([3, 2], 0.1) == True + assert st.insert_simplex_and_subfaces([2, 0], 0.2) == True + assert st.insert_simplex_and_subfaces([1, 0], 0.3) == True + assert st.insert_simplex_and_subfaces([3, 1], 0.4) == True + assert st.insert_simplex_and_subfaces([2, 1], 0.5) == True + assert st.insert_simplex_and_subfaces([6, 5], 0.6) == True + assert st.insert_simplex_and_subfaces([4, 2], 0.7) == True + assert st.insert_simplex_and_subfaces([3, 0], 0.8) == True + assert st.insert_simplex_and_subfaces([6, 4], 0.9) == True + assert st.insert_simplex_and_subfaces([6, 3], 1.0) == True assert st.num_vertices() == 7 assert st.num_simplices() == 17 |