summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-03-20 16:42:26 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-03-20 16:42:26 +0000
commit4d96411e43ddcf6c1bd47f6cc0df7c542b127e2e (patch)
tree48711329b3d93f287f46a45a9370203f8a6cc5a3 /src
parent33e5406c0f1b6a74ac8a3246cdb72ae879bb4339 (diff)
rename get_coface_tree with get_cofaces
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2210 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c88576269982d87dd2dfd4003811628fee58dc2e
Diffstat (limited to 'src')
-rw-r--r--src/cython/cython/simplex_tree.pyx6
-rwxr-xr-xsrc/cython/example/alpha_complex_from_points_example.py2
-rwxr-xr-xsrc/cython/example/rips_complex_from_points_example.py2
-rw-r--r--src/cython/include/Simplex_tree_interface.h2
-rwxr-xr-xsrc/cython/test/test_alpha_complex.py4
-rwxr-xr-xsrc/cython/test/test_rips_complex.py4
-rwxr-xr-xsrc/cython/test/test_simplex_tree.py2
-rwxr-xr-xsrc/cython/test/test_tangential_complex.py2
8 files changed, 12 insertions, 12 deletions
diff --git a/src/cython/cython/simplex_tree.pyx b/src/cython/cython/simplex_tree.pyx
index c0016461..05410a08 100644
--- a/src/cython/cython/simplex_tree.pyx
+++ b/src/cython/cython/simplex_tree.pyx
@@ -49,7 +49,7 @@ cdef extern from "Simplex_tree_interface.h" namespace "Gudhi":
vector[pair[vector[int], double]] get_filtered_tree()
vector[pair[vector[int], double]] get_skeleton_tree(int dimension)
vector[pair[vector[int], double]] get_star_tree(vector[int] simplex)
- vector[pair[vector[int], double]] get_coface_tree(vector[int] simplex,
+ vector[pair[vector[int], double]] get_cofaces(vector[int] simplex,
int dimension)
void remove_maximal_simplex(vector[int] simplex)
@@ -263,7 +263,7 @@ cdef class SimplexTree:
ct.append((v, filtered_complex.second))
return ct
- def get_coface_tree(self, simplex, codimension):
+ def get_cofaces(self, simplex, codimension):
"""This function returns the coface tree of a given N-simplex with a
given codimension.
@@ -279,7 +279,7 @@ cdef class SimplexTree:
for i in simplex:
complex.push_back(i)
cdef vector[pair[vector[int], double]] coface_tree \
- = self.thisptr.get_coface_tree(complex, <int>codimension)
+ = self.thisptr.get_cofaces(complex, <int>codimension)
ct = []
for filtered_complex in coface_tree:
v = []
diff --git a/src/cython/example/alpha_complex_from_points_example.py b/src/cython/example/alpha_complex_from_points_example.py
index ae21c711..d14ff360 100755
--- a/src/cython/example/alpha_complex_from_points_example.py
+++ b/src/cython/example/alpha_complex_from_points_example.py
@@ -61,7 +61,7 @@ else:
print("dimension=", simplex_tree.dimension())
print("filtered_tree=", simplex_tree.get_filtered_tree())
print("star([0])=", simplex_tree.get_star_tree([0]))
-print("coface([0], 1)=", simplex_tree.get_coface_tree([0], 1))
+print("coface([0], 1)=", simplex_tree.get_cofaces([0], 1))
print("point[0]=", alpha_complex.get_point(0))
print("point[5]=", alpha_complex.get_point(5))
diff --git a/src/cython/example/rips_complex_from_points_example.py b/src/cython/example/rips_complex_from_points_example.py
index df6252cd..97cd572e 100755
--- a/src/cython/example/rips_complex_from_points_example.py
+++ b/src/cython/example/rips_complex_from_points_example.py
@@ -37,4 +37,4 @@ simplex_tree = rips.create_simplex_tree(max_dimension=1)
print("filtered_tree=", simplex_tree.get_filtered_tree())
print("star([0])=", simplex_tree.get_star_tree([0]))
-print("coface([0], 1)=", simplex_tree.get_coface_tree([0], 1))
+print("coface([0], 1)=", simplex_tree.get_cofaces([0], 1))
diff --git a/src/cython/include/Simplex_tree_interface.h b/src/cython/include/Simplex_tree_interface.h
index 65a9e6fc..b88aa539 100644
--- a/src/cython/include/Simplex_tree_interface.h
+++ b/src/cython/include/Simplex_tree_interface.h
@@ -113,7 +113,7 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> {
return star_tree;
}
- Complex_tree get_coface_tree(const Simplex& complex, int dimension) {
+ Complex_tree get_cofaces(const Simplex& complex, int dimension) {
Complex_tree coface_tree;
for (auto f_simplex : Base::cofaces_simplex_range(Base::find(complex), dimension)) {
Simplex simplex;
diff --git a/src/cython/test/test_alpha_complex.py b/src/cython/test/test_alpha_complex.py
index b08ac0d7..486efaf9 100755
--- a/src/cython/test/test_alpha_complex.py
+++ b/src/cython/test/test_alpha_complex.py
@@ -50,7 +50,7 @@ def test_infinite_alpha():
assert simplex_tree.get_star_tree([0]) == \
[([0], 0.0), ([0, 1], 0.25), ([0, 1, 2], 0.5),
([0, 2], 0.25)]
- assert simplex_tree.get_coface_tree([0], 1) == \
+ assert simplex_tree.get_cofaces([0], 1) == \
[([0, 1], 0.25), ([0, 2], 0.25)]
assert point_list[0] == alpha_complex.get_point(0)
@@ -82,5 +82,5 @@ def test_filtered_alpha():
([2, 3], 0.25)]
assert simplex_tree.get_star_tree([0]) == \
[([0], 0.0), ([0, 1], 0.25), ([0, 2], 0.25)]
- assert simplex_tree.get_coface_tree([0], 1) == \
+ assert simplex_tree.get_cofaces([0], 1) == \
[([0, 1], 0.25), ([0, 2], 0.25)]
diff --git a/src/cython/test/test_rips_complex.py b/src/cython/test/test_rips_complex.py
index 464c69e5..78de7f72 100755
--- a/src/cython/test/test_rips_complex.py
+++ b/src/cython/test/test_rips_complex.py
@@ -52,7 +52,7 @@ def test_rips_from_points():
assert simplex_tree.get_star_tree([0]) == \
[([0], 0.0), ([0, 1], 1.0), ([0, 2], 1.0),
([0, 3], 1.4142135623730951)]
- assert simplex_tree.get_coface_tree([0], 1) == \
+ assert simplex_tree.get_cofaces([0], 1) == \
[([0, 1], 1.0), ([0, 2], 1.0),
([0, 3], 1.4142135623730951)]
@@ -91,7 +91,7 @@ def test_rips_from_distance_matrix():
assert simplex_tree.get_star_tree([0]) == \
[([0], 0.0), ([0, 1], 1.0), ([0, 2], 1.0),
([0, 3], 1.4142135623730951)]
- assert simplex_tree.get_coface_tree([0], 1) == \
+ assert simplex_tree.get_cofaces([0], 1) == \
[([0, 1], 1.0), ([0, 2], 1.0),
([0, 3], 1.4142135623730951)]
diff --git a/src/cython/test/test_simplex_tree.py b/src/cython/test/test_simplex_tree.py
index 0b9899f8..7466bf1d 100755
--- a/src/cython/test/test_simplex_tree.py
+++ b/src/cython/test/test_simplex_tree.py
@@ -75,7 +75,7 @@ def test_insertion():
[([0], 0.0), ([1], 0.0), ([2], 4.0)]
# remove_maximal_simplex test
- assert st.get_coface_tree([0, 1, 2], 1) == []
+ 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),
diff --git a/src/cython/test/test_tangential_complex.py b/src/cython/test/test_tangential_complex.py
index 429fc0d0..c191baa4 100755
--- a/src/cython/test/test_tangential_complex.py
+++ b/src/cython/test/test_tangential_complex.py
@@ -42,7 +42,7 @@ def test_tangential():
assert st.get_filtered_tree() == \
[([0], 0.0), ([1], 0.0), ([2], 0.0), ([0, 2], 0.0), ([3], 0.0), ([1, 3], 0.0)]
- assert st.get_coface_tree([0], 1) == [([0, 2], 0.0)]
+ assert st.get_cofaces([0], 1) == [([0, 2], 0.0)]
assert point_list[0] == tc.get_point(0)
assert point_list[1] == tc.get_point(1)