From 8e73a49cb4e743b09367dec12c0adc811d8c127e Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Sat, 10 Feb 2018 10:52:36 +0100
Subject: [PATCH] Start method bracket_flattening()

---
 .../CGAL/Combinatorial_map_functionalities.h  |  16 +++
 .../include/CGAL/Path_on_surface.h            | 102 +++++++++++++++++-
 .../Linear_cell_complex/compute_example.cpp   |   9 +-
 3 files changed, 122 insertions(+), 5 deletions(-)

diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_functionalities.h b/Combinatorial_map/include/CGAL/Combinatorial_map_functionalities.h
index 632007fbdf8..9daf48a47d1 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_functionalities.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_functionalities.h
@@ -132,6 +132,22 @@ namespace CGAL {
       m_original_map.free_mark(m_mark_L);
     }
 
+    Path_on_surface<Map> transform_original_path_into_quad_surface
+    (const Path_on_surface<Map>& path)
+    {
+      Path_on_surface<Map> res(m_map);
+      for (std::size_t i=0; i<path.length(); ++i)
+      {
+        if (!m_original_map.is_marked(path[i], m_mark_T))
+        {
+          res.push_back(get_first_dart_of_the_path(path[i]));
+          res.push_back(get_second_dart_of_the_path(path[i]));
+        }
+      }
+      assert(res.is_valid());
+      return res;
+    }
+
   protected:
     void initialize_vertices(UFTree& uftrees,
                              boost::unordered_map<Dart_const_handle, UFTree_handle>&
diff --git a/Combinatorial_map/include/CGAL/Path_on_surface.h b/Combinatorial_map/include/CGAL/Path_on_surface.h
index 7a6fec7a1e4..7a3ad1996a3 100644
--- a/Combinatorial_map/include/CGAL/Path_on_surface.h
+++ b/Combinatorial_map/include/CGAL/Path_on_surface.h
@@ -41,12 +41,21 @@ public:
   unsigned int length() const
   { return m_path.size(); }
 
-  Dart_const_handle get_ith_dart(unsigned int i) const
+  Dart_const_handle get_ith_dart(std::size_t i) const
   {
-    assert(i<m_path.size());
-    return m_path[i];
+    assert(i<=m_path.size());
+    return m_path[(i==m_path.size()?0:i)];
   }
   
+  Dart_const_handle operator[] (std::size_t i) const
+  {
+    assert(i<=m_path.size());
+    return m_path[(i==m_path.size()?0:i)];
+  }
+
+  void push_back(Dart_const_handle dh)
+  { m_path.push_back(dh); }
+
   // @return true iff the path is valid; i.e. a sequence of edges two by
   //              two adjacent.
   bool is_valid() const
@@ -166,6 +175,93 @@ public:
      return true;
   }
 
+  /// @return the turn between dart number i and dart number i+1.
+  ///         (turn is position of the second edge in the cyclic ordering of
+  ///          edges starting from the first edge around the second extremity
+  ///          of the first dart)
+  std::size_t next_turn(std::size_t i) const
+  {
+    assert(is_valid());
+    assert(i<m_path.size());
+
+    Dart_const_handle d1=m_path[i];
+    Dart_const_handle d2=m_path[i+1]; // Work also for the last dart.
+    assert(d1!=d2);
+
+    std::size_t res=1;
+    while (m_map.template beta<1>(d1)!=d2)
+    {
+      ++res;
+      d1=m_map.template beta<1, 2>(d1);
+    }
+    // std::cout<<"next_turn="<<res<<std::endl;
+    return res;
+  }
+
+  /// Same than nex_turn but turning in reverse orientation around vertex.
+  std::size_t next_negative_turn(std::size_t i) const
+  {
+    assert(is_valid());
+    assert(i<m_path.size());
+
+    Dart_const_handle d1=m_map.template beta<2>(m_path[i]);
+    Dart_const_handle d2=m_map.template beta<2>(m_path[i+1]); // Work also for the last dart.
+    assert(d1!=d2);
+
+    std::size_t res=1;
+    while (m_map.template beta<0>(d1)!=d2)
+    {
+      ++res;
+      d1=m_map.template beta<0, 2>(d1);
+    }
+    // std::cout<<"next_negative_turn="<<res<<std::endl;
+    return res;
+  }
+
+
+  std::size_t find_end_of_braket(std::size_t begin) const
+  {
+    assert(next_turn(begin)==1 || next_negative_turn(begin)==1);
+    std::size_t end=begin+1;
+    bool positive=(next_turn(begin)==1);
+
+    while ((positive && next_turn(end)==2) ||
+           (!positive && next_negative_turn(end)==2))
+    {
+      ++end;
+      if (end==m_path.size()) { end=0; }
+    }
+    ++end;
+    if (end==m_path.size()) { end=0; }
+    return end;
+  }
+
+  void bracket_flattening()
+  {
+    std::vector<Dart_const_handle> new_path;
+
+    for (std::size_t i=0; i<m_path.size()-1; )
+    {
+      if (next_turn(i)!=1 && next_negative_turn(i)!=1)
+      {
+        new_path.push_back(m_path[i]); // We copy this dart
+        ++i;
+      }
+      else
+      {
+        // i is maybe the beginning of a bracket
+        std::size_t begin=i;
+        std::size_t end=find_end_of_braket(begin);
+        std::cout<<"Bracket: ["<<begin<<"; "<<end<<"]"<<std::endl;
+        if (end<begin)
+        { i=m_path.size(); }
+        else
+        { i=end; }
+      }
+    }
+    // new_path.swap(m_path);
+  }
+
 protected:
   const Map& m_map;
   std::vector<Dart_const_handle> m_path;
diff --git a/Linear_cell_complex/examples/Linear_cell_complex/compute_example.cpp b/Linear_cell_complex/examples/Linear_cell_complex/compute_example.cpp
index 900a66e78ed..119dd21a91e 100644
--- a/Linear_cell_complex/examples/Linear_cell_complex/compute_example.cpp
+++ b/Linear_cell_complex/examples/Linear_cell_complex/compute_example.cpp
@@ -44,13 +44,18 @@ int main(int argc, char** argv)
   v.push_back(&p1);
   v.push_back(&p2);
   v.push_back(&p3);
-  v.push_back(&p4);
-  
+  v.push_back(&p4);  
+
 #ifdef CGAL_USE_BASIC_VIEWER
   display(lcc, v);
 #endif // CGAL_USE_BASIC_VIEWER
     
   CGAL::Combinatorial_map_tools<LCC_3_cmap> cmt(lcc);
 
+  CGAL::Path_on_surface<LCC_3_cmap>
+      pp1=cmt.transform_original_path_into_quad_surface(p1);
+
+  pp1.bracket_flattening();
+
   return EXIT_SUCCESS;
 }