1 files changed, 15 insertions, 135 deletions

diff --git a/src/cython/include/Witness_complex_interface.h b/src/cython/include/Witness_complex_interface.h
index a753bc1d..38661cb6 100644
--- a/src/cython/include/Witness_complex_interface.h
+++ b/src/cython/include/Witness_complex_interface.h
@@ -25,161 +25,41 @@
 
 #include <gudhi/Simplex_tree.h>
 #include <gudhi/Witness_complex.h>
-#include <gudhi/Construct_closest_landmark_table.h>
-#include <gudhi/pick_n_random_points.h>
 
-#include "Persistent_cohomology_interface.h"
+#include "Simplex_tree_interface.h"
 
 #include <vector>
 #include <utility>  // std::pair
 #include <iostream>
+#include <cstddef>
 
 namespace Gudhi {
 
 namespace witness_complex {
 
 class Witness_complex_interface {
-  typedef typename Simplex_tree<>::Simplex_handle Simplex_handle;
-  typedef typename Simplex_tree<>::Filtration_value Filtration_value;
-  typedef typename Simplex_tree<>::Vertex_handle Vertex_handle;
-  typedef typename std::pair<Simplex_handle, bool> Insertion_result;
-  using Simplex = std::vector<Vertex_handle>;
-  using Filtered_complex = std::pair<Simplex, Filtration_value>;
-  using Complex_tree = std::vector<Filtered_complex>;
+  using Nearest_landmark_range = std::vector<std::pair<std::size_t, double>>;
+  using Nearest_landmark_table = std::vector<Nearest_landmark_range>;
 
  public:
-  Witness_complex_interface(std::vector<std::vector<double>>&points, int number_of_landmarks)
-  : pcoh_(nullptr) {
-    std::vector<std::vector< int > > knn;
-    std::vector<std::vector<double>> landmarks;
-    Gudhi::subsampling::pick_n_random_points(points, number_of_landmarks, std::back_inserter(landmarks));
-    Gudhi::witness_complex::construct_closest_landmark_table<Filtration_value>(points, landmarks, knn);
-
-    Gudhi::witness_complex::witness_complex(knn, number_of_landmarks, points[0].size(), simplex_tree_);
+  Witness_complex_interface(Nearest_landmark_table& nlt) {
+    witness_complex_ = new Witness_complex<Nearest_landmark_table>(nlt);
   }
 
-  bool find_simplex(const Simplex& vh) {
-    return (simplex_tree_.find(vh) != simplex_tree_.null_simplex());
+  void create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double  max_alpha_square,
+                           std::size_t limit_dimension) {
+    witness_complex_->create_complex(*simplex_tree, max_alpha_square, limit_dimension);
+    simplex_tree->initialize_filtration();
   }
 
-  bool insert_simplex_and_subfaces(const Simplex& complex, Filtration_value filtration = 0) {
-    Insertion_result result = simplex_tree_.insert_simplex_and_subfaces(complex, filtration);
-    return (result.second);
+  void create_simplex_tree(Simplex_tree_interface<>* simplex_tree,
+                           double  max_alpha_square) {
+    witness_complex_->create_complex(*simplex_tree, max_alpha_square, std::numeric_limits<std::size_t>::max());
+    simplex_tree->initialize_filtration();
   }
 
-  Filtration_value simplex_filtration(const Simplex& complex) {
-    return simplex_tree_.filtration(simplex_tree_.find(complex));
-  }
-
-  void remove_maximal_simplex(const Simplex& complex) {
-    return simplex_tree_.remove_maximal_simplex(simplex_tree_.find(complex));
-  }
-
-  Complex_tree get_filtered_tree() {
-    Complex_tree filtered_tree;
-    for (auto f_simplex : simplex_tree_.filtration_simplex_range()) {
-      Simplex simplex;
-      for (auto vertex : simplex_tree_.simplex_vertex_range(f_simplex)) {
-        simplex.insert(simplex.begin(), vertex);
-      }
-      filtered_tree.push_back(std::make_pair(simplex, simplex_tree_.filtration(f_simplex)));
-    }
-    return filtered_tree;
-
-  }
-
-  Complex_tree get_skeleton_tree(int dimension) {
-    Complex_tree skeleton_tree;
-    for (auto f_simplex : simplex_tree_.skeleton_simplex_range(dimension)) {
-      Simplex simplex;
-      for (auto vertex : simplex_tree_.simplex_vertex_range(f_simplex)) {
-        simplex.insert(simplex.begin(), vertex);
-      }
-      skeleton_tree.push_back(std::make_pair(simplex, simplex_tree_.filtration(f_simplex)));
-    }
-    return skeleton_tree;
-  }
-
-  Complex_tree get_star_tree(const Simplex& complex) {
-    Complex_tree star_tree;
-    for (auto f_simplex : simplex_tree_.star_simplex_range(simplex_tree_.find(complex))) {
-      Simplex simplex;
-      for (auto vertex : simplex_tree_.simplex_vertex_range(f_simplex)) {
-        simplex.insert(simplex.begin(), vertex);
-      }
-      star_tree.push_back(std::make_pair(simplex, simplex_tree_.filtration(f_simplex)));
-    }
-    return star_tree;
-  }
-
-  Complex_tree get_coface_tree(const Simplex& complex, int dimension) {
-    Complex_tree coface_tree;
-    for (auto f_simplex : simplex_tree_.cofaces_simplex_range(simplex_tree_.find(complex), dimension)) {
-      Simplex simplex;
-      for (auto vertex : simplex_tree_.simplex_vertex_range(f_simplex)) {
-        simplex.insert(simplex.begin(), vertex);
-      }
-      coface_tree.push_back(std::make_pair(simplex, simplex_tree_.filtration(f_simplex)));
-    }
-    return coface_tree;
-  }
-
-  // Specific to Witness complex because no inheritance
-  Filtration_value filtration() const {
-    return simplex_tree_.filtration();
-  }
-
-  void set_filtration(Filtration_value fil) {
-    simplex_tree_.set_filtration(fil);
-  }
-
-  void initialize_filtration() {
-    simplex_tree_.initialize_filtration();
-  }
-
-  size_t num_vertices() const {
-    return simplex_tree_.num_vertices();
-  }
-
-  size_t num_simplices() {
-    return simplex_tree_.num_simplices();
-  }
-
-  int dimension() const {
-    return simplex_tree_.dimension();
-  }
-
-  void set_dimension(int dimension) {
-    simplex_tree_.set_dimension(dimension);
-  }
-
-  std::vector<std::pair<int, std::pair<double, double>>> get_persistence(int homology_coeff_field, double min_persistence) {
-    if (pcoh_ != nullptr) {
-      delete pcoh_;
-    }
-    pcoh_ = new Persistent_cohomology_interface<Simplex_tree<>>(&simplex_tree_);
-    return pcoh_->get_persistence(homology_coeff_field, min_persistence);
-  }
-  
-  std::vector<int> get_betti_numbers() const {
-    if (pcoh_ != nullptr) {
-      return pcoh_->betti_numbers();
-    }
-    std::vector<int> betti_numbers;
-    return betti_numbers;
-  }
-
-  std::vector<int> get_persistent_betti_numbers(Filtration_value from, Filtration_value to) const {
-    if (pcoh_ != nullptr) {
-      return pcoh_->persistent_betti_numbers(from, to);
-    }
-    std::vector<int> persistent_betti_numbers;
-    return persistent_betti_numbers;
-  }
-  
  private:
-  Simplex_tree<> simplex_tree_;
-  Persistent_cohomology_interface<Simplex_tree<>>* pcoh_;
+  Witness_complex<Nearest_landmark_table>* witness_complex_;
 
 };