songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Continue l-shape shift.

This commit is contained in:
Guillaume Damiand 2018-03-26 14:34:34 +02:00
parent 6a588856a8
commit 8248315bd3
1 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Combinatorial_map/include/CGAL/Path_on_surface.h
View File

@ -325,8 +325,10 @@ public:
else // Normal case else // Normal case
{ i=end+1; } { i=end+1; }
if (end<begin) if (end<begin)
{ // Necessarily a closed path ! {
assert(is_closed()); if (!is_closed())
{ return false; }
copy_rest_of_path(end+1, begin, new_path); copy_rest_of_path(end+1, begin, new_path);
} }
else if (next_index(begin)!=end) // Special case of (1 2^r) else if (next_index(begin)!=end) // Special case of (1 2^r)
@ -409,12 +411,12 @@ public:
std::size_t& middle, std::size_t& middle,
std::size_t& end) const std::size_t& end) const
{ {
assert(next_turn(begin)==1 || next_turn(begin)==2); assert(next_negative_turn(begin)==1 || next_negative_turn(begin)==2);
end=begin+1; end=begin+1;
if (end==m_path.size()-1 && !is_closed()) if (end==m_path.size()-1 && !is_closed())
{ return false; } // begin is the before last dart { return false; } // begin is the before last dart
while (next_turn(end)==2 && end!=begin) while (next_negative_turn(end)==2 && end!=begin)
{ end=next_index(end); } { end=next_index(end); }
if (begin==end) if (begin==end)
@ -422,7 +424,7 @@ public:
return true; return true;
} }
if (next_turn(end)==1) if (next_negative_turn(end)==1)
{ {
middle=end; middle=end;
end=next_index(end); end=next_index(end);
@ -430,7 +432,7 @@ public:
else else
{ return false; } { return false; }
while (next_turn(end)==2) while (next_negative_turn(end)==2)
{ end=next_index(end); } { end=next_index(end); }
return true; return true;
@ -438,25 +440,44 @@ public:
bool right_push_one_step() bool right_push_one_step()
{ {
bool res=false; std::size_t begin, middle, end;
std::size_t begin, end;
std::size_t i; std::size_t i;
std::vector<Dart_const_handle> new_path; std::size_t next_turn;
for (i=0; i<m_path.size()-1; ) for (i=0; i<m_path.size()-1; )
{ {
if (next_turn(begin)!=2) next_turn=next_negative_turn(begin);
if (next_turn==1 || next_turn==2)
{ {
// TODO begin, end if (find_l_shape(begin, middle, end))
// res=true;
}
else
{ {
new_path.push_back(m_path[i]); // We copy this dart std::vector<Dart_const_handle> new_path;
++i; if (begin==end)
{ // Special case of (-2^l)
// TODO
return true;
} }
if (end<begin)
{
if (!is_closed())
{ return false; }
copy_rest_of_path(end+1, begin, new_path);
} }
else // TODO SPECIAL CASES ??
{ copy_rest_of_path(0, begin, new_path); }
push_l_shape(begin, middle, end, new_path);
if (begin<end /* && XXX (TODO SPECIAL CASES ??)*/)
{ copy_rest_of_path(end+1, length(), new_path); }
new_path.swap(m_path); new_path.swap(m_path);
return res; return true;
}
}
}
return false;
} }
bool right_push() bool right_push()