Rename some utilities + some fix in the doc

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

Former-commit-id: e7fe4af0f7d54ed580e557fe7ff9bc57ced2baa9

4 files changed, 18 insertions, 24 deletions

diff --git a/src/Bitmap_cubical_complex/utilities/CMakeLists.txt b/src/Bitmap_cubical_complex/utilities/CMakeLists.txt
index f0f80059..676a730a 100644
--- a/src/Bitmap_cubical_complex/utilities/CMakeLists.txt
+++ b/src/Bitmap_cubical_complex/utilities/CMakeLists.txt
@@ -1,29 +1,29 @@
 cmake_minimum_required(VERSION 2.6)
 project(Bitmap_cubical_complex_utilities)
 
-add_executable ( Bitmap_cubical_complex Bitmap_cubical_complex.cpp )
+add_executable ( cubical_complex_persistence cubical_complex_persistence.cpp )
 if (TBB_FOUND)
-  target_link_libraries(Bitmap_cubical_complex ${TBB_LIBRARIES})
+  target_link_libraries(cubical_complex_persistence ${TBB_LIBRARIES})
 endif()
 
-add_test(NAME Bitmap_cubical_complex_utility_persistence_one_sphere COMMAND $<TARGET_FILE:Bitmap_cubical_complex>
+add_test(NAME Bitmap_cubical_complex_utility_persistence_one_sphere COMMAND $<TARGET_FILE:cubical_complex_persistence>
     "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalOneSphere.txt")
 
-add_test(NAME Bitmap_cubical_complex_utility_persistence_two_sphere COMMAND $<TARGET_FILE:Bitmap_cubical_complex>
+add_test(NAME Bitmap_cubical_complex_utility_persistence_two_sphere COMMAND $<TARGET_FILE:cubical_complex_persistence>
     "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt")
 
-add_executable ( Bitmap_cubical_complex_periodic_boundary_conditions Bitmap_cubical_complex_periodic_boundary_conditions.cpp )
+add_executable ( periodic_cubical_complex_persistence periodic_cubical_complex_persistence.cpp )
 if (TBB_FOUND)
-  target_link_libraries(Bitmap_cubical_complex_periodic_boundary_conditions ${TBB_LIBRARIES})
+  target_link_libraries(periodic_cubical_complex_persistence ${TBB_LIBRARIES})
 endif()
 
 add_test(NAME Bitmap_cubical_complex_utility_periodic_boundary_conditions_2d_torus
-    COMMAND $<TARGET_FILE:Bitmap_cubical_complex_periodic_boundary_conditions>
+    COMMAND $<TARGET_FILE:periodic_cubical_complex_persistence>
     "${CMAKE_SOURCE_DIR}/data/bitmap/2d_torus.txt")
 
 add_test(NAME Bitmap_cubical_complex_utility_periodic_boundary_conditions_3d_torus
-    COMMAND $<TARGET_FILE:Bitmap_cubical_complex_periodic_boundary_conditions>
+    COMMAND $<TARGET_FILE:periodic_cubical_complex_persistence>
     "${CMAKE_SOURCE_DIR}/data/bitmap/3d_torus.txt")
 
-install(TARGETS Bitmap_cubical_complex DESTINATION bin)
-install(TARGETS Bitmap_cubical_complex_periodic_boundary_conditions DESTINATION bin)
+install(TARGETS cubical_complex_persistence DESTINATION bin)
+install(TARGETS periodic_cubical_complex_persistence DESTINATION bin)
diff --git a/src/Bitmap_cubical_complex/utilities/README b/src/Bitmap_cubical_complex/utilities/README
index d9085635..e7c10083 100644
--- a/src/Bitmap_cubical_complex/utilities/README
+++ b/src/Bitmap_cubical_complex/utilities/README
@@ -1,24 +1,18 @@
 # Bitmap_cubical_complex #

 

-## `Bitmap_cubical_complex` ##

+## `cubical_complex_persistence` ##

 This program computes persistent homology, by using the Bitmap_cubical_complex class, of cubical complexes provided in text files in Perseus style. The only number in the first line is a dimension D of a bitmap. In the lines I between 2 and D+1 there are numbers of top dimensional cells in the direction I. Let N denote product of the numbers in the lines between 2 and D. In the lines D+2 to D+2+N there are filtrations of top dimensional cells. We assume that the cells are in the lexicographical order.

 

-Examples:

+Example:

 

-* Create a Cubical Complex from the Perseus style file CubicalOneSphere.txt, computes Persistence cohomology from it and writes the results in a persistence file:

-`Bitmap_cubical_complex data/bitmap/CubicalOneSphere.txt`

+* Create a Cubical Complex from the Perseus style file `CubicalTwoSphere.txt`, computes Persistence cohomology from it and writes the results in a persistence file `CubicalTwoSphere.txt_persistence`:

+`cubical_complex_persistence data/bitmap/CubicalTwoSphere.txt`

 

-* Create a Cubical Complex from the Perseus style file CubicalTwoSphere.txt, computes Persistence cohomology from it and writes the results in a persistence file:

-`Bitmap_cubical_complex data/bitmap/CubicalTwoSphere.txt`

-

-## `Bitmap_cubical_complex_periodic_boundary_conditions` ##

+## `periodic_cubical_complex_persistence` ##

 

 Same as above, but with periodic boundary conditions.

 

-Examples:

-

-* Create a Periodical Cubical Complex from the Perseus style file 2d_torus.txt, computes Persistence cohomology from it and writes the results in a persistence file:

-`Bitmap_cubical_complex_periodic_boundary_conditions.exe data/bitmap/2d_torus.txt`

+Example:

 

-* Create a Periodical Cubical Complex from the Perseus style file 3d_torus.txt, computes Persistence cohomology from it and writes the results in a persistence file:

-`Bitmap_cubical_complex_periodic_boundary_conditions.exe data/bitmap/3d_torus.txt`

+* Create a Periodical Cubical Complex from the Perseus style file `3d_torus.txt`, computes Persistence cohomology from it and writes the results in a persistence file `3d_torus.txt_persistence`:

+`periodic_cubical_complex_persistence data/bitmap/3d_torus.txt`

diff --git a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex.cpp b/src/Bitmap_cubical_complex/utilities/cubical_complex_persistence.cpp
index 9d1bc08c..9d1bc08c 100644
--- a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex.cpp
+++ b/src/Bitmap_cubical_complex/utilities/cubical_complex_persistence.cpp
diff --git a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex_periodic_boundary_conditions.cpp b/src/Bitmap_cubical_complex/utilities/periodic_cubical_complex_persistence.cpp
index c812cb3a..c812cb3a 100644
--- a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex_periodic_boundary_conditions.cpp
+++ b/src/Bitmap_cubical_complex/utilities/periodic_cubical_complex_persistence.cpp