1 files changed, 98 insertions, 11 deletions
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h
index 4d71b3f5..ce565166 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h
@@ -48,20 +48,20 @@ namespace skbl {
 template<typename SkeletonBlockerComplex, typename Link>
 class Simplex_around_vertex_iterator :
 public boost::iterator_facade < Simplex_around_vertex_iterator<SkeletonBlockerComplex, Link>
-, typename SkeletonBlockerComplex::Simplex_handle
+, typename SkeletonBlockerComplex::Simplex
 , boost::forward_traversal_tag
-, typename SkeletonBlockerComplex::Simplex_handle
+, typename SkeletonBlockerComplex::Simplex
 > {
   friend class boost::iterator_core_access;
   typedef SkeletonBlockerComplex Complex;
   typedef typename Complex::Vertex_handle Vertex_handle;
   typedef typename Complex::Edge_handle Edge_handle;
-  typedef typename Complex::Simplex_handle Simplex_handle;
+  typedef typename Complex::Simplex Simplex;
 
   // Link_vertex_handle == Complex_Vertex_handle but this renaming helps avoiding confusion
   typedef typename Link::Vertex_handle Link_vertex_handle;
 
-  typedef typename Gudhi::skbl::Trie<Simplex_handle> Trie;
+  typedef typename Gudhi::skbl::Trie<Simplex> Trie;
 
  private:
   const Complex* complex;
@@ -120,7 +120,7 @@ public boost::iterator_facade < Simplex_around_vertex_iterator<SkeletonBlockerCo
     Trie* res = new Trie(parent_vertex(link_vh), parent);
     for (Link_vertex_handle nv : link_v->vertex_range(link_vh)) {
       if (link_vh < nv) {
-        Simplex_handle simplex_node_plus_nv(res->simplex());
+        Simplex simplex_node_plus_nv(res->simplex());
         simplex_node_plus_nv.add_vertex(parent_vertex(nv));
         if (complex->contains(simplex_node_plus_nv)) {
           res->add_child(build_trie(nv, res));
@@ -176,13 +176,13 @@ public boost::iterator_facade < Simplex_around_vertex_iterator<SkeletonBlockerCo
     }
   }
 
-  Simplex_handle dereference() const {
+  Simplex dereference() const {
     assert(!nodes_to_be_seen.empty());
     Trie* first_node = nodes_to_be_seen.front();
     return first_node->simplex();
   }
 
-  Simplex_handle get_trie_address() const {
+  Simplex get_trie_address() const {
     assert(!nodes_to_be_seen.empty());
     return nodes_to_be_seen.front();
   }
@@ -200,9 +200,9 @@ public boost::iterator_facade < Simplex_around_vertex_iterator<SkeletonBlockerCo
 template<typename SkeletonBlockerComplex>
 class Simplex_iterator :
 public boost::iterator_facade < Simplex_iterator<SkeletonBlockerComplex>
-, typename SkeletonBlockerComplex::Simplex_handle
+, typename SkeletonBlockerComplex::Simplex
 , boost::forward_traversal_tag
-, typename SkeletonBlockerComplex::Simplex_handle
+, typename SkeletonBlockerComplex::Simplex
 > {
   typedef Skeleton_blocker_link_superior<SkeletonBlockerComplex> Link;
 
@@ -213,7 +213,7 @@ public boost::iterator_facade < Simplex_iterator<SkeletonBlockerComplex>
   typedef SkeletonBlockerComplex Complex;
   typedef typename Complex::Vertex_handle Vertex_handle;
   typedef typename Complex::Edge_handle Edge_handle;
-  typedef typename Complex::Simplex_handle Simplex_handle;
+  typedef typename Complex::Simplex Simplex;
   typedef typename Complex::Complex_vertex_iterator Complex_vertex_iterator;
   typedef typename Link::Vertex_handle Link_vertex_handle;
 
@@ -290,7 +290,7 @@ public boost::iterator_facade < Simplex_iterator<SkeletonBlockerComplex>
     }
   }
 
-  Simplex_handle dereference() const {
+  Simplex dereference() const {
     return current_simplex_around_current_vertex_.dereference();
   }
 
@@ -304,6 +304,93 @@ public boost::iterator_facade < Simplex_iterator<SkeletonBlockerComplex>
   }
 };
 
+/**
+ * Iterator through the maximal faces of the coboundary of a simplex.
+ */ 
+template<typename SkeletonBlockerComplex, typename Link>
+class Simplex_coboundary_iterator :
+public boost::iterator_facade < Simplex_coboundary_iterator<SkeletonBlockerComplex, Link>
+, typename SkeletonBlockerComplex::Simplex, boost::forward_traversal_tag, typename SkeletonBlockerComplex::Simplex> {
+  friend class boost::iterator_core_access;
+  typedef SkeletonBlockerComplex Complex;
+  typedef typename Complex::Vertex_handle Vertex_handle;
+  typedef typename Complex::Edge_handle Edge_handle;
+  typedef typename Complex::Simplex Simplex;
+  typedef typename Complex::Complex_vertex_iterator Complex_vertex_iterator;
+
+  // Link_vertex_handle == Complex_Vertex_handle but this renaming helps avoiding confusion
+  typedef typename Link::Vertex_handle Link_vertex_handle;
+
+ private:
+  const Complex* complex;
+  const Simplex& sigma;
+  std::shared_ptr<Link> link;
+  Complex_vertex_iterator current_vertex;
+  Complex_vertex_iterator link_vertex_end;
+
+ public:
+  Simplex_coboundary_iterator() : complex(0) {}
+
+  Simplex_coboundary_iterator(const Complex* complex_, const Simplex& sigma_) :
+      complex(complex_),
+      sigma(sigma_),
+      //need only vertices of the link hence the true flag
+      link(new Link(*complex_, sigma_, false, true)) {
+    auto link_vertex_range = link->vertex_range();
+    current_vertex = link_vertex_range.begin();
+    link_vertex_end = link_vertex_range.end();
+  }
+
+  Simplex_coboundary_iterator(const Simplex_coboundary_iterator& other) :
+      complex(other.complex),
+      sigma(other.sigma),
+      link(other.link),
+      current_vertex(other.current_vertex),
+      link_vertex_end(other.link_vertex_end) { }
+  
+  // returns an iterator to the end
+  Simplex_coboundary_iterator(const Complex* complex_,const Simplex& sigma_, bool end) :
+      complex(complex_),
+      sigma(sigma_) {
+    // to represent an end iterator without having to build a useless link, we use
+    // the convection that link is not initialized.
+  }
+
+ private:
+  Vertex_handle parent_vertex(Link_vertex_handle link_vh) const {
+    return complex->convert_handle_from_another_complex(*link, link_vh);
+  }
+
+public:
+  friend std::ostream& operator<<(std::ostream& stream, const Simplex_coboundary_iterator& sci) {
+    return stream;
+  }
+
+  // assume that iterator points to the same complex and comes from the same simplex
+  bool equal(const Simplex_coboundary_iterator& other) const {
+    assert(complex == other.complex && sigma == other.sigma);
+    if(is_end()) return other.is_end();
+    if(other.is_end()) return is_end();
+    return *current_vertex == *(other.current_vertex);
+  }
+
+  void increment() {
+    ++current_vertex;
+  }
+
+  Simplex dereference() const {
+    Simplex res(sigma);
+    res.add_vertex(parent_vertex(*current_vertex));
+    return res;
+  }
+
+private:
+  bool is_end() const {
+    return !link || current_vertex == link_vertex_end;
+  }
+};
+
+
 }  // namespace skbl
 
 }  // namespace Gudhi