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

l-shape case 7 started (nyf)

This commit is contained in:
Guillaume Damiand 2018-03-28 17:53:48 +02:00
parent e4afaf5ea5
commit a42a4546ae
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,6 +531,8 @@ public:
} }
while(next_turn==2); while(next_turn==2);
// TODO for cases 4, 5 and 6, add a test that X!=3 (?)
// And here now we can push // And here now we can push
Self new_path(m_map); Self new_path(m_map);
if (end<begin) if (end<begin)

23
Linear_cell_complex/examples/Linear_cell_complex/compute_example.cpp
View File

@ -434,8 +434,7 @@ bool test_all_cases_l_shape()
generate_l_shape_case5(path); generate_l_shape_case5(path);
// std::cout<<"Case 5: L-shape (-4 -1 -2^12): "<<std::flush; // std::cout<<"Case 5: L-shape (-4 -1 -2^12): "<<std::flush;
path.display_pos_and_neg_turns();std::cout<<std::endl; push_l_shape(path, false, 1);
push_l_shape(path, true, 1);
if (!path.same_turns("4 2 2 2 2 2 2 2 2 2 2 2 2 1")) if (!path.same_turns("4 2 2 2 2 2 2 2 2 2 2 2 2 1"))
{ {
std::cout<<"[test_all_cases_l_shape case 5] ERROR: "; std::cout<<"[test_all_cases_l_shape case 5] ERROR: ";
@ -455,6 +454,26 @@ bool test_all_cases_l_shape()
res=false; res=false;
} }
lcc.clear();
if (!CGAL::load_off(lcc, "./data/case7-right-shift-squared.off"))
{
std::cout<<"PROBLEM reading file ./data/case7-right-shift-squared.off"<<std::endl;
exit(EXIT_FAILURE);
}
// lcc.reverse_orientation();
generate_l_shape_case7(path);
// std::cout<<"Case 7: L-shape (-3 -2^7 -1 -2^3): "<<std::flush;
path.display_pos_and_neg_turns();std::cout<<std::endl;
push_l_shape(path, true, 1);
if (!path.same_turns("1 2 2 2 2 2 2 2 3 2 2 2"))
{
std::cout<<"[test_all_cases_l_shape case 7] ERROR: ";
std::cout<<"we obtained "; path.display_pos_and_neg_turns();
std::cout<<" instead of (1 2 2 2 2 2 2 2 3 2 2 2)"<<std::endl;
res=false;
}
// path.display_pos_and_neg_turns();std::cout<<std::endl; // path.display_pos_and_neg_turns();std::cout<<std::endl;
return res; return res;
} }