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

Rename dfs as search

This commit is contained in:
Simon Giraudot 2017-09-14 11:34:11 +02:00
parent 7bd7593ec4
commit c60cf285f4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Point_set_2/include/CGAL/Point_set_2.h
View File

@ -250,7 +250,7 @@ public:
Point p = v->point(); Point p = v->point();
// "unmark" the vertices ... // "unmark" the vertices ...
init_dfs(); init_search();
MAP_TYPE priority_number; // here we save the priorities ... MAP_TYPE priority_number; // here we save the priorities ...
internal::compare_vertices<Vertex_handle,Numb_type,MAP_TYPE> internal::compare_vertices<Vertex_handle,Numb_type,MAP_TYPE>
@ -293,7 +293,6 @@ public:
} }
// dfs
// for marking nodes in search procedures // for marking nodes in search procedures
size_type cur_mark; size_type cur_mark;
@ -305,7 +304,7 @@ public:
mark.clear(); mark.clear();
} }
void init_dfs() void init_search()
{ {
cur_mark++; cur_mark++;
if (cur_mark == (std::numeric_limits<size_type>::max)()) init_vertex_marks(); if (cur_mark == (std::numeric_limits<size_type>::max)()) init_vertex_marks();
@ -324,7 +323,7 @@ public:
return (mark[vh] == cur_mark); return (mark[vh] == cur_mark);
} }
void dfs(Vertex_handle v,const Circle& C, std::list<Vertex_handle>& L) void search(Vertex_handle v,const Circle& C, std::list<Vertex_handle>& L)
{ {
std::stack<Vertex_handle> todo; std::stack<Vertex_handle> todo;
todo.push(v); todo.push(v);
@ -385,10 +384,10 @@ public:
v = insert(p); v = insert(p);
} }
init_dfs(); init_search();
std::list<Vertex_handle> L; std::list<Vertex_handle> L;
dfs(v,C,L); search(v,C,L);
if (new_v) if (new_v)
{ L.pop_front(); //first one was inserted in range_search ... { L.pop_front(); //first one was inserted in range_search ...