summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2019-08-08 10:44:30 +0200
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2019-08-08 10:44:30 +0200
commitc85464b9ea96d21731e710fa7d7a15e645d2c89a (patch)
tree660c3861f5fc09e7a3f3de39634b7f6fb964c7d5
parentd7e1a3a81dfa91a29e433887fcfdc73310f8db32 (diff)
Rename bottleneck_distance module name as bottleneck. Cannot have gudhi.bottleneck_distance.bottleneck_distance and gudhi.bottleneck_distance.
-rw-r--r--.gitignore2
-rw-r--r--src/cython/CMakeLists.txt6
-rw-r--r--src/cython/gudhi/bottleneck.pyx (renamed from src/cython/gudhi/bottleneck_distance.pyx)0
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 8f8a8e6d..31efc180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ build/
# Generated by Cython
src/cython/gudhi/simplex_tree.cpp
src/cython/gudhi/alpha_complex.cpp
-src/cython/gudhi/bottleneck_distance.cpp
+src/cython/gudhi/bottleneck.cpp
src/cython/gudhi/cubical_complex.cpp
src/cython/gudhi/euclidean_strong_witness_complex.cpp
src/cython/gudhi/off_reader.cpp
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index dc0dd59d..6dc11400 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -42,8 +42,8 @@ if(PYTHONINTERP_FOUND)
set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'reader_utils', ")
set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'witness_complex', ")
set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'strong_witness_complex', ")
- set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'persistence_graphical_tools' ")
- set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'bottleneck_distance', ")
+ set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'persistence_graphical_tools', ")
+ set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'bottleneck', ")
set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'nerve_gic', ")
set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'subsampling', ")
set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'tangential_complex', ")
@@ -103,7 +103,7 @@ if(PYTHONINTERP_FOUND)
set(GUDHI_CYTHON_MODULES_TO_COMPILE "${GUDHI_CYTHON_MODULES_TO_COMPILE}'witness_complex', ")
set(GUDHI_CYTHON_MODULES_TO_COMPILE "${GUDHI_CYTHON_MODULES_TO_COMPILE}'strong_witness_complex', ")
if (NOT CGAL_VERSION VERSION_LESS 4.11.0)
- set(GUDHI_CYTHON_MODULES_TO_COMPILE "${GUDHI_CYTHON_MODULES_TO_COMPILE}'bottleneck_distance', ")
+ set(GUDHI_CYTHON_MODULES_TO_COMPILE "${GUDHI_CYTHON_MODULES_TO_COMPILE}'bottleneck', ")
set(GUDHI_CYTHON_MODULES_TO_COMPILE "${GUDHI_CYTHON_MODULES_TO_COMPILE}'nerve_gic', ")
endif ()
if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
diff --git a/src/cython/gudhi/bottleneck_distance.pyx b/src/cython/gudhi/bottleneck.pyx
index 4b378cbc..4b378cbc 100644
--- a/src/cython/gudhi/bottleneck_distance.pyx
+++ b/src/cython/gudhi/bottleneck.pyx