diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-15 11:00:56 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-15 11:00:56 +0000 |
| commit | 47374e6d54a8b251e421681d25d2e585d0203d19 (patch) | |
| tree | 3212f0ca4c4fef14d444f63300a715f2008411db | |
| parent | 72885b69e5fbe786f01b8275586281bb05198241 (diff) | |
Remove unused modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tangential_test@1878 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1b3dafad298e0caa87825ce47f6e8ac3983206a0
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/Tangential_complex/example/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Tangential_complex/include/gudhi/Tangential_complex.h | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78de6c09..005df6d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,13 +73,13 @@ else() set(Boost_USE_STATIC_RUNTIME OFF) # Find TBB package for parallel sort - not mandatory, just optional. - #set(TBB_FIND_QUIETLY ON) - #find_package(TBB) - #if (TBB_FOUND) - # include(${TBB_USE_FILE}) - # message("TBB found in ${TBB_LIBRARY_DIRS}") - # add_definitions(-DGUDHI_USE_TBB) - #endif() + set(TBB_FIND_QUIETLY ON) + find_package(TBB) + if (TBB_FOUND) + include(${TBB_USE_FILE}) + message("TBB found in ${TBB_LIBRARY_DIRS}") + add_definitions(-DGUDHI_USE_TBB) + endif() find_package(Eigen3 3.1.0) if (EIGEN3_FOUND) diff --git a/src/Tangential_complex/example/CMakeLists.txt b/src/Tangential_complex/example/CMakeLists.txt index 32f6eebb..a75ccd5b 100644 --- a/src/Tangential_complex/example/CMakeLists.txt +++ b/src/Tangential_complex/example/CMakeLists.txt @@ -18,7 +18,6 @@ if(CGAL_FOUND) add_test(Tangential_complex_example_with_perturb ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_example_with_perturb) - endif(EIGEN3_FOUND) endif(NOT CGAL_VERSION VERSION_LESS 4.8.0) endif(CGAL_FOUND) diff --git a/src/Tangential_complex/include/gudhi/Tangential_complex.h b/src/Tangential_complex/include/gudhi/Tangential_complex.h index e7e50ce9..65de2743 100644 --- a/src/Tangential_complex/include/gudhi/Tangential_complex.h +++ b/src/Tangential_complex/include/gudhi/Tangential_complex.h @@ -1306,7 +1306,6 @@ class Tangential_complex { , bool normalize_basis = true , Orthogonal_space_basis *p_orth_space_basis = NULL ) { -// unsigned int num_pts_for_pca = static_cast<unsigned int> (std::pow(GUDHI_TC_BASE_VALUE_FOR_PCA, m_intrinsic_dim)); unsigned int num_pts_for_pca = (std::min)(static_cast<unsigned int> (std::pow(GUDHI_TC_BASE_VALUE_FOR_PCA, m_intrinsic_dim)), static_cast<unsigned int> (m_points.size())); @@ -1397,7 +1396,6 @@ class Tangential_complex { // on it. Note that most points are duplicated. Tangent_space_basis compute_tangent_space(const Simplex &s, bool normalize_basis = true) { -// unsigned int num_pts_for_pca = static_cast<unsigned int> (std::pow(GUDHI_TC_BASE_VALUE_FOR_PCA, m_intrinsic_dim)); unsigned int num_pts_for_pca = (std::min)(static_cast<unsigned int> (std::pow(GUDHI_TC_BASE_VALUE_FOR_PCA, m_intrinsic_dim)), static_cast<unsigned int> (m_points.size())); |