From 8e83a86b147987cc256812aff78335ac8a26c36e Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 15 Dec 2014 16:56:31 +0000 Subject: CMakeLists.txt uniformization. check_google_style bug fix. generate_version copy Doxyfile git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cpplint_test@352 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: a64f89b97ff3acbcf562070cc59b6065013d4aa1 --- .../example/performance_rips_persistence.cpp | 1 + src/Persistent_cohomology/example/rips_multifield_persistence.cpp | 1 + src/Persistent_cohomology/example/rips_persistence.cpp | 1 + .../example/rips_persistence_from_alpha_shape_3.cpp | 1 + src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h | 5 +++++ .../include/gudhi/Persistent_cohomology/Field_Zp.h | 4 ++++ .../include/gudhi/Persistent_cohomology/Multi_field.h | 4 ++++ .../gudhi/Persistent_cohomology/Persistent_cohomology_column.h | 4 ++++ src/Persistent_cohomology/test/CMakeLists.txt | 8 +------- .../test/persistent_cohomology_unit_test.cpp | 1 + .../test/persistent_cohomology_unit_test_multi_field.cpp | 1 + 11 files changed, 24 insertions(+), 7 deletions(-) (limited to 'src/Persistent_cohomology') 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 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 c3203131..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 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.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 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 using namespace Gudhi; +using namespace Gudhi::persistent_cohomology; typedef int Vertex_handle; typedef double Filtration_value; diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h index a5867013..f638a0fb 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h @@ -40,6 +40,8 @@ namespace Gudhi { +namespace persistent_cohomology { + /** \defgroup persistent_cohomology Persistent Cohomology Package * * Computation of persistent cohomology using the algorithm of @@ -746,6 +748,9 @@ class Persistent_cohomology { }; /** @} */ // end defgroup persistent_cohomology + +} // namespace persistent_cohomology + } // namespace Gudhi #endif // SRC_PERSISTENT_COHOMOLOGY_INCLUDE_GUDHI_PERSISTENT_COHOMOLOGY_H_ diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Field_Zp.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Field_Zp.h index 8b09a800..49883a4a 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Field_Zp.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Field_Zp.h @@ -28,6 +28,8 @@ namespace Gudhi { +namespace persistent_cohomology { + /** \brief Structure representing the coefficient field \f$\mathbb{Z}/p\mathbb{Z}\f$ * * \implements CoefficientField @@ -117,6 +119,8 @@ class Field_Zp { const Element add_id_all; }; +} // namespace persistent_cohomology + } // namespace Gudhi #endif // SRC_PERSISTENT_COHOMOLOGY_INCLUDE_GUDHI_PERSISTENT_COHOMOLOGY_FIELD_ZP_H_ diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Multi_field.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Multi_field.h index 5ad4e9cf..306877e7 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Multi_field.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Multi_field.h @@ -30,6 +30,8 @@ namespace Gudhi { +namespace persistent_cohomology { + /** \brief Structure representing coefficients in a set of finite fields simultaneously * using the chinese remainder theorem. * @@ -183,6 +185,8 @@ class Multi_field { const Element add_id_all; }; +} // namespace persistent_cohomology + } // namespace Gudhi #endif // SRC_PERSISTENT_COHOMOLOGY_INCLUDE_GUDHI_PERSISTENT_COHOMOLOGY_MULTI_FIELD_H_ diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h index 632f8e11..fcec819a 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h @@ -31,6 +31,8 @@ namespace Gudhi { +namespace persistent_cohomology { + template class Persistent_cohomology_column; @@ -139,6 +141,8 @@ class Persistent_cohomology_column : public boost::intrusive::set_base_hook< SimplexKey class_key_; }; +} // namespace persistent_cohomology + } // namespace Gudhi #endif // SRC_PERSISTENT_COHOMOLOGY_INCLUDE_GUDHI_PERSISTENT_COHOMOLOGY_PERSISTENT_COHOMOLOGY_COLUMN_H_ diff --git a/src/Persistent_cohomology/test/CMakeLists.txt b/src/Persistent_cohomology/test/CMakeLists.txt index 01432aa1..80689113 100644 --- a/src/Persistent_cohomology/test/CMakeLists.txt +++ b/src/Persistent_cohomology/test/CMakeLists.txt @@ -26,10 +26,4 @@ if (LCOV_PATH) add_test(src/Persistent_cohomology/lcov/coverage.log ${CMAKE_SOURCE_DIR}/scripts/check_code_coverage.sh ${CMAKE_SOURCE_DIR}/src/Persistent_cohomology) endif() -if (PYTHON_PATH) - # Cpplint tests on coding style - add_test(Persistent_cohomology.h.cpplint ${CMAKE_SOURCE_DIR}/scripts/check_google_style.sh ${CMAKE_SOURCE_DIR}/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h) - add_test(Field_Zp.h.cpplint ${CMAKE_SOURCE_DIR}/scripts/check_google_style.sh ${CMAKE_SOURCE_DIR}/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Field_Zp.h) - add_test(Multi_field.h.cpplint ${CMAKE_SOURCE_DIR}/scripts/check_google_style.sh ${CMAKE_SOURCE_DIR}/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Multi_field.h) - add_test(Persistent_cohomology_column.h.cpplint ${CMAKE_SOURCE_DIR}/scripts/check_google_style.sh ${CMAKE_SOURCE_DIR}/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h) -endif() \ No newline at end of file +cpplint_add_tests("${CMAKE_SOURCE_DIR}/src/Persistent_cohomology/include/gudhi") diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp index e180bea3..1b0cc152 100644 --- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp +++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp @@ -16,6 +16,7 @@ #include "gudhi/Persistent_cohomology.h" using namespace Gudhi; +using namespace Gudhi::persistent_cohomology; typedef Simplex_tree<> typeST; diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp index cef29bb0..91cf5784 100644 --- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp +++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp @@ -17,6 +17,7 @@ #include "gudhi/Persistent_cohomology/Multi_field.h" using namespace Gudhi; +using namespace Gudhi::persistent_cohomology; typedef Simplex_tree<> typeST; -- cgit v1.2.3