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, 14 insertions, 15 deletions

diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp
index 2738c01c..5935a56d 100644
--- a/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp
+++ b/src/Skeleton_blocker/example/Skeleton_blocker_from_simplices.cpp
@@ -35,24 +35,23 @@ using namespace skbl;
 
 typedef Skeleton_blocker_complex<Skeleton_blocker_simple_traits> Complex;
 typedef Complex::Vertex_handle Vertex_handle;
-typedef Complex::Simplex_handle Simplex_handle;
-typedef Complex::Simplex_handle Simplex;
+typedef Complex::Simplex Simplex;
 
 int main(int argc, char *argv[]) {
-  std::vector<Simplex_handle> simplices;
+  std::vector<Simplex> simplices;
 
   // add 4 triangles of a tetrahedron 0123
-  simplices.push_back(Simplex_handle(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2)));
-  simplices.push_back(Simplex_handle(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3)));
-  simplices.push_back(Simplex_handle(Vertex_handle(3), Vertex_handle(0), Vertex_handle(2)));
-  simplices.push_back(Simplex_handle(Vertex_handle(3), Vertex_handle(0), Vertex_handle(1)));
+  simplices.push_back(Simplex(Vertex_handle(0), Vertex_handle(1), Vertex_handle(2)));
+  simplices.push_back(Simplex(Vertex_handle(1), Vertex_handle(2), Vertex_handle(3)));
+  simplices.push_back(Simplex(Vertex_handle(3), Vertex_handle(0), Vertex_handle(2)));
+  simplices.push_back(Simplex(Vertex_handle(3), Vertex_handle(0), Vertex_handle(1)));
 
   // get complex from top faces
   Complex complex(make_complex_from_top_faces<Complex>(simplices.begin(), simplices.end()));
 
 
   std::cout << "Simplices:" << std::endl;
-  for (const Simplex & s : complex.simplex_range())
+  for (const Simplex & s : complex.complex_simplex_range())
     std::cout << s << " ";
   std::cout << std::endl;
 
@@ -61,16 +60,16 @@ int main(int argc, char *argv[]) {
 
   // now build a complex from its full list of simplices
   simplices.clear();
-  simplices.push_back(Simplex_handle(Vertex_handle(0)));
-  simplices.push_back(Simplex_handle(Vertex_handle(1)));
-  simplices.push_back(Simplex_handle(Vertex_handle(2)));
-  simplices.push_back(Simplex_handle(Vertex_handle(0), Vertex_handle(1)));
-  simplices.push_back(Simplex_handle(Vertex_handle(1), Vertex_handle(2)));
-  simplices.push_back(Simplex_handle(Vertex_handle(2), Vertex_handle(0)));
+  simplices.push_back(Simplex(Vertex_handle(0)));
+  simplices.push_back(Simplex(Vertex_handle(1)));
+  simplices.push_back(Simplex(Vertex_handle(2)));
+  simplices.push_back(Simplex(Vertex_handle(0), Vertex_handle(1)));
+  simplices.push_back(Simplex(Vertex_handle(1), Vertex_handle(2)));
+  simplices.push_back(Simplex(Vertex_handle(2), Vertex_handle(0)));
   complex = Complex(simplices.begin(), simplices.end());
 
   std::cout << "Simplices:" << std::endl;
-  for (const Simplex & s : complex.simplex_range())
+  for (const Simplex & s : complex.complex_simplex_range())
     std::cout << s << " ";
   std::cout << std::endl;