From 3c96720c786462827820f4d35e720c8f2084867b Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 5 Sep 2019 12:54:57 +0200 Subject: Reduce number of code line --- src/cython/gudhi/alpha_complex.pyx | 3 +-- src/cython/gudhi/euclidean_strong_witness_complex.pyx | 7 ++++--- src/cython/gudhi/euclidean_witness_complex.pyx | 7 ++++--- src/cython/gudhi/nerve_gic.pyx | 3 +-- src/cython/gudhi/rips_complex.pyx | 5 +++-- src/cython/gudhi/strong_witness_complex.pyx | 6 +++--- src/cython/gudhi/tangential_complex.pyx | 3 +-- src/cython/gudhi/witness_complex.pyx | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/cython/gudhi/alpha_complex.pyx b/src/cython/gudhi/alpha_complex.pyx index 88ef3b1b..6d6309db 100644 --- a/src/cython/gudhi/alpha_complex.pyx +++ b/src/cython/gudhi/alpha_complex.pyx @@ -112,6 +112,5 @@ cdef class AlphaComplex: """ stree = SimplexTree() cdef intptr_t stree_int_ptr=stree.thisptr - cdef Simplex_tree_interface_full_featured* stree_ptr = stree_int_ptr - self.thisptr.create_simplex_tree(stree_ptr, max_alpha_square) + self.thisptr.create_simplex_tree(stree_int_ptr, max_alpha_square) return stree diff --git a/src/cython/gudhi/euclidean_strong_witness_complex.pyx b/src/cython/gudhi/euclidean_strong_witness_complex.pyx index 465635c4..5d6e4fb9 100644 --- a/src/cython/gudhi/euclidean_strong_witness_complex.pyx +++ b/src/cython/gudhi/euclidean_strong_witness_complex.pyx @@ -71,11 +71,12 @@ cdef class EuclideanStrongWitnessComplex: """ stree = SimplexTree() cdef intptr_t stree_int_ptr=stree.thisptr - cdef Simplex_tree_interface_full_featured* stree_ptr = stree_int_ptr if limit_dimension is not -1: - self.thisptr.create_simplex_tree(stree_ptr, max_alpha_square, limit_dimension) + self.thisptr.create_simplex_tree(stree_int_ptr, + max_alpha_square, limit_dimension) else: - self.thisptr.create_simplex_tree(stree_ptr, max_alpha_square) + self.thisptr.create_simplex_tree(stree_int_ptr, + max_alpha_square) return stree def get_point(self, vertex): diff --git a/src/cython/gudhi/euclidean_witness_complex.pyx b/src/cython/gudhi/euclidean_witness_complex.pyx index 92d54eb5..2531919b 100644 --- a/src/cython/gudhi/euclidean_witness_complex.pyx +++ b/src/cython/gudhi/euclidean_witness_complex.pyx @@ -71,11 +71,12 @@ cdef class EuclideanWitnessComplex: """ stree = SimplexTree() cdef intptr_t stree_int_ptr=stree.thisptr - cdef Simplex_tree_interface_full_featured* stree_ptr = stree_int_ptr if limit_dimension is not -1: - self.thisptr.create_simplex_tree(stree_ptr, max_alpha_square, limit_dimension) + self.thisptr.create_simplex_tree(stree_int_ptr, + max_alpha_square, limit_dimension) else: - self.thisptr.create_simplex_tree(stree_ptr, max_alpha_square) + self.thisptr.create_simplex_tree(stree_int_ptr, + max_alpha_square) return stree def get_point(self, vertex): diff --git a/src/cython/gudhi/nerve_gic.pyx b/src/cython/gudhi/nerve_gic.pyx index 9fec626f..2b230b8c 100644 --- a/src/cython/gudhi/nerve_gic.pyx +++ b/src/cython/gudhi/nerve_gic.pyx @@ -164,8 +164,7 @@ cdef class CoverComplex: """ stree = SimplexTree() cdef intptr_t stree_int_ptr=stree.thisptr - cdef Simplex_tree_interface_full_featured* stree_ptr = stree_int_ptr - self.thisptr.create_simplex_tree(stree_ptr) + self.thisptr.create_simplex_tree(stree_int_ptr) return stree def find_simplices(self): diff --git a/src/cython/gudhi/rips_complex.pyx b/src/cython/gudhi/rips_complex.pyx index 1a6c8571..f2cd6a8d 100644 --- a/src/cython/gudhi/rips_complex.pyx +++ b/src/cython/gudhi/rips_complex.pyx @@ -97,6 +97,7 @@ cdef class RipsComplex: :rtype: SimplexTree """ stree = SimplexTree() - cdef intptr_t stree_ptr=stree.thisptr - self.thisref.create_simplex_tree(stree_ptr, max_dimension) + cdef intptr_t stree_int_ptr=stree.thisptr + self.thisref.create_simplex_tree(stree_int_ptr, + max_dimension) return stree diff --git a/src/cython/gudhi/strong_witness_complex.pyx b/src/cython/gudhi/strong_witness_complex.pyx index 4e3d1b67..e757abea 100644 --- a/src/cython/gudhi/strong_witness_complex.pyx +++ b/src/cython/gudhi/strong_witness_complex.pyx @@ -69,10 +69,10 @@ cdef class StrongWitnessComplex: """ stree = SimplexTree() cdef intptr_t stree_int_ptr=stree.thisptr - cdef Simplex_tree_interface_full_featured* stree_ptr = stree_int_ptr if limit_dimension is not -1: - self.thisptr.create_simplex_tree(stree_ptr, + self.thisptr.create_simplex_tree(stree_int_ptr, max_alpha_square, limit_dimension) else: - self.thisptr.create_simplex_tree(stree_ptr, max_alpha_square) + self.thisptr.create_simplex_tree(stree_int_ptr, + max_alpha_square) return stree diff --git a/src/cython/gudhi/tangential_complex.pyx b/src/cython/gudhi/tangential_complex.pyx index 9eb22115..3a945fe2 100644 --- a/src/cython/gudhi/tangential_complex.pyx +++ b/src/cython/gudhi/tangential_complex.pyx @@ -144,8 +144,7 @@ cdef class TangentialComplex: """ stree = SimplexTree() cdef intptr_t stree_int_ptr=stree.thisptr - cdef Simplex_tree_interface_full_featured* stree_ptr = stree_int_ptr - self.thisptr.create_simplex_tree(stree_ptr) + self.thisptr.create_simplex_tree(stree_int_ptr) return stree def fix_inconsistencies_using_perturbation(self, max_perturb, time_limit=-1.0): diff --git a/src/cython/gudhi/witness_complex.pyx b/src/cython/gudhi/witness_complex.pyx index c859877d..baa70b7a 100644 --- a/src/cython/gudhi/witness_complex.pyx +++ b/src/cython/gudhi/witness_complex.pyx @@ -69,10 +69,10 @@ cdef class WitnessComplex: """ stree = SimplexTree() cdef intptr_t stree_int_ptr=stree.thisptr - cdef Simplex_tree_interface_full_featured* stree_ptr = stree_int_ptr if limit_dimension is not -1: - self.thisptr.create_simplex_tree(stree_ptr, + self.thisptr.create_simplex_tree(stree_int_ptr, max_alpha_square, limit_dimension) else: - self.thisptr.create_simplex_tree(stree_ptr, max_alpha_square) + self.thisptr.create_simplex_tree(stree_int_ptr, + max_alpha_square) return stree -- cgit v1.2.3