1 files changed, 7 insertions, 13 deletions
diff --git a/src/Witness_complex/example/witness_complex_sphere.cpp b/src/Witness_complex/example/witness_complex_sphere.cpp
index 1ff35bff..b26c9f36 100644
--- a/src/Witness_complex/example/witness_complex_sphere.cpp
+++ b/src/Witness_complex/example/witness_complex_sphere.cpp
@@ -39,13 +39,6 @@
 
 #include "generators.h"
 
-using namespace Gudhi;
-using namespace Gudhi::witness_complex;
-
-typedef std::vector< Vertex_handle > typeVectorVertex;
-
-typedef Witness_complex< Simplex_tree<> > WitnessComplex;
-
 /** Write a gnuplot readable file.
  *  Data range is a random access range of pairs (arg, value)
  */
@@ -60,15 +53,15 @@ 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
-  Simplex_tree<> simplex_tree;
+  Gudhi::Simplex_tree<> simplex_tree;
 
   std::vector< std::pair<int, double> > l_time;
 
@@ -82,14 +75,15 @@ 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());
+    Gudhi::witness_complex::witness_complex(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));
   }
   write_data(l_time, "w_time.dat");