Commited Marc's remarks

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

Former-commit-id: d87eb82f60f4f943f59622f33521bcdce7873091

2 files changed, 6 insertions, 17 deletions

diff --git a/src/Witness_complex/example/witness_complex_from_file.cpp b/src/Witness_complex/example/witness_complex_from_file.cpp
index 77109512..98d1fe9c 100644
--- a/src/Witness_complex/example/witness_complex_from_file.cpp
+++ b/src/Witness_complex/example/witness_complex_from_file.cpp
@@ -68,17 +68,6 @@ read_points_cust(std::string file_name, std::vector< std::vector< double > > & p
   in_file.close();
 }
 
-/** Write a gnuplot readable file.
- *  Data range is a random access range of pairs (arg, value)
- */
-template < typename Data_range >
-void write_data(Data_range & data, std::string filename) {
-  std::ofstream ofs(filename, std::ofstream::out);
-  for (auto entry : data)
-    ofs << entry.first << ", " << entry.second << "\n";
-  ofs.close();
-}
-
 int main(int argc, char * const argv[]) {
   if (argc != 3) {
     std::cerr << "Usage: " << argv[0]
@@ -109,7 +98,7 @@ int main(int argc, char * const argv[]) {
 
   // Compute witness complex
   start = clock();
-  WitnessComplex(knn, simplex_tree, nbL, point_vector[0].size());
+  WitnessComplex(knn, nbL, point_vector[0].size(), simplex_tree);
   end = clock();
   std::cout << "Witness complex took "
       << static_cast<double>(end - start) / CLOCKS_PER_SEC << " s. \n";
diff --git a/src/Witness_complex/example/witness_complex_sphere.cpp b/src/Witness_complex/example/witness_complex_sphere.cpp
index f9d0b5a2..fae80d67 100644
--- a/src/Witness_complex/example/witness_complex_sphere.cpp
+++ b/src/Witness_complex/example/witness_complex_sphere.cpp
@@ -60,11 +60,11 @@ void write_data(Data_range & data, std::string filename) {
 int main(int argc, char * const argv[]) {
   if (argc != 2) {
     std::cerr << "Usage: " << argv[0]
-        << " nbL \n";
+        << " number_of_landmarks \n";
     return 0;
   }
 
-  int nbL = atoi(argv[1]);
+  int number_of_landmarks = atoi(argv[1]);
   clock_t start, end;
 
   // Construct the Simplex Tree
@@ -82,13 +82,13 @@ int main(int argc, char * const argv[]) {
     // Choose landmarks
     start = clock();
     std::vector<std::vector< int > > knn;
-    Gudhi::witness_complex::landmark_choice_by_random_point(point_vector, nbL, knn);
+    Gudhi::witness_complex::landmark_choice_by_random_point(point_vector, number_of_landmarks, knn);
 
     // Compute witness complex
-    WitnessComplex(knn, simplex_tree, nbL, point_vector[0].size());
+    WitnessComplex(knn, number_of_landmarks, point_vector[0].size(), simplex_tree);
     end = clock();
     double time = static_cast<double>(end - start) / CLOCKS_PER_SEC;
-    std::cout << "Witness complex for " << nbL << " landmarks took "
+    std::cout << "Witness complex for " << number_of_landmarks << " landmarks took "
         << time << " s. \n";
     std::cout << "Number of simplices is: " << simplex_tree.num_simplices() << "\n";
     l_time.push_back(std::make_pair(nbP, time));