diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
| commit | 0ce82cdc262fe9c09a1df1f559e1c17abfbbea3d (patch) | |
| tree | 56fcdcce7544a32899d0707c2274274df2c37d30 /src/python/gudhi/tangential_complex.pyx | |
| parent | 7cd38c50d3843fd222d4210507bad948afe63912 (diff) | |
| parent | 5d5f40493ce60f2a606793645bf713c60fb5284d (diff) | |
Merge upstream and resolve conflict
Diffstat (limited to 'src/python/gudhi/tangential_complex.pyx')
| -rw-r--r-- | src/python/gudhi/tangential_complex.pyx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/python/gudhi/tangential_complex.pyx b/src/python/gudhi/tangential_complex.pyx index f4c8b079..6391488c 100644 --- a/src/python/gudhi/tangential_complex.pyx +++ b/src/python/gudhi/tangential_complex.pyx @@ -1,3 +1,12 @@ +# This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT. +# See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details. +# Author(s): Vincent Rouvreau +# +# Copyright (C) 2016 Inria +# +# Modification(s): +# - YYYY/MM Author: Description of the modification + from cython cimport numeric from libcpp.vector cimport vector from libcpp.utility cimport pair @@ -9,15 +18,6 @@ import os from gudhi.simplex_tree cimport * from gudhi.simplex_tree import SimplexTree -# This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT. -# See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details. -# Author(s): Vincent Rouvreau -# -# Copyright (C) 2016 Inria -# -# Modification(s): -# - YYYY/MM Author: Description of the modification - __author__ = "Vincent Rouvreau" __copyright__ = "Copyright (C) 2016 Inria" __license__ = "GPL v3" @@ -66,7 +66,7 @@ cdef class TangentialComplex: def __cinit__(self, intrisic_dim, points=None, off_file=''): if off_file: if os.path.isfile(off_file): - self.thisptr = new Tangential_complex_interface(intrisic_dim, str.encode(off_file), True) + self.thisptr = new Tangential_complex_interface(intrisic_dim, off_file.encode('utf-8'), True) else: print("file " + off_file + " not found.") else: |