Apply google code conventions for cpplint

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

Former-commit-id: 2f82ddf869dc95ec33c6cea825ee24cd1a849c4b

5 files changed, 69 insertions, 59 deletions

diff --git a/src/Nerve_GIC/example/CoordGIC.cpp b/src/Nerve_GIC/example/CoordGIC.cpp
index f23e3f55..e7a68e07 100644
--- a/src/Nerve_GIC/example/CoordGIC.cpp
+++ b/src/Nerve_GIC/example/CoordGIC.cpp
@@ -22,10 +22,10 @@
 
 #include <gudhi/GIC.h>
 
-void usage(int nbArgs, char * const progName) {
+void usage(int nbArgs, char *const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
   std::cerr << "Usage: " << progName << " filename.off coordinate [--v] \n";
-  std::cerr << "       i.e.: " << progName << " ../../../../data/points/human.off 2 --v \n";
+  std::cerr << "       i.e.: " << progName << " ../../data/points/human.off 2 --v \n";
   exit(-1);  // ----- >>
 }
 
@@ -36,7 +36,8 @@ int main(int argc, char **argv) {
 
   std::string off_file_name(argv[1]);
   int coord = atoi(argv[2]);
-  bool verb = 0; if(argc == 4)  verb = 1;
+  bool verb = 0;
+  if (argc == 4) verb = 1;
 
   // -----------------------------------------
   // Init of a functional GIC from an OFF file
@@ -47,32 +48,33 @@ int main(int argc, char **argv) {
 
   bool check = GIC.read_point_cloud(off_file_name);
 
-  if(!check)  std::cout << "Incorrect OFF file." << std::endl;
-  else{
-
+  if (!check) {
+    std::cout << "Incorrect OFF file." << std::endl;
+  } else {
     GIC.set_type("GIC");
 
     GIC.set_color_from_coordinate(coord);
     GIC.set_function_from_coordinate(coord);
 
     GIC.set_graph_from_automatic_rips(Gudhi::Euclidean_distance());
-    GIC.set_automatic_resolution(); GIC.set_gain();
+    GIC.set_automatic_resolution();
+    GIC.set_gain();
     GIC.set_cover_from_function();
 
     GIC.find_simplices();
 
     GIC.plot_DOT();
 
-    Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);
+    Gudhi::Simplex_tree<> stree;
+    GIC.create_complex(stree);
 
     // --------------------------------------------
     // Display information about the functional GIC
     // --------------------------------------------
 
-    if(verb){
-      std::cout << "Functional GIC is of dimension " << stree.dimension() <<
-                     " - " << stree.num_simplices() << " simplices - " <<
-                     stree.num_vertices() << " vertices." << std::endl;
+    if (verb) {
+      std::cout << "Functional GIC is of dimension " << stree.dimension() << " - " << stree.num_simplices()
+                << " simplices - " << stree.num_vertices() << " vertices." << std::endl;
 
       std::cout << "Iterator on functional GIC simplices" << std::endl;
       for (auto f_simplex : stree.filtration_simplex_range()) {
diff --git a/src/Nerve_GIC/example/FuncGIC.cpp b/src/Nerve_GIC/example/FuncGIC.cpp
index 1601ddab..2de8c021 100644
--- a/src/Nerve_GIC/example/FuncGIC.cpp
+++ b/src/Nerve_GIC/example/FuncGIC.cpp
@@ -22,10 +22,11 @@
 
 #include <gudhi/GIC.h>
 
-void usage(int nbArgs, char * const progName) {
+void usage(int nbArgs, char *const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
   std::cerr << "Usage: " << progName << " filename.off function [--v] \n";
-  std::cerr << "       i.e.: " << progName << " ../../../../data/points/COIL_database/lucky_cat.off ../../../../data/points/COIL_database/lucky_cat_PCA1 --v \n";
+  std::cerr << "       i.e.: " << progName << " ../../data/points/COIL_database/lucky_cat.off "
+                                              "../../data/points/COIL_database/lucky_cat_PCA1 --v \n";
   exit(-1);  // ----- >>
 }
 
@@ -36,7 +37,8 @@ int main(int argc, char **argv) {
 
   std::string off_file_name(argv[1]);
   std::string func_file_name = argv[2];
-  bool verb = 0; if(argc == 4)  verb = 1;
+  bool verb = 0;
+  if (argc == 4) verb = 1;
 
   // -----------------------------------------
   // Init of a functional GIC from an OFF file
@@ -47,32 +49,33 @@ int main(int argc, char **argv) {
 
   bool check = GIC.read_point_cloud(off_file_name);
 
-  if(!check)  std::cout << "Incorrect OFF file." << std::endl;
-  else{
-
+  if (!check) {
+    std::cout << "Incorrect OFF file." << std::endl;
+  } else {
     GIC.set_type("GIC");
 
     GIC.set_color_from_file(func_file_name);
     GIC.set_function_from_file(func_file_name);
 
     GIC.set_graph_from_automatic_rips(Gudhi::Euclidean_distance());
-    GIC.set_automatic_resolution(); GIC.set_gain();
+    GIC.set_automatic_resolution();
+    GIC.set_gain();
     GIC.set_cover_from_function();
 
     GIC.find_simplices();
 
     GIC.plot_DOT();
 
-    Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);
+    Gudhi::Simplex_tree<> stree;
+    GIC.create_complex(stree);
 
     // --------------------------------------------
     // Display information about the functional GIC
     // --------------------------------------------
 
-    if(verb){
-      std::cout << "Functional GIC is of dimension " << stree.dimension() <<
-                     " - " << stree.num_simplices() << " simplices - " <<
-                     stree.num_vertices() << " vertices." << std::endl;
+    if (verb) {
+      std::cout << "Functional GIC is of dimension " << stree.dimension() << " - " << stree.num_simplices()
+                << " simplices - " << stree.num_vertices() << " vertices." << std::endl;
 
       std::cout << "Iterator on functional GIC simplices" << std::endl;
       for (auto f_simplex : stree.filtration_simplex_range()) {
diff --git a/src/Nerve_GIC/example/GIC.cpp b/src/Nerve_GIC/example/GIC.cpp
index cdfe73a7..2d0c9672 100644
--- a/src/Nerve_GIC/example/GIC.cpp
+++ b/src/Nerve_GIC/example/GIC.cpp
@@ -22,10 +22,10 @@
 
 #include <gudhi/GIC.h>
 
-void usage(int nbArgs, char * const progName) {
+void usage(int nbArgs, char *const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
   std::cerr << "Usage: " << progName << " filename.off threshold coordinate resolution gain [--v] \n";
-  std::cerr << "       i.e.: " << progName << " ../../../../data/points/human.off 0.075 2 0.075 0 --v \n";
+  std::cerr << "       i.e.: " << progName << " ../../data/points/human.off 0.075 2 0.075 0 --v \n";
   exit(-1);  // ----- >>
 }
 
@@ -39,7 +39,8 @@ int main(int argc, char **argv) {
   int coord = atoi(argv[3]);
   double resolution = atof(argv[4]);
   double gain = atof(argv[5]);
-  bool verb = 0; if(argc == 7)  verb = 1;
+  bool verb = 0;
+  if (argc == 7) verb = 1;
 
   // ----------------------------------------------------------------------------
   // Init of a graph induced complex from an OFF file
@@ -50,31 +51,32 @@ int main(int argc, char **argv) {
 
   bool check = GIC.read_point_cloud(off_file_name);
 
-  if(!check)  std::cout << "Incorrect OFF file." << std::endl;
-  else{
-
+  if (!check) {
+    std::cout << "Incorrect OFF file." << std::endl;
+  } else {
     GIC.set_color_from_coordinate(coord);
     GIC.set_function_from_coordinate(coord);
 
     GIC.set_graph_from_rips(threshold, Gudhi::Euclidean_distance());
 
-    GIC.set_resolution_with_interval_length(resolution); GIC.set_gain(gain);
+    GIC.set_resolution_with_interval_length(resolution);
+    GIC.set_gain(gain);
     GIC.set_cover_from_function();
 
     GIC.find_GIC_simplices();
 
     GIC.plot_TXT_for_KeplerMapper();
 
-    Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);
+    Gudhi::Simplex_tree<> stree;
+    GIC.create_complex(stree);
 
     // ----------------------------------------------------------------------------
     // Display information about the graph induced complex
     // ----------------------------------------------------------------------------
 
-    if(verb){
-      std::cout << "Graph induced complex is of dimension " << stree.dimension() <<
-                   " - " << stree.num_simplices() << " simplices - " <<
-                   stree.num_vertices() << " vertices." << std::endl;
+    if (verb) {
+      std::cout << "Graph induced complex is of dimension " << stree.dimension() << " - " << stree.num_simplices()
+                << " simplices - " << stree.num_vertices() << " vertices." << std::endl;
 
       std::cout << "Iterator on graph induced complex simplices" << std::endl;
       for (auto f_simplex : stree.filtration_simplex_range()) {
diff --git a/src/Nerve_GIC/example/Nerve.cpp b/src/Nerve_GIC/example/Nerve.cpp
index 71f12f5d..598ecc03 100644
--- a/src/Nerve_GIC/example/Nerve.cpp
+++ b/src/Nerve_GIC/example/Nerve.cpp
@@ -22,7 +22,7 @@
 
 #include <gudhi/GIC.h>
 
-void usage(int nbArgs, char * const progName) {
+void usage(int nbArgs, char *const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
   std::cerr << "Usage: " << progName << " filename.off coordinate resolution gain [--v] \n";
   std::cerr << "       i.e.: " << progName << " ../../data/points/human.off 2 10 0.3 --v \n";
@@ -38,7 +38,8 @@ int main(int argc, char **argv) {
   int coord = atoi(argv[2]);
   int resolution = atoi(argv[3]);
   double gain = atof(argv[4]);
-  bool verb = 0; if(argc == 6)  verb = 1;
+  bool verb = 0;
+  if (argc == 6) verb = 1;
 
   // --------------------------------
   // Init of a Nerve from an OFF file
@@ -49,32 +50,33 @@ int main(int argc, char **argv) {
 
   bool check = SC.read_point_cloud(off_file_name);
 
-  if(!check)  std::cout << "Incorrect OFF file." << std::endl;
-  else{
-
+  if (!check) {
+    std::cout << "Incorrect OFF file." << std::endl;
+  } else {
     SC.set_type("Nerve");
 
     SC.set_color_from_coordinate(coord);
     SC.set_function_from_coordinate(coord);
 
     SC.set_graph_from_OFF();
-    SC.set_resolution_with_interval_number(resolution); SC.set_gain(gain);
+    SC.set_resolution_with_interval_number(resolution);
+    SC.set_gain(gain);
     SC.set_cover_from_function();
 
     SC.find_simplices();
 
     SC.write_info();
 
-    Gudhi::Simplex_tree<> stree; SC.create_complex(stree);
+    Gudhi::Simplex_tree<> stree;
+    SC.create_complex(stree);
 
     // ----------------------------------------------------------------------------
     // Display information about the graph induced complex
     // ----------------------------------------------------------------------------
 
-    if(verb){
-      std::cout << "Nerve is of dimension " << stree.dimension() <<
-                     " - " << stree.num_simplices() << " simplices - " <<
-                     stree.num_vertices() << " vertices." << std::endl;
+    if (verb) {
+      std::cout << "Nerve is of dimension " << stree.dimension() << " - " << stree.num_simplices() << " simplices - "
+                << stree.num_vertices() << " vertices." << std::endl;
 
       std::cout << "Iterator on Nerve simplices" << std::endl;
       for (auto f_simplex : stree.filtration_simplex_range()) {
diff --git a/src/Nerve_GIC/example/VoronoiGIC.cpp b/src/Nerve_GIC/example/VoronoiGIC.cpp
index 8ce64819..ef4f663c 100644
--- a/src/Nerve_GIC/example/VoronoiGIC.cpp
+++ b/src/Nerve_GIC/example/VoronoiGIC.cpp
@@ -22,10 +22,10 @@
 
 #include <gudhi/GIC.h>
 
-void usage(int nbArgs, char * const progName) {
+void usage(int nbArgs, char *const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
   std::cerr << "Usage: " << progName << " filename.off N [--v] \n";
-  std::cerr << "       i.e.: " << progName << " ../../../../data/points/human.off 100 --v \n";
+  std::cerr << "       i.e.: " << progName << " ../../data/points/human.off 100 --v \n";
   exit(-1);  // ----- >>
 }
 
@@ -36,7 +36,8 @@ int main(int argc, char **argv) {
 
   std::string off_file_name(argv[1]);
   int m = atoi(argv[2]);
-  bool verb = 0; if(argc == 4)  verb = 1;
+  bool verb = 0;
+  if (argc == 4) verb = 1;
 
   // ----------------------------------------------------------------------------
   // Init of a graph induced complex from an OFF file
@@ -47,30 +48,30 @@ int main(int argc, char **argv) {
 
   bool check = GIC.read_point_cloud(off_file_name);
 
-  if(!check)  std::cout << "Incorrect OFF file." << std::endl;
-  else{
-
+  if (!check) {
+    std::cout << "Incorrect OFF file." << std::endl;
+  } else {
     GIC.set_type("GIC");
 
     GIC.set_color_from_coordinate();
 
     GIC.set_graph_from_OFF();
-    GIC.set_cover_from_Voronoi(Gudhi::Euclidean_distance(),m);
+    GIC.set_cover_from_Voronoi(Gudhi::Euclidean_distance(), m);
 
     GIC.find_simplices();
 
     GIC.plot_OFF();
 
-    Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);
+    Gudhi::Simplex_tree<> stree;
+    GIC.create_complex(stree);
 
     // ----------------------------------------------------------------------------
     // Display information about the graph induced complex
     // ----------------------------------------------------------------------------
 
-    if(verb){
-      std::cout << "Graph induced complex is of dimension " << stree.dimension() <<
-                     " - " << stree.num_simplices() << " simplices - " <<
-                     stree.num_vertices() << " vertices." << std::endl;
+    if (verb) {
+      std::cout << "Graph induced complex is of dimension " << stree.dimension() << " - " << stree.num_simplices()
+                << " simplices - " << stree.num_vertices() << " vertices." << std::endl;
 
       std::cout << "Iterator on graph induced complex simplices" << std::endl;
       for (auto f_simplex : stree.filtration_simplex_range()) {