Merge of cpplint branch

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@357 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 8b6af51684401f4c45c953142aae90d6f45e6778

5 files changed, 19 insertions, 10 deletions

diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index dca4a04d..5c337f0b 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -1,22 +1,25 @@
 cmake_minimum_required(VERSION 2.6)
 project(GUDHIExPersCohom)
 
-# NEED TO FIND BOOST NEEDED COMPONENTS TO LINK WITH
-find_package(Boost 1.45.0 COMPONENTS system program_options)
-message("Boost_lib = ${Boost_LIBRARIES}")
+add_executable(rips_persistence rips_persistence.cpp)
+target_link_libraries(rips_persistence  ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_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 ( rips_persistence rips_persistence.cpp )
-target_link_libraries(rips_persistence ${Boost_LIBRARIES})
-add_executable ( rips_persistence_from_alpha_shape_3 rips_persistence_from_alpha_shape_3.cpp )
-target_link_libraries(rips_persistence_from_alpha_shape_3 ${Boost_LIBRARIES})
+add_executable(rips_persistence_from_alpha_shape_3 rips_persistence_from_alpha_shape_3.cpp )
+target_link_libraries(rips_persistence_from_alpha_shape_3 ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 
 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_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
+   add_executable(rips_multifield_persistence rips_multifield_persistence.cpp )
+   target_link_libraries(rips_multifield_persistence  ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_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_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
+   target_link_libraries(performance_rips_persistence  ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
+   add_test(rips_persistence_from_alpha_shape_3_2_0 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence_from_alpha_shape_3 ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 2 -m 0)
+   add_test(rips_persistence_from_alpha_shape_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence_from_alpha_shape_3 ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100)
 endif()
diff --git a/src/Persistent_cohomology/example/performance_rips_persistence.cpp b/src/Persistent_cohomology/example/performance_rips_persistence.cpp
index 37d41ee1..077c2b07 100644
--- a/src/Persistent_cohomology/example/performance_rips_persistence.cpp
+++ b/src/Persistent_cohomology/example/performance_rips_persistence.cpp
@@ -31,6 +31,7 @@
 #include <chrono>
 
 using namespace Gudhi;
+using namespace Gudhi::persistent_cohomology;
 
 /* Compute the persistent homology of the complex cpx with coefficients in Z/pZ. */
 template< typename FilteredComplex>
diff --git a/src/Persistent_cohomology/example/rips_multifield_persistence.cpp b/src/Persistent_cohomology/example/rips_multifield_persistence.cpp
index 95ef8809..2505897e 100644
--- a/src/Persistent_cohomology/example/rips_multifield_persistence.cpp
+++ b/src/Persistent_cohomology/example/rips_multifield_persistence.cpp
@@ -30,6 +30,7 @@
 #include <boost/program_options.hpp>
 
 using namespace Gudhi;
+using namespace Gudhi::persistent_cohomology;
 
 typedef int    Vertex_handle;
 typedef double Filtration_value;
@@ -69,6 +70,8 @@ int main (int argc, char * argv[])
   st.insert_graph(prox_graph); // insert the proximity graph in the simplex tree
   st.expansion( dim_max ); // expand the graph until dimension dim_max
 
+  std::cout << "st=" << st << std::endl;
+
 // Sort the simplices in the order of the filtration
   st.initialize_filtration();
 
diff --git a/src/Persistent_cohomology/example/rips_persistence.cpp b/src/Persistent_cohomology/example/rips_persistence.cpp
index d7927223..f7f9527f 100644
--- a/src/Persistent_cohomology/example/rips_persistence.cpp
+++ b/src/Persistent_cohomology/example/rips_persistence.cpp
@@ -29,6 +29,7 @@
 #include <boost/program_options.hpp>
 
 using namespace Gudhi;
+using namespace Gudhi::persistent_cohomology;
 
 typedef int        Vertex_handle;
 typedef double     Filtration_value;
diff --git a/src/Persistent_cohomology/example/rips_persistence_from_alpha_shape_3.cpp b/src/Persistent_cohomology/example/rips_persistence_from_alpha_shape_3.cpp
index ddaafea2..e886aea7 100644
--- a/src/Persistent_cohomology/example/rips_persistence_from_alpha_shape_3.cpp
+++ b/src/Persistent_cohomology/example/rips_persistence_from_alpha_shape_3.cpp
@@ -29,6 +29,7 @@
 #include <boost/program_options.hpp>
 
 using namespace Gudhi;
+using namespace Gudhi::persistent_cohomology;
 
 typedef int        Vertex_handle;
 typedef double     Filtration_value;