anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify the new graph code just a bit.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37260 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-01-19 14:09:44 +00:00
parent 172b915518
commit c71040e610
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Graph.cpp
View File

@ -24,12 +24,13 @@ using namespace std;
namespace lyx {
bool Graph::bfs_init(int s, bool clear_visited, queue<int>* Q)
bool Graph::bfs_init(int s, bool clear_visited, queue<int> & Q)
{
if (s < 0 || !Q)
if (s < 0)
return false;
*Q = queue<int>();
if (!Q.empty())
Q = queue<int>();
if (clear_visited) {
vector<Vertex>::iterator it = vertices_.begin();
@ -38,7 +39,7 @@ bool Graph::bfs_init(int s, bool clear_visited, queue<int>* Q)
it->visited = false;
}
if (!vertices_[s].visited) {
Q->push(s);
Q.push(s);
vertices_[s].visited = true;
}
return true;
@ -50,7 +51,7 @@ vector<int> const
{
vector<int> result;
queue<int> Q;
if (!bfs_init(target, clear_visited, &Q))
if (!bfs_init(target, clear_visited, Q))
return result;
// Here's the logic, which is shared by the other routines.
@ -86,7 +87,7 @@ vector<int> const
{
vector<int> result;
queue<int> Q;
if (!bfs_init(from, clear_visited, &Q))
if (!bfs_init(from, clear_visited, Q))
return result;
while (!Q.empty()) {
@ -125,7 +126,7 @@ bool Graph::isReachable(int from, int to)
return true;
queue<int> Q;
if (to < 0 || !bfs_init(from, true, &Q))
if (to < 0 || !bfs_init(from, true, Q))
return false;
while (!Q.empty()) {
@ -157,7 +158,7 @@ Graph::EdgePath const Graph::getPath(int from, int to)
return EdgePath();
queue<int> Q;
if (to < 0 || !bfs_init(from, true, &Q))
if (to < 0 || !bfs_init(from, true, Q))
return EdgePath();
vector<EdgePath> pathes;

2
src/Graph.h
View File

@ -46,7 +46,7 @@ public:
private:
///
bool bfs_init(int, bool clear_visited, std::queue<int>* Q);
bool bfs_init(int, bool clear_visited, std::queue<int> & Q);
/// used to recover a marked path
void getMarkedPath(int from, int to, EdgePath & path);
/// these represent the arrows connecting the nodes of the graph.