Merge last trunk modifications

Fix doxygen warnings


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

Former-commit-id: b80b28a10495b6f2519b53885b1bf31be85ed7ac

2 files changed, 26 insertions, 26 deletions

diff --git a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex.cpp b/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex.cpp
index e126caea..9d1bc08c 100644
--- a/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex.cpp
+++ b/src/Bitmap_cubical_complex/utilities/Bitmap_cubical_complex.cpp
@@ -20,7 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <gudhi/reader_utils.h>
 #include <gudhi/Bitmap_cubical_complex.h>
 #include <gudhi/Persistent_cohomology.h>
@@ -32,16 +31,18 @@
 #include <cstddef>
 
 int main(int argc, char** argv) {
-  std::cout << "This program computes persistent homology, by using the Bitmap_cubical_complex_base 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. See " <<
-      "CubicalOneSphere.txt or CubicalTwoSphere.txt for example.\n" << std::endl;
+  std::cout
+      << "This program computes persistent homology, by using bitmap_cubical_complex class, of cubical "
+      << "complexes provided in text files in Perseus style (the only numbered 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. See "
+      << "CubicalOneSphere.txt or CubicalTwoSphere.txt for example.\n"
+      << std::endl;
 
   if (argc != 2) {
-    std::cerr << "Wrong number of parameters. Please provide the name of a file with a Perseus style bitmap at " <<
-        "the input. The program will now terminate.\n";
+    std::cerr << "Wrong number of parameters. Please provide the name of a file with a Perseus style bitmap at "
+              << "the input. The program will now terminate.\n";
     return 1;
   }
 
@@ -54,7 +55,7 @@ int main(int argc, char** argv) {
 
   // Compute the persistence diagram of the complex
   Persistent_cohomology pcoh(b);
-  int p = 2;
+  int p = 11;
   double min_persistence = 0;
 
   pcoh.init_coefficients(p);  // initializes the coefficient field for homology
@@ -66,7 +67,7 @@ int main(int argc, char** argv) {
   std::size_t last_in_path = output_file_name.find_last_of("/\\");
 
   if (last_in_path != std::string::npos) {
-    output_file_name = output_file_name.substr(last_in_path+1);
+    output_file_name = output_file_name.substr(last_in_path + 1);
   }
 
   std::ofstream out(output_file_name.c_str());
@@ -77,4 +78,3 @@ int main(int argc, char** argv) {
 
   return 0;
 }
-
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 7f9296a6..c812cb3a 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
@@ -20,7 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <gudhi/reader_utils.h>
 #include <gudhi/Bitmap_cubical_complex.h>
 #include <gudhi/Bitmap_cubical_complex_periodic_boundary_conditions_base.h>
@@ -33,22 +32,24 @@
 #include <string>
 
 int main(int argc, char** argv) {
-  std::cout << "This program computes persistent homology, by using the " <<
-      "Bitmap_cubical_complex_periodic_boundary_conditions 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. See CubicalOneSphere.txt or CubicalTwoSphere.txt for" <<
-      " example.\n" << std::endl;
+  std::cout
+      << "This program computes persistent homology, by using "
+      << "Bitmap_cubical_complex_periodic_boundary_conditions class, of cubical complexes provided in text files in "
+      << "Perseus style (the only numbered 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. See CubicalOneSphere.txt or CubicalTwoSphere.txt for"
+      << " example.\n"
+      << std::endl;
 
   if (argc != 2) {
-    std::cerr << "Wrong number of parameters. Please provide the name of a file with a Perseus style bitmap at " <<
-        "the input. The program will now terminate.\n";
+    std::cerr << "Wrong number of parameters. Please provide the name of a file with a Perseus style bitmap at "
+              << "the input. The program will now terminate.\n";
     return 1;
   }
 
   typedef Gudhi::cubical_complex::Bitmap_cubical_complex_periodic_boundary_conditions_base<double> Bitmap_base;
-  typedef Gudhi::cubical_complex::Bitmap_cubical_complex< Bitmap_base > Bitmap_cubical_complex;
+  typedef Gudhi::cubical_complex::Bitmap_cubical_complex<Bitmap_base> Bitmap_cubical_complex;
 
   Bitmap_cubical_complex b(argv[1]);
 
@@ -57,7 +58,7 @@ int main(int argc, char** argv) {
   // Compute the persistence diagram of the complex
   Persistent_cohomology pcoh(b, true);
 
-  int p = 2;
+  int p = 11;
   double min_persistence = 0;
   pcoh.init_coefficients(p);  // initializes the coefficient field for homology
   pcoh.compute_persistent_cohomology(min_persistence);
@@ -68,7 +69,7 @@ int main(int argc, char** argv) {
   std::size_t last_in_path = output_file_name.find_last_of("/\\");
 
   if (last_in_path != std::string::npos) {
-    output_file_name = output_file_name.substr(last_in_path+1);
+    output_file_name = output_file_name.substr(last_in_path + 1);
   }
 
   std::ofstream out(output_file_name.c_str());
@@ -79,4 +80,3 @@ int main(int argc, char** argv) {
 
   return 0;
 }
-