GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dependencyIsCircular: Do not visit one node multiple times

Browse source
This commit is contained in:
Tomas Babej 2016-03-22 02:49:01 +01:00 • committed by Paul Beckingham
parent dbec3ad33f
commit 726c31f8de
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/dependency.cpp
View file

@ -75,7 +75,11 @@ bool dependencyIsCircular (const Task& task)
auto task_uuid = task.get ("uuid"); auto task_uuid = task.get ("uuid");
std::stack <Task> s; std::stack <Task> s;
std::unordered_set <std::string> visited;
s.push (task); s.push (task);
visited.insert (task_uuid);
while (! s.empty ()) while (! s.empty ())
{ {
Task& current = s.top (); Task& current = s.top ();
@ -83,21 +87,25 @@ bool dependencyIsCircular (const Task& task)
current.getDependencies (deps_current); current.getDependencies (deps_current);
// This is a basic depth first search that always terminates given the // This is a basic depth first search that always terminates given the
// assumption that any cycles in the dependency graph must have been // fact that we do not visit any task twice
// introduced by the task that is being checked.
// Since any previous cycles would have been prevented by this very
// function, this is a reasonable assumption.
for (unsigned int i = 0; i < deps_current.size (); i++) for (unsigned int i = 0; i < deps_current.size (); i++)
{ {
if (context.tdb2.get (deps_current[i], current)) if (context.tdb2.get (deps_current[i], current))
{ {
if (task_uuid == current.get ("uuid")) auto current_uuid = current.get ("uuid");
if (task_uuid == current_uuid)
{ {
// Cycle found, initial task reached for the second time! // Cycle found, initial task reached for the second time!
return true; return true;
} }
s.push (current); if (visited.find (current_uuid) == visited.end ())
{
// Push the task to the stack, if it has not been processed yet
s.push (current);
visited.insert (current_uuid);
}
} }
} }