From ff6ad8b959f6c20380f3d68ebb1bbbf1224adcfd Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 13 Oct 2015 15:34:28 +0000
Subject: 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
---
 src/GudhUI/model/Model.h              | 6 +++---
 src/GudhUI/utils/Is_manifold.h        | 2 +-
 src/GudhUI/view/Viewer_instructor.cpp | 2 +-
 src/GudhUI/view/Viewer_instructor.h   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/GudhUI')

diff --git a/src/GudhUI/model/Model.h b/src/GudhUI/model/Model.h
index d78cbad9..07a67a0c 100644
--- a/src/GudhUI/model/Model.h
+++ b/src/GudhUI/model/Model.h
@@ -249,7 +249,7 @@ class Model {
     int euler = 0;
     int dimension = 0;
     Clock clock;
-    for (const auto &s : complex_.simplex_range()) {
+    for (const auto &s : complex_.complex_simplex_range()) {
       num_simplices++;
       dimension = (std::max)(s.dimension(), dimension);
       if (s.dimension() % 2 == 0)
@@ -281,7 +281,7 @@ class Model {
     unsigned num_simplices = 0;
     int euler = 0;
     int dimension = 0;
-    for (const auto &s : complex_.simplex_range()) {
+    for (const auto &s : complex_.complex_simplex_range()) {
       num_simplices++;
       dimension = (std::max)(s.dimension(), dimension);
       if (s.dimension() % 2 == 0)
@@ -328,7 +328,7 @@ class Model {
   void save_complex_in_file_for_chomp() {
     std::ofstream file;
     file.open("chomp.sim");
-    for (const auto &s : complex_.simplex_range()) {
+    for (const auto &s : complex_.complex_simplex_range()) {
       bool first = true;
       file << "(";
       for (auto x : s) {
diff --git a/src/GudhUI/utils/Is_manifold.h b/src/GudhUI/utils/Is_manifold.h
index b6b19ee0..0640ea47 100644
--- a/src/GudhUI/utils/Is_manifold.h
+++ b/src/GudhUI/utils/Is_manifold.h
@@ -69,7 +69,7 @@ template<typename SkBlComplex> class Is_manifold {
  private:
   unsigned local_dimension(Vertex_handle v) {
     unsigned dim = 0;
-    for (const auto& s : input_complex_.simplex_range(v))
+    for (const auto& s : input_complex_.star_simplex_range(v))
       dim = (std::max)(dim, (unsigned) s.dimension());
     return dim;
   }
diff --git a/src/GudhUI/view/Viewer_instructor.cpp b/src/GudhUI/view/Viewer_instructor.cpp
index 4446d209..1ddd4d8b 100644
--- a/src/GudhUI/view/Viewer_instructor.cpp
+++ b/src/GudhUI/view/Viewer_instructor.cpp
@@ -159,7 +159,7 @@ void Viewer_instructor::set_color_edge(Edge_handle eh) {
   viewer_->set_color(Color(view_params_.light_edges, view_params_.light_edges, view_params_.light_edges));
 }
 
-void Viewer_instructor::set_color_triangle(const Simplex_handle& triangle) {
+void Viewer_instructor::set_color_triangle(const Simplex& triangle) {
   viewer_->set_color(Color(view_params_.light_triangles, view_params_.light_triangles, view_params_.light_triangles));
 }
 
diff --git a/src/GudhUI/view/Viewer_instructor.h b/src/GudhUI/view/Viewer_instructor.h
index 31a1d273..82c8e346 100644
--- a/src/GudhUI/view/Viewer_instructor.h
+++ b/src/GudhUI/view/Viewer_instructor.h
@@ -52,7 +52,7 @@ class Viewer_instructor : public QWidget {
   typedef Complex::Point Point;
   typedef Complex::Vertex_handle Vertex_handle;
   typedef Complex::Edge_handle Edge_handle;
-  typedef Complex::Simplex_handle Simplex_handle;
+  typedef Complex::Simplex Simplex;
 
   Viewer* viewer_;
   View_parameter view_params_;
@@ -98,7 +98,7 @@ class Viewer_instructor : public QWidget {
   void set_color_vertex(Vertex_handle vh);
   void set_color_edge(Edge_handle eh);
 
-  void set_color_triangle(const Simplex_handle& triangle);
+  void set_color_triangle(const Simplex& triangle);
 
  private:
   /**
-- 
cgit v1.2.3