Fix cpplint issues

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

Former-commit-id: f2c5ba756b7cd4115fb97eeb066216b312b4ae2f

5 files changed, 28 insertions, 23 deletions

diff --git a/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp
index 585f2f61..366ee2bc 100644
--- a/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp
+++ b/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp
@@ -22,12 +22,13 @@
 
 #include <gudhi/Persistence_vectors.h>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
-
 #include <iostream>
 #include <vector>
 
+using Euclidean_distance = Gudhi::Euclidean_distance;
+using Vector_distances_in_diagram =
+  Gudhi::Persistence_representations::Vector_distances_in_diagram<Euclidean_distance>;
+
 int main(int argc, char** argv) {
   std::cout << "This program computes average persistence vector of persistence vectors created based on persistence "
                "diagrams provided as an input. \n";
@@ -44,14 +45,14 @@ int main(int argc, char** argv) {
   }
 
   std::cout << "Reading persistence vectors...\n";
-  std::vector<Vector_distances_in_diagram<Euclidean_distance>*> lands;
+  std::vector<Vector_distances_in_diagram*> lands;
   for (size_t i = 0; i != filenames.size(); ++i) {
-    Vector_distances_in_diagram<Euclidean_distance>* l = new Vector_distances_in_diagram<Euclidean_distance>;
+    Vector_distances_in_diagram* l = new Vector_distances_in_diagram;
     l->load_from_file(filenames[i]);
     lands.push_back(l);
   }
 
-  Vector_distances_in_diagram<Euclidean_distance> av;
+  Vector_distances_in_diagram av;
   av.compute_average(lands);
 
   av.print_to_file("average.vect");
diff --git a/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
index 79906262..3aed297e 100644
--- a/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
+++ b/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
@@ -22,14 +22,15 @@
 
 #include <gudhi/Persistence_vectors.h>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
-
 #include <iostream>
 #include <sstream>
 #include <limits>
 #include <vector>
 
+using Euclidean_distance = Gudhi::Euclidean_distance;
+using Vector_distances_in_diagram =
+  Gudhi::Persistence_representations::Vector_distances_in_diagram<Euclidean_distance>;
+
 int main(int argc, char** argv) {
   std::cout << "This program compute distance of persistence vectors stored in a file (the file needs to be created "
                "beforehand). \n";
@@ -52,10 +53,10 @@ int main(int argc, char** argv) {
   for (int i = 2; i < argc; ++i) {
     filenames.push_back(argv[i]);
   }
-  std::vector<Vector_distances_in_diagram<Euclidean_distance> > vectors;
+  std::vector<Vector_distances_in_diagram> vectors;
   vectors.reserve(filenames.size());
   for (size_t file_no = 0; file_no != filenames.size(); ++file_no) {
-    Vector_distances_in_diagram<Euclidean_distance> l;
+    Vector_distances_in_diagram l;
     l.load_from_file(filenames[file_no]);
     vectors.push_back(l);
   }
diff --git a/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
index a5916ed8..d9ad4360 100644
--- a/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
+++ b/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
@@ -22,14 +22,15 @@
 
 #include <gudhi/Persistence_vectors.h>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
-
 #include <iostream>
 #include <sstream>
 #include <limits>
 #include <vector>
 
+using Euclidean_distance = Gudhi::Euclidean_distance;
+using Vector_distances_in_diagram =
+  Gudhi::Persistence_representations::Vector_distances_in_diagram<Euclidean_distance>;
+
 int main(int argc, char** argv) {
   std::cout << "This program compute scalar product of persistence vectors stored in a file (the file needs to be "
                "created beforehand). \n";
@@ -39,10 +40,10 @@ int main(int argc, char** argv) {
   for (int i = 1; i < argc; ++i) {
     filenames.push_back(argv[i]);
   }
-  std::vector<Vector_distances_in_diagram<Euclidean_distance> > vectors;
+  std::vector<Vector_distances_in_diagram> vectors;
   vectors.reserve(filenames.size());
   for (size_t file_no = 0; file_no != filenames.size(); ++file_no) {
-    Vector_distances_in_diagram<Euclidean_distance> l;
+    Vector_distances_in_diagram l;
     l.load_from_file(filenames[file_no]);
     vectors.push_back(l);
   }
diff --git a/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp
index 0941308f..b618ca67 100644
--- a/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp
+++ b/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp
@@ -22,14 +22,15 @@
 
 #include <gudhi/Persistence_vectors.h>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
-
 #include <iostream>
 #include <sstream>
 #include <limits>
 #include <vector>
 
+using Euclidean_distance = Gudhi::Euclidean_distance;
+using Vector_distances_in_diagram =
+  Gudhi::Persistence_representations::Vector_distances_in_diagram<Euclidean_distance>;
+
 int main(int argc, char** argv) {
   std::cout << "This program creates persistence vectors of diagrams provided as an input. The first parameter of this "
                "program is a dimension of persistence ";
@@ -52,7 +53,7 @@ int main(int argc, char** argv) {
 
   for (size_t i = 0; i != filenames.size(); ++i) {
     std::cerr << "Creating persistence vectors based on a file : " << filenames[i] << std::endl;
-    Vector_distances_in_diagram<Euclidean_distance> l(filenames[i], dimension);
+    Vector_distances_in_diagram l(filenames[i], dimension);
     std::stringstream ss;
     ss << filenames[i] << ".vect";
     l.print_to_file(ss.str().c_str());
diff --git a/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp
index d8846ed7..41589edc 100644
--- a/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp
+++ b/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp
@@ -22,12 +22,13 @@
 
 #include <gudhi/Persistence_vectors.h>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
-
 #include <iostream>
 #include <sstream>
 
+using Euclidean_distance = Gudhi::Euclidean_distance;
+using Vector_distances_in_diagram =
+  Gudhi::Persistence_representations::Vector_distances_in_diagram<Euclidean_distance>;
+
 int main(int argc, char** argv) {
   std::cout << "This program create a Gnuplot script to plot persistence vector. Please call this program with the "
                "name of file with persistence vector. \n";