diff options
author | Gard Spreemann <gspreemann@gmail.com> | 2018-02-02 13:51:45 +0100 |
---|---|---|
committer | Gard Spreemann <gspreemann@gmail.com> | 2018-02-02 13:51:45 +0100 |
commit | 9899ae167f281d10b1684dfcd02c6838c5bf28df (patch) | |
tree | ceda62a40a9a8f731298832b1b4ab44ab0dd3a10 /example/Contraction | |
parent | 866f6ce614e9c09c97fed12c8c0c2c9fb84fad3f (diff) |
GUDHI 2.1.0 as released by upstream in a tarball.upstream/2.1.0
Diffstat (limited to 'example/Contraction')
-rw-r--r-- | example/Contraction/CMakeLists.txt | 3 | ||||
-rw-r--r-- | example/Contraction/Garland_heckbert.cpp | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/example/Contraction/CMakeLists.txt b/example/Contraction/CMakeLists.txt index 83594c0e..a92d1685 100644 --- a/example/Contraction/CMakeLists.txt +++ b/example/Contraction/CMakeLists.txt @@ -1,9 +1,10 @@ cmake_minimum_required(VERSION 2.6) project(Contraction_examples) - add_executable(RipsContraction Rips_contraction.cpp) + add_executable(GarlandHeckbert Garland_heckbert.cpp) +target_link_libraries(GarlandHeckbert ${Boost_TIMER_LIBRARY}) add_test(NAME Contraction_example_tore3D_0.2 COMMAND $<TARGET_FILE:RipsContraction> "${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off" "0.2") diff --git a/example/Contraction/Garland_heckbert.cpp b/example/Contraction/Garland_heckbert.cpp index f0cde95e..2b0dc973 100644 --- a/example/Contraction/Garland_heckbert.cpp +++ b/example/Contraction/Garland_heckbert.cpp @@ -29,7 +29,6 @@ #include <gudhi/Edge_contraction.h> #include <gudhi/Skeleton_blocker.h> #include <gudhi/Off_reader.h> -#include <gudhi/Clock.h> #include <iostream> @@ -165,8 +164,6 @@ int main(int argc, char *argv[]) { int num_contractions = atoi(argv[3]); - Gudhi::Clock contraction_chrono("Time to simplify and enumerate simplices"); - // constructs the contractor object with Garland Heckbert policies. Complex_contractor contractor(complex, new GH_cost(complex), @@ -182,8 +179,6 @@ int main(int argc, char *argv[]) { complex.num_edges() << " edges and " << complex.num_triangles() << " triangles." << std::endl; - std::cout << contraction_chrono; - // write simplified complex Gudhi::skeleton_blocker::Skeleton_blocker_off_writer<Complex> off_writer(argv[2], complex); |