Changeset - r1009:c85f53572941
« 1007:e24922
« 1006:d0e573
1028:075de3 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge bugfix #392 to branch 1.1
0 2 0
merge 1.1
2 files changed with 14 insertions and 3 deletions:
lemon/dfs.h
2
2
test/dfs_test.cc
12
1
↑ Collapse diff ↑
lemon/dfs.h
Ignore white space 4 line context
... ... 
@@ -558,5 +558,5 @@
558 558 
    void start(Node t)
559 559 
    {
560 
      while ( !emptyQueue() && G->target(_stack[_stack_head])!=t )
560 
      while ( !emptyQueue() && !(*_reached)[t] )
561 561 
        processNextArc();
562 562 
    }
... ... 
@@ -1510,5 +1510,5 @@
1510 1510 
    /// with addSource() before using this function.
1511 1511 
    void start(Node t) {
1512 
      while ( !emptyQueue() && _digraph->target(_stack[_stack_head]) != t )
1512 
      while ( !emptyQueue() && !(*_reached)[t] )
1513 1513 
        processNextArc();
1514 1514 
    }
test/dfs_test.cc
Ignore white space 4 line context
... ... 
@@ -51,5 +51,8 @@
51 51 
  "@attributes\n"
52 52 
  "source 0\n"
53 
  "target 5\n";
53 
  "target 5\n"
54 
  "source1 6\n"
55 
  "target1 3\n";
56 

			




	54
	57
	
		

			




	55
	58
	
		
void checkDfsCompile()


			




	...
	...
	
		
@@ -180,4 +183,5 @@


			




	180
	183
	
		
  Digraph G;


			




	181
	184
	
		
  Node s, t;


			




	
	185
	
		
  Node s1, t1;


			




	182
	186
	
		

			




	183
	187
	
		
  std::istringstream input(test_lgf);


			




	...
	...
	
		
@@ -185,4 +189,6 @@


			




	185
	189
	
		
    node("source", s).


			




	186
	190
	
		
    node("target", t).


			




	
	191
	
		
    node("source1", s1).


			




	
	192
	
		
    node("target1", t1).


			




	187
	193
	
		
    run();


			




	188
	194
	
		

			




	...
	...
	
		
@@ -211,4 +217,9 @@


			




	211
	217
	
		

			




	212
	218
	
		
  {


			




	
	219
	
		
  Dfs<Digraph> dfs(G);


			




	
	220
	
		
  check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6.");


			




	
	221
	
		
  }


			




	
	222
	
		
  


			




	
	223
	
		
  {


			




	213
	224
	
		
    NullMap<Node,Arc> myPredMap;


			




	214
	225
	
		
    dfs(G).predMap(myPredMap).run(s);


			




        

    






    
    



    


    

     
    
0 comments (0 inline)