Manual merge of skb_simplex_insertion after last trunk big modifications on Skbl

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

Former-commit-id: d7f7721e2963de439a28040196423d4c0df07d3f

1 files changed, 12 insertions, 12 deletions

diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h
index b33b9606..50a83345 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_sub_complex.h
@@ -66,12 +66,12 @@ class Skeleton_blocker_sub_complex : public ComplexType {
 
  public:
   using ComplexType::add_vertex;
-  using ComplexType::add_edge;
+  using ComplexType::add_edge_without_blockers;
   using ComplexType::add_blocker;
 
   typedef typename ComplexType::Vertex_handle Vertex_handle;
   typedef typename ComplexType::Root_vertex_handle Root_vertex_handle;
-  typedef typename ComplexType::Simplex_handle Simplex_handle;
+  typedef typename ComplexType::Simplex Simplex;
   typedef typename ComplexType::Root_simplex_handle Root_simplex_handle;
 
  protected:
@@ -109,11 +109,11 @@ class Skeleton_blocker_sub_complex : public ComplexType {
    * It assumes that both vertices corresponding to v1_root and v2_root are present
    * in the sub-complex.
    */
-  void add_edge(Root_vertex_handle v1_root, Root_vertex_handle v2_root) {
+  void add_edge_without_blockers(Root_vertex_handle v1_root, Root_vertex_handle v2_root) {
     auto v1_sub(this->get_address(v1_root));
     auto v2_sub(this->get_address(v2_root));
     assert(v1_sub && v2_sub);
-    this->ComplexType::add_edge(*v1_sub, *v2_sub);
+    this->ComplexType::add_edge_without_blockers(*v1_sub, *v2_sub);
   }
 
   /**
@@ -124,7 +124,7 @@ class Skeleton_blocker_sub_complex : public ComplexType {
   void add_blocker(const Root_simplex_handle& blocker_root) {
     auto blocker_sub = this->get_address(blocker_root);
     assert(blocker_sub);
-    this->add_blocker(new Simplex_handle(*blocker_sub));
+    this->add_blocker(new Simplex(*blocker_sub));
   }
 
  public:
@@ -133,7 +133,7 @@ class Skeleton_blocker_sub_complex : public ComplexType {
    * vertices of 'simplex'.
    */
   void make_restricted_complex(const ComplexType & parent_complex,
-                               const Simplex_handle& simplex) {
+                               const Simplex& simplex) {
     this->clear();
     // add vertices to the sub complex
     for (auto x : simplex) {
@@ -145,11 +145,11 @@ class Skeleton_blocker_sub_complex : public ComplexType {
     // add edges to the sub complex
     for (auto x : simplex) {
       // x_neigh is the neighbor of x intersected with vertices_simplex
-      Simplex_handle x_neigh;
+      Simplex x_neigh;
       parent_complex.add_neighbours(x, x_neigh, true);
       x_neigh.intersection(simplex);
       for (auto y : x_neigh) {
-        this->add_edge(parent_complex[x].get_id(), parent_complex[y].get_id());
+        this->add_edge_without_blockers(parent_complex[x].get_id(), parent_complex[y].get_id());
       }
     }
 
@@ -158,9 +158,9 @@ class Skeleton_blocker_sub_complex : public ComplexType {
       // check if it is the first time we encounter the blocker
       if (simplex.contains(*blocker)) {
         Root_simplex_handle blocker_root(parent_complex.get_id(*(blocker)));
-        Simplex_handle blocker_restr(
+        Simplex blocker_restr(
             *(this->get_simplex_address(blocker_root)));
-        this->add_blocker(new Simplex_handle(blocker_restr));
+        this->add_blocker(new Simplex(blocker_restr));
       }
     }
   }
@@ -188,7 +188,7 @@ class Skeleton_blocker_sub_complex : public ComplexType {
   //  * Allocates a simplex in L corresponding to the simplex s in K
   //  * with its local adresses and returns an AddressSimplex.
   //  */
-  // boost::optional<Simplex_handle> get_address(const Root_simplex_handle & s) const;
+  // boost::optional<Simplex> get_address(const Root_simplex_handle & s) const;
 
 // private:
   /**
@@ -220,7 +220,7 @@ bool proper_face_in_union(
   // we test that all vertices of 'addresses_sigma_in_link' but 'vertex_to_be_ignored'
   // are in link1 if it is the case we construct the corresponding simplex
   bool vertices_sigma_are_in_link = true;
-  typename ComplexType::Simplex_handle sigma_in_link;
+  typename ComplexType::Simplex sigma_in_link;
   for (int i = 0; i < addresses_sigma_in_link.size(); ++i) {
     if (i != vertex_to_be_ignored) {
       if (!addresses_sigma_in_link[i]) {