Weak Witness + Active Witness. It compiles

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

Former-commit-id: 7307e01148fc7cadfc22bd136ebdf0d55c8da937

1 files changed, 10 insertions, 9 deletions

diff --git a/src/Witness_complex/example/witness_complex_sphere.cpp b/src/Witness_complex/example/witness_complex_sphere.cpp
index 3d4a54aa..5a041c3e 100644
--- a/src/Witness_complex/example/witness_complex_sphere.cpp
+++ b/src/Witness_complex/example/witness_complex_sphere.cpp
@@ -54,6 +54,8 @@ void write_data(Data_range & data, std::string filename) {
 }
 
 int main(int argc, char * const argv[]) {
+  typedef Gudhi::witness_complex::Witness_complex<CGAL::Epick_d<CGAL::Dynamic_dimension_tag>> Witness_complex;
+  
   if (argc != 2) {
     std::cerr << "Usage: " << argv[0]
         << " number_of_landmarks \n";
@@ -77,21 +79,20 @@ int main(int argc, char * const argv[]) {
 
     // Choose landmarks
     start = clock();
-    std::vector<std::vector< int > > knn;
-    Gudhi::subsampling::pick_n_random_points(point_vector, 100, std::back_inserter(landmarks));
-    Gudhi::witness_complex::construct_closest_landmark_table(point_vector, landmarks, knn);
+    Gudhi::subsampling::pick_n_random_points(point_vector, number_of_landmarks, std::back_inserter(landmarks));
 
     // Compute witness complex
-    // Gudhi::witness_complex::witness_complex(knn, number_of_landmarks, point_vector[0].size(), simplex_tree);
-    Gudhi::witness_complex::Witness_complex<Gudhi::Simplex_tree<>, CGAL::Epick_d<CGAL::Dynamic_dimension_tag>>(landmarks.begin(),
-                                                                                                               landmarks.end(),
-                                                                                                               point_vector.begin(),
-                                                                                                               point_vector.end(),
-                                                                                                               simplex_tree);
+    Witness_complex witness_complex(landmarks.begin(),
+                                    landmarks.end(),
+                                    point_vector.begin(),
+                                    point_vector.end());
+    witness_complex.create_complex(simplex_tree, 0);
     end = clock();
     double time = static_cast<double>(end - start) / CLOCKS_PER_SEC;
     std::cout << "Witness complex for " << number_of_landmarks << " landmarks took "
         << time << " s. \n";
+    assert(1 == 0);
+    std::cout << simplex_tree << "\n";
     std::cout << "Number of simplices is: " << simplex_tree.num_simplices() << "\n";
     l_time.push_back(std::make_pair(nbP, time));
   }