1 files changed, 10 insertions, 36 deletions

diff --git a/src/cython/include/Euclidean_witness_complex_interface.h b/src/cython/include/Euclidean_witness_complex_interface.h
index f79d93ab..efa8885f 100644
--- a/src/cython/include/Euclidean_witness_complex_interface.h
+++ b/src/cython/include/Euclidean_witness_complex_interface.h
@@ -52,11 +52,6 @@ class Euclidean_witness_complex_interface {
       witnesses_(witnesses.begin(), witnesses.end()),
       witness_complex_(landmarks_, witnesses_) {
   }
-  Euclidean_witness_complex_interface(std::vector<Point_d>&landmarks, std::vector<Point_d>&witnesses)
-    : landmarks_(landmarks.begin(), landmarks.end()),
-      witnesses_(witnesses.begin(), witnesses.end()),
-      witness_complex_(landmarks_, witnesses_) {
-  }
 
   void create_simplex_tree(Gudhi::Simplex_tree<>* simplex_tree, double max_alpha_square, std::size_t limit_dimension) {
     witness_complex_.create_complex(*simplex_tree, max_alpha_square, limit_dimension);
@@ -68,42 +63,21 @@ class Euclidean_witness_complex_interface {
     simplex_tree->initialize_filtration();
   }
 
- private:
-  std::vector<Point_d> landmarks_;
-  std::vector<Point_d> witnesses_;
-  Euclidean_witness_complex<Dynamic_kernel> witness_complex_;
-};
-
-/*template<typename Kernel = CGAL::Epick_d<CGAL::Dynamic_dimension_tag>>
-class Euclidean_witness_complex_interface : public Euclidean_witness_complex<Kernel> {
-//class Euclidean_witness_complex_interface {
-  using Point_d = Kernel::Point_d;
-
- public:
-  Euclidean_witness_complex_interface(const std::vector<std::vector<double>>& landmarks, const std::vector<std::vector<double>>& witnesses) {
-    : landmarks_(std::begin(landmarks), std::end(landmarks)),
-      witnesses_(std::begin(witnesses), std::end(witnesses)),
-      Gudhi::witness_complex::Euclidean_witness_complex<Kernel>(landmarks_, witnesses_) {
-  }
-
-  void create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double  max_alpha_square,
-                           std::size_t limit_dimension) {
-    create_complex(*simplex_tree, max_alpha_square, limit_dimension);
-    simplex_tree->initialize_filtration();
-  }
-
-  void create_simplex_tree(Simplex_tree_interface<>* simplex_tree,
-                           double  max_alpha_square) {
-    create_complex(*simplex_tree, max_alpha_square);
-    simplex_tree->initialize_filtration();
+  std::vector<double> get_point(unsigned vh) {
+    std::vector<double> vd;
+    if (vh < landmarks_.size()) {
+      Point_d ph = witness_complex_.get_point(vh);
+      for (auto coord = ph.cartesian_begin(); coord < ph.cartesian_end(); coord++)
+        vd.push_back(*coord);
+    }
+    return vd;
   }
 
  private:
-//  Euclidean_witness_complex<Kernel>* witness_complex_;
   std::vector<Point_d> landmarks_;
   std::vector<Point_d> witnesses_;
-
-};*/
+  Euclidean_witness_complex<Dynamic_kernel> witness_complex_;
+};
 
 }  // namespace witness_complex