Fix some cpplint

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

Former-commit-id: 0a6422b0fa27105b9aaba743371da3328d9039be

6 files changed, 20 insertions, 33 deletions

diff --git a/src/Persistence_representations/example/CMakeLists.txt b/src/Persistence_representations/example/CMakeLists.txt
index 3c783d36..3357017a 100644
--- a/src/Persistence_representations/example/CMakeLists.txt
+++ b/src/Persistence_representations/example/CMakeLists.txt
@@ -1,27 +1,24 @@
 cmake_minimum_required(VERSION 2.6)
-project(GUDHI_STAT)
+project(Persistence_representations_example)
 
 file(COPY "simple_diagram.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+
 add_executable ( persistence_landscape_on_grid persistence_landscape_on_grid.cpp )
 target_link_libraries(persistence_landscape_on_grid ${Boost_SYSTEM_LIBRARY})
 add_test ( persistence_landscape_on_grid ${CMAKE_CURRENT_BINARY_DIR}/persistence_landscape_on_grid )
 
-file(COPY "simple_diagram.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 add_executable ( persistence_landscape persistence_landscape.cpp )
 target_link_libraries(persistence_landscape ${Boost_SYSTEM_LIBRARY})
 add_test ( persistence_landscape ${CMAKE_CURRENT_BINARY_DIR}/persistence_landscape )
 
-file(COPY "simple_diagram.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 add_executable ( persistence_intervals persistence_intervals.cpp )
 target_link_libraries(persistence_intervals ${Boost_SYSTEM_LIBRARY})
 add_test ( persistence_intervals ${CMAKE_CURRENT_BINARY_DIR}/persistence_intervals simple_diagram.txt )
 
-file(COPY "simple_diagram.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 add_executable ( persistence_vectors persistence_vectors.cpp )
 target_link_libraries(persistence_vectors ${Boost_SYSTEM_LIBRARY})
 add_test ( persistence_vectors ${CMAKE_CURRENT_BINARY_DIR}/persistence_vectors )
 
-file(COPY "simple_diagram.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 add_executable ( persistence_heat_maps persistence_heat_maps.cpp )
 target_link_libraries(persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
 add_test ( persistence_heat_maps ${CMAKE_CURRENT_BINARY_DIR}/persistence_heat_maps )
diff --git a/src/Persistence_representations/example/persistence_heat_maps.cpp b/src/Persistence_representations/example/persistence_heat_maps.cpp
index a9ac5df5..2a472ac6 100644
--- a/src/Persistence_representations/example/persistence_heat_maps.cpp
+++ b/src/Persistence_representations/example/persistence_heat_maps.cpp
@@ -20,17 +20,14 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/reader_utils.h>
 #include <gudhi/Persistence_heat_maps.h>
 
 #include <iostream>
 #include <vector>
 #include <utility>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
-
-double epsilon = 0.0000005;
+using constant_scaling_function = Gudhi::Persistence_representations::constant_scaling_function;
+using Persistence_heat_maps = Gudhi::Persistence_representations::Persistence_heat_maps<constant_scaling_function>;
 
 int main(int argc, char** argv) {
   // create two simple vectors with birth--death pairs:
@@ -50,30 +47,30 @@ int main(int argc, char** argv) {
 
   // over here we define a function we sill put on a top on every birth--death pair in the persistence interval. It can
   // be anything. Over here we will use standard Gaussian
-  std::vector<std::vector<double> > filter = create_Gaussian_filter(5, 1);
+  std::vector<std::vector<double> > filter = Gudhi::Persistence_representations::create_Gaussian_filter(5, 1);
 
   // creating two heat maps.
-  Persistence_heat_maps<constant_scaling_function> hm1(persistence1, filter, false, 20, 0, 11);
-  Persistence_heat_maps<constant_scaling_function> hm2(persistence2, filter, false, 20, 0, 11);
+  Persistence_heat_maps hm1(persistence1, filter, false, 20, 0, 11);
+  Persistence_heat_maps hm2(persistence2, filter, false, 20, 0, 11);
 
-  std::vector<Persistence_heat_maps<constant_scaling_function>*> vector_of_maps;
+  std::vector<Persistence_heat_maps*> vector_of_maps;
   vector_of_maps.push_back(&hm1);
   vector_of_maps.push_back(&hm2);
 
   // compute median/mean of a vector of heat maps:
-  Persistence_heat_maps<constant_scaling_function> mean;
+  Persistence_heat_maps mean;
   mean.compute_mean(vector_of_maps);
-  Persistence_heat_maps<constant_scaling_function> median;
+  Persistence_heat_maps median;
   median.compute_median(vector_of_maps);
 
   // to compute L^1 distance between hm1 and hm2:
   std::cout << "The L^1 distance is : " << hm1.distance(hm2, 1) << std::endl;
 
   // to average of hm1 and hm2:
-  std::vector<Persistence_heat_maps<constant_scaling_function>*> to_average;
+  std::vector<Persistence_heat_maps*> to_average;
   to_average.push_back(&hm1);
   to_average.push_back(&hm2);
-  Persistence_heat_maps<constant_scaling_function> av;
+  Persistence_heat_maps av;
   av.compute_average(to_average);
 
   // to compute scalar product of hm1 and hm2:
diff --git a/src/Persistence_representations/example/persistence_intervals.cpp b/src/Persistence_representations/example/persistence_intervals.cpp
index 29cd66f3..c1ceb458 100644
--- a/src/Persistence_representations/example/persistence_intervals.cpp
+++ b/src/Persistence_representations/example/persistence_intervals.cpp
@@ -20,15 +20,13 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/reader_utils.h>
 #include <gudhi/Persistence_intervals.h>
 
 #include <iostream>
 #include <utility>
 #include <vector>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
+using Persistence_intervals = Gudhi::Persistence_representations::Persistence_intervals;
 
 int main(int argc, char** argv) {
   if (argc != 2) {
diff --git a/src/Persistence_representations/example/persistence_landscape.cpp b/src/Persistence_representations/example/persistence_landscape.cpp
index 1bcc524a..400a9ae1 100644
--- a/src/Persistence_representations/example/persistence_landscape.cpp
+++ b/src/Persistence_representations/example/persistence_landscape.cpp
@@ -26,8 +26,7 @@
 #include <vector>
 #include <utility>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
+using Persistence_landscape = Gudhi::Persistence_representations::Persistence_landscape;
 
 int main(int argc, char** argv) {
   // create two simple vectors with birth--death pairs:
diff --git a/src/Persistence_representations/example/persistence_landscape_on_grid.cpp b/src/Persistence_representations/example/persistence_landscape_on_grid.cpp
index 0cede07e..b201b397 100644
--- a/src/Persistence_representations/example/persistence_landscape_on_grid.cpp
+++ b/src/Persistence_representations/example/persistence_landscape_on_grid.cpp
@@ -26,8 +26,7 @@
 #include <utility>
 #include <vector>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
+using Persistence_landscape_on_grid = Gudhi::Persistence_representations::Persistence_landscape_on_grid;
 
 int main(int argc, char** argv) {
   // create two simple vectors with birth--death pairs:
diff --git a/src/Persistence_representations/example/persistence_vectors.cpp b/src/Persistence_representations/example/persistence_vectors.cpp
index c6581039..59eca152 100644
--- a/src/Persistence_representations/example/persistence_vectors.cpp
+++ b/src/Persistence_representations/example/persistence_vectors.cpp
@@ -21,7 +21,6 @@
  */
 
 #include <gudhi/Persistence_vectors.h>
-#include <gudhi/reader_utils.h>
 
 #include <iostream>
 #include <vector>
@@ -30,8 +29,8 @@
 #include <limits>
 #include <utility>
 
-using namespace Gudhi;
-using namespace Gudhi::Persistence_representations;
+using Vector_distances_in_diagram =
+  Gudhi::Persistence_representations::Vector_distances_in_diagram<Gudhi::Euclidean_distance>;
 
 int main(int argc, char** argv) {
   // create two simple vectors with birth--death pairs:
@@ -50,17 +49,15 @@ int main(int argc, char** argv) {
   persistence2.push_back(std::make_pair(6, 10));
 
   // create two persistence vectors based on persistence1 and persistence2:
-  Vector_distances_in_diagram<Euclidean_distance> v1 =
-      Vector_distances_in_diagram<Euclidean_distance>(persistence1, std::numeric_limits<size_t>::max());
-  Vector_distances_in_diagram<Euclidean_distance> v2 =
-      Vector_distances_in_diagram<Euclidean_distance>(persistence2, std::numeric_limits<size_t>::max());
+  Vector_distances_in_diagram v1(persistence1, std::numeric_limits<size_t>::max());
+  Vector_distances_in_diagram v2(persistence2, std::numeric_limits<size_t>::max());
 
   // writing to a stream:
   std::cout << "v1 : " << v1 << std::endl;
   std::cout << "v2 : " << v2 << std::endl;
 
   // averages:
-  Vector_distances_in_diagram<Euclidean_distance> average;
+  Vector_distances_in_diagram average;
   average.compute_average({&v1, &v2});
   std::cout << "Average : " << average << std::endl;