Merge from trunk

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

Former-commit-id: 7872aa224ee471c05e9213b81192d304254e608a

5 files changed, 16 insertions, 17 deletions

diff --git a/src/Bitmap_cubical_complex/example/CMakeLists.txt b/src/Bitmap_cubical_complex/example/CMakeLists.txt
index 567f25d9..99304aa4 100644
--- a/src/Bitmap_cubical_complex/example/CMakeLists.txt
+++ b/src/Bitmap_cubical_complex/example/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 project(Bitmap_cubical_complex_examples)
 
 add_executable ( Random_bitmap_cubical_complex Random_bitmap_cubical_complex.cpp )
-target_link_libraries(Random_bitmap_cubical_complex ${Boost_SYSTEM_LIBRARY})
 if (TBB_FOUND)
   target_link_libraries(Random_bitmap_cubical_complex ${TBB_LIBRARIES})
 endif()
diff --git a/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h b/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h
index 5a87b9b8..f395de65 100644
--- a/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h
+++ b/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h
@@ -97,7 +97,7 @@ class Bitmap_cubical_complex : public T {
    * with filtration on top dimensional cells.
    **/
   Bitmap_cubical_complex(const std::vector<unsigned>& dimensions,
-                         const std::vector<typename T::filtration_type>& top_dimensional_cells) :
+                         const std::vector<Filtration_value>& top_dimensional_cells) :
       T(dimensions, top_dimensional_cells),
       key_associated_to_simplex(this->total_number_of_cells + 1) {
     for (size_t i = 0; i != this->total_number_of_cells; ++i) {
@@ -111,13 +111,13 @@ class Bitmap_cubical_complex : public T {
 
   /**
    * Constructor that requires vector of elements of type unsigned, which gives number of top dimensional cells
-   * in the following directions and vector of element of a type T::filtration_type
+   * in the following directions and vector of element of a type Filtration_value
    * with filtration on top dimensional cells. The last parameter of the constructor is a vector of boolean of a length
    * equal to the dimension of cubical complex.
    * If the position i on this vector is true, then we impose periodic boundary conditions in this direction.
    **/
   Bitmap_cubical_complex(const std::vector<unsigned>& dimensions,
-                         const std::vector<typename T::filtration_type>& top_dimensional_cells,
+                         const std::vector<Filtration_value>& top_dimensional_cells,
                          std::vector< bool > directions_in_which_periodic_b_cond_are_to_be_imposed) :
       T(dimensions, top_dimensional_cells, directions_in_which_periodic_b_cond_are_to_be_imposed),
       key_associated_to_simplex(this->total_number_of_cells + 1) {
@@ -170,20 +170,20 @@ class Bitmap_cubical_complex : public T {
     if (globalDbg) {
       std::cerr << "unsigned dimension(const Simplex_handle& sh)\n";
     }
-    if (sh != std::numeric_limits<Simplex_handle>::max()) return this->get_dimension_of_a_cell(sh);
+    if (sh != null_simplex()) return this->get_dimension_of_a_cell(sh);
     return -1;
   }
 
   /**
    * Return the filtration of a cell pointed by the Simplex_handle.
    **/
-  typename T::filtration_type filtration(Simplex_handle sh) {
+  Filtration_value filtration(Simplex_handle sh) {
     if (globalDbg) {
-      std::cerr << "T::filtration_type filtration(const Simplex_handle& sh)\n";
+      std::cerr << "Filtration_value filtration(const Simplex_handle& sh)\n";
     }
     // Returns the filtration value of a simplex.
-    if (sh != std::numeric_limits<Simplex_handle>::max()) return this->data[sh];
-    return std::numeric_limits<Simplex_handle>::max();
+    if (sh != null_simplex()) return this->data[sh];
+    return std::numeric_limits<Filtration_value>::infinity();
   }
 
   /**
@@ -203,7 +203,7 @@ class Bitmap_cubical_complex : public T {
     if (globalDbg) {
       std::cerr << "Simplex_key key(const Simplex_handle& sh)\n";
     }
-    if (sh != std::numeric_limits<Simplex_handle>::max()) {
+    if (sh != null_simplex()) {
       return this->key_associated_to_simplex[sh];
     }
     return this->null_key();
@@ -216,7 +216,7 @@ class Bitmap_cubical_complex : public T {
     if (globalDbg) {
       std::cerr << "Simplex_handle simplex(Simplex_key key)\n";
     }
-    if (key != std::numeric_limits<Simplex_handle>::max()) {
+    if (key != null_key()) {
       return this->simplex_associated_to_key[ key ];
     }
     return null_simplex();
@@ -229,7 +229,7 @@ class Bitmap_cubical_complex : public T {
     if (globalDbg) {
       std::cerr << "void assign_key(Simplex_handle& sh, Simplex_key key)\n";
     }
-    if (key == std::numeric_limits<Simplex_handle>::max()) return;
+    if (key == null_key()) return;
     this->key_associated_to_simplex[sh] = key;
     this->simplex_associated_to_key[key] = sh;
   }
@@ -566,8 +566,9 @@ class is_before_in_filtration {
   bool operator()(const typename Bitmap_cubical_complex<T>::Simplex_handle& sh1,
                   const typename Bitmap_cubical_complex<T>::Simplex_handle& sh2) const {
     // Not using st_->filtration(sh1) because it uselessly tests for null_simplex.
-    typename T::filtration_type fil1 = CC_->data[sh1];
-    typename T::filtration_type fil2 = CC_->data[sh2];
+    typedef typename T::filtration_type Filtration_value;
+    Filtration_value fil1 = CC_->data[sh1];
+    Filtration_value fil2 = CC_->data[sh2];
     if (fil1 != fil2) {
       return fil1 < fil2;
     }
diff --git a/src/Bitmap_cubical_complex/test/CMakeLists.txt b/src/Bitmap_cubical_complex/test/CMakeLists.txt
index b2895f85..02b026f2 100644
--- a/src/Bitmap_cubical_complex/test/CMakeLists.txt
+++ b/src/Bitmap_cubical_complex/test/CMakeLists.txt
@@ -4,7 +4,7 @@ project(Bitmap_cubical_complex_tests)
 include(GUDHI_test_coverage)
 
 add_executable ( Bitmap_cubical_complex_test_unit Bitmap_test.cpp )
-target_link_libraries(Bitmap_cubical_complex_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+target_link_libraries(Bitmap_cubical_complex_test_unit ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 if (TBB_FOUND)
   target_link_libraries(Bitmap_cubical_complex_test_unit ${TBB_LIBRARIES})
 endif()
diff --git a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex_periodic_boundary_conditions.cpp b/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex_periodic_boundary_conditions.cpp
index f8754345..122160a2 100644
--- a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex_periodic_boundary_conditions.cpp
+++ b/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex_periodic_boundary_conditions.cpp
@@ -30,6 +30,7 @@
 #include <iostream>
 #include <sstream>
 #include <vector>
+#include <string>
 
 int main(int argc, char** argv) {
   std::cout << "This program computes persistent homology, by using " <<
diff --git a/src/Bitmap_cubical_complex/utilities/CMakeLists.txt b/src/Bitmap_cubical_complex/utilities/CMakeLists.txt
index 43fb8c86..f0f80059 100644
--- a/src/Bitmap_cubical_complex/utilities/CMakeLists.txt
+++ b/src/Bitmap_cubical_complex/utilities/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 project(Bitmap_cubical_complex_utilities)
 
 add_executable ( Bitmap_cubical_complex Bitmap_cubical_complex.cpp )
-target_link_libraries(Bitmap_cubical_complex ${Boost_SYSTEM_LIBRARY})
 if (TBB_FOUND)
   target_link_libraries(Bitmap_cubical_complex ${TBB_LIBRARIES})
 endif()
@@ -14,7 +13,6 @@ add_test(NAME Bitmap_cubical_complex_utility_persistence_two_sphere COMMAND $<TA
     "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt")
 
 add_executable ( Bitmap_cubical_complex_periodic_boundary_conditions Bitmap_cubical_complex_periodic_boundary_conditions.cpp )
-target_link_libraries(Bitmap_cubical_complex_periodic_boundary_conditions ${Boost_SYSTEM_LIBRARY})
 if (TBB_FOUND)
   target_link_libraries(Bitmap_cubical_complex_periodic_boundary_conditions ${TBB_LIBRARIES})
 endif()