From 6e2343ff3fb1e2869dea5f8b6526d0e20a64be48 Mon Sep 17 00:00:00 2001 From: glisse Date: Fri, 19 Dec 2014 17:48:47 +0000 Subject: git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@397 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: dee74763ef7ee12bc36b6ca28f22df1d8e6e3402 --- src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h | 5 +---- src/Simplex_tree/include/gudhi/Simplex_tree.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h index b5d8003f..bed2bdb5 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h @@ -222,11 +222,8 @@ class Persistent_cohomology { /** \brief Initializes the Persistent_cohomology class. * - * @param[in] cpx Complex for which the persistent homology is compiuted. + * @param[in] cpx Complex for which the persistent homology is computed. cpx is a model of FilteredComplex - * - * @param[in] persistence_dim_max if true, the persistent homology for the maximal dimension in the - * complex is computed. If false, it is ignored. Default is false. */ explicit Persistent_cohomology(Complex_ds& cpx) : cpx_(&cpx), diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index c866d179..562283e4 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -38,7 +38,6 @@ namespace Gudhi { -/** \defgroup simplex_tree Filtered Complexes /** \defgroup simplex_tree Filtered Complexes * * A simplicial complex \f$\mathbf{K}\f$ -- cgit v1.2.3 From fc3df8455192265b06a8f01e4249b9f821b6862e Mon Sep 17 00:00:00 2001 From: glisse Date: Fri, 19 Dec 2014 17:58:29 +0000 Subject: git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@398 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 66ccfba05435854189d0e11ebd45f479970b1baf --- src/Hasse_complex/include/gudhi/Hasse_complex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Hasse_complex/include/gudhi/Hasse_complex.h b/src/Hasse_complex/include/gudhi/Hasse_complex.h index 7adfc421..427d9916 100644 --- a/src/Hasse_complex/include/gudhi/Hasse_complex.h +++ b/src/Hasse_complex/include/gudhi/Hasse_complex.h @@ -62,7 +62,7 @@ struct Hasse_simplex * a complex where all codimension 1 incidence * relations are explicitly encoded. * - * \implements FilteredComplex. + * \implements FilteredComplex * \ingroup simplex_tree */ template < typename FiltrationValue = double -- cgit v1.2.3 From a45d3f1ff3e611220f4f8ea660393503337415e7 Mon Sep 17 00:00:00 2001 From: salinasd Date: Mon, 5 Jan 2015 12:58:48 +0000 Subject: test simplifiable git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@399 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: ea42cfc0cd8853bd33cbd15b5f236a6722dd7856 --- src/Skeleton_blocker/test/TestSimplifiable.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Skeleton_blocker/test/TestSimplifiable.cpp b/src/Skeleton_blocker/test/TestSimplifiable.cpp index 01767424..78412754 100644 --- a/src/Skeleton_blocker/test/TestSimplifiable.cpp +++ b/src/Skeleton_blocker/test/TestSimplifiable.cpp @@ -251,25 +251,28 @@ bool test_add_simplex(){ } bool test_add_simplex2(){ - Complex complex(5); + Complex complex; build_complete(4,complex); // Print result cerr << "initial complex:\n"<< complex.to_string(); cerr < simplices(complex.simplex_range().begin(),complex.simplex_range().end()); sort(simplices.begin(),simplices.end(),[&](const Simplex_handle& s1,const Simplex_handle& s2){ return s1.dimension()1) copy.add_simplex(simplex); } - cerr << "complex after add_simplex:\n"<< complex.to_string(); + cerr << "complex after add_simplex:\n"<< copy.to_string(); + return complex.num_blockers()==copy.num_blockers() && complex.num_edges()==copy.num_edges() && -- cgit v1.2.3 From 49db44131e0a4402b5d7715af8c2900d87b08708 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 5 Jan 2015 13:55:34 +0000 Subject: Add scripts for Windows/Linux cmake - Continous Integration git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@400 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0e87e347da32b6561ed197d64f17f0a9828f5a5a --- scripts/cmakeit | 4 ++++ scripts/cmakeit.bat | 4 ++++ 2 files changed, 8 insertions(+) create mode 100755 scripts/cmakeit create mode 100755 scripts/cmakeit.bat diff --git a/scripts/cmakeit b/scripts/cmakeit new file mode 100755 index 00000000..24cd5697 --- /dev/null +++ b/scripts/cmakeit @@ -0,0 +1,4 @@ +#!/bin/bash +#usage bash cmakeit + +cmake . diff --git a/scripts/cmakeit.bat b/scripts/cmakeit.bat new file mode 100755 index 00000000..cb12287c --- /dev/null +++ b/scripts/cmakeit.bat @@ -0,0 +1,4 @@ +rem cmake for Visual Studio 12 2013 +rem requires at least cmake 3.1.0 + +"C:\Program Files\CMake\bin\cmake" -G "Visual Studio 12 2013" . \ No newline at end of file -- cgit v1.2.3 From 196a03aed08cafd9c20b2d236261f23dbe6bbcdc Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 5 Jan 2015 15:39:46 +0000 Subject: Not required, finally git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@401 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 915c29d9de37c55059d06e613b8d119d2f3e5173 --- scripts/cmakeit | 4 ---- scripts/cmakeit.bat | 4 ---- 2 files changed, 8 deletions(-) delete mode 100755 scripts/cmakeit delete mode 100755 scripts/cmakeit.bat diff --git a/scripts/cmakeit b/scripts/cmakeit deleted file mode 100755 index 24cd5697..00000000 --- a/scripts/cmakeit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -#usage bash cmakeit - -cmake . diff --git a/scripts/cmakeit.bat b/scripts/cmakeit.bat deleted file mode 100755 index cb12287c..00000000 --- a/scripts/cmakeit.bat +++ /dev/null @@ -1,4 +0,0 @@ -rem cmake for Visual Studio 12 2013 -rem requires at least cmake 3.1.0 - -"C:\Program Files\CMake\bin\cmake" -G "Visual Studio 12 2013" . \ No newline at end of file -- cgit v1.2.3 From 190dc09165ab2e437129a59e9b1fffff9d63b640 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 6 Jan 2015 10:35:20 +0000 Subject: tie is in std namespace - Windows error git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@402 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 9242ac2e92c29b709810250725f5ae02c6d85d4d --- src/common/include/gudhi/reader_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h index 83298f86..ab12c268 100644 --- a/src/common/include/gudhi/reader_utils.h +++ b/src/common/include/gudhi/reader_utils.h @@ -115,7 +115,7 @@ read_graph ( std::string file_name ) boost::graph_traits::vertex_iterator vi, vi_end; auto v_it = vertices.begin(); - for (tie(vi, vi_end) = boost::vertices(skel_graph); vi != vi_end; ++vi,++v_it) + for (std::tie(vi, vi_end) = boost::vertices(skel_graph); vi != vi_end; ++vi,++v_it) { boost::put(vertex_prop, *vi, v_it->second); } return skel_graph; -- cgit v1.2.3 From cd3dfa44b3ad2441c55c2088bbeb2a4df43308cd Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 6 Jan 2015 10:41:08 +0000 Subject: tie is in std namespace - error in Windows git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@403 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 3f070629f63ccc2699c20f5a4578f6e91398e372 --- src/Simplex_tree/include/gudhi/Simplex_tree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index 562283e4..8d5dddce 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -646,7 +646,7 @@ class Simplex_tree { typename boost::graph_traits::vertex_iterator v_it, v_it_end; - for (tie(v_it, v_it_end) = boost::vertices(skel_graph); v_it != v_it_end; + for (std::tie(v_it, v_it_end) = boost::vertices(skel_graph); v_it != v_it_end; ++v_it) { root_.members_.emplace_hint( root_.members_.end(), *v_it, @@ -654,7 +654,7 @@ class Simplex_tree { } typename boost::graph_traits::edge_iterator e_it, e_it_end; - for (tie(e_it, e_it_end) = boost::edges(skel_graph); e_it != e_it_end; + for (std::tie(e_it, e_it_end) = boost::edges(skel_graph); e_it != e_it_end; ++e_it) { auto u = source(*e_it, skel_graph); auto v = target(*e_it, skel_graph); -- cgit v1.2.3 From 5b28454c34bab66bad9c95b2b179af0c2e809efd Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 6 Jan 2015 10:46:32 +0000 Subject: tie is in std namespace - Windows error git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@404 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 27e95f55da32d596d6557f84bb91c5a00085ef72 --- src/common/include/gudhi/graph_simplicial_complex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/include/gudhi/graph_simplicial_complex.h b/src/common/include/gudhi/graph_simplicial_complex.h index e7a8cfe9..1ad9dabd 100644 --- a/src/common/include/gudhi/graph_simplicial_complex.h +++ b/src/common/include/gudhi/graph_simplicial_complex.h @@ -86,7 +86,7 @@ Graph_t compute_proximity_graph( PointCloud &points auto vertex_prop = boost::get(vertex_filtration_t(),skel_graph); boost::graph_traits::vertex_iterator vi, vi_end; - for ( tie(vi, vi_end) = boost::vertices(skel_graph); + for ( std::tie(vi, vi_end) = boost::vertices(skel_graph); vi != vi_end; ++vi ) { boost::put(vertex_prop, *vi, 0.); } -- cgit v1.2.3 From 059c906152ca90608238bc82b07d8e28e18218dc Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 6 Jan 2015 16:49:25 +0000 Subject: CMake modification for Windows/Linux comilation git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@405 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 76e81b3769a39f13b14be50f5380ed2254c92c94 --- CMakeLists.txt | 12 +++++- src/Persistent_cohomology/example/CMakeLists.txt | 50 ++++++++++++------------ 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bffba902..32589371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,10 @@ else() set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") endif() -# BOOST ISSUE result_of vs C++11 -add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) +set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_MULTITHREADED ON) +set(Boost_USE_STATIC_RUNTIME OFF) + find_package(Boost) find_package(GMP) if(GMP_FOUND) @@ -56,9 +58,15 @@ endfunction(cpplint_add_tests) if(NOT Boost_FOUND) message(FATAL_ERROR "NOTICE: This demo requires Boost and will not be compiled.") else() + # BOOST ISSUE result_of vs C++11 + add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) + # BOOST ISSUE with Libraries name resolution under Windows + add_definitions(-DBOOST_ALL_NO_LIB) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) + message(STATUS "boost include dirs:" ${Boost_INCLUDE_DIRS}) include_directories(src/common/include/) include_directories(src/Contraction/include/) diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt index ae4b3be9..9cffe998 100644 --- a/src/Persistent_cohomology/example/CMakeLists.txt +++ b/src/Persistent_cohomology/example/CMakeLists.txt @@ -1,27 +1,29 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIExPersCohom) - -add_executable(rips_persistence rips_persistence.cpp) -target_link_libraries(rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) - -add_test(rips_persistence_2 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -m 100) -add_test(rips_persistence_3 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 3 -m 100) - -add_executable(persistence_from_file persistence_from_file.cpp) -target_link_libraries(persistence_from_file ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) -add_test(persistence_from_file_3_2_0 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 2 -m 0) -add_test(persistence_from_file_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100) - -if(GMPXX_FOUND AND GMP_FOUND) - message("GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}") - message("GMP_LIBRARIES = ${GMP_LIBRARIES}") - - add_executable(rips_multifield_persistence rips_multifield_persistence.cpp ) - target_link_libraries(rips_multifield_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES}) - add_test(rips_multifield_persistence_2_3 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -q 3 -m 100) - add_test(rips_multifield_persistence_2_71 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -q 71 -m 100) - - add_executable ( performance_rips_persistence performance_rips_persistence.cpp ) - target_link_libraries(performance_rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES}) -endif() +# problem with Visual Studio link on Boost program_options +if (!MSVC) + add_executable(rips_persistence rips_persistence.cpp) + target_link_libraries(rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) + + add_test(rips_persistence_2 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -m 100) + add_test(rips_persistence_3 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 3 -m 100) + + add_executable(persistence_from_file persistence_from_file.cpp) + target_link_libraries(persistence_from_file ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) + add_test(persistence_from_file_3_2_0 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 2 -m 0) + add_test(persistence_from_file_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100) + + if(GMPXX_FOUND AND GMP_FOUND) + message("GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}") + message("GMP_LIBRARIES = ${GMP_LIBRARIES}") + + add_executable(rips_multifield_persistence rips_multifield_persistence.cpp ) + target_link_libraries(rips_multifield_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES}) + add_test(rips_multifield_persistence_2_3 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -q 3 -m 100) + add_test(rips_multifield_persistence_2_71 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -q 71 -m 100) + + add_executable ( performance_rips_persistence performance_rips_persistence.cpp ) + target_link_libraries(performance_rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES}) + endif() +endif() \ No newline at end of file -- cgit v1.2.3