Changeset - r945:7bf1117178af
« 908:30c77d
« 936:2f9d9b
953:86a880 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge bugfixes #323 to branch 1.1
0 1 0
merge 1.1
1 file changed with 3 insertions and 6 deletions:
lemon/suurballe.h
3
6
↑ Collapse diff ↑
lemon/suurballe.h
Show white space 6 line context
... ... 
@@ -55,7 +55,7 @@
55 55 
  /// \tparam LEN The type of the length map.
56 56 
  /// The default value is <tt>GR::ArcMap<int></tt>.
57 57 
  ///
58 
  /// \warning Length values should be \e non-negative \e integers.
58 
  /// \warning Length values should be \e non-negative.
59 59 
  ///
60 60 
  /// \note For finding node-disjoint paths this algorithm can be used
61 61 
  /// along with the \ref SplitNodes adaptor.
... ... 
@@ -252,10 +252,7 @@
252 252 
               const LengthMap &length ) :
253 253 
      _graph(graph), _length(length), _flow(0), _local_flow(false),
254 254 
      _potential(0), _local_potential(false), _pred(graph)
255 
    {
256 
      LEMON_ASSERT(std::numeric_limits<Length>::is_integer,
257 
        "The length type of Suurballe must be integer");
258 
    }
255 
    {}
259 256 

			




	260
	257
	
		
    /// Destructor.


			




	261
	258
	
		
    ~Suurballe() {


			




	...
	...
	
		
@@ -520,7 +517,7 @@


			




	520
	517
	
		
    ///


			




	521
	518
	
		
    /// \pre \ref run() or \ref findPaths() must be called before using


			




	522
	519
	
		
    /// this function.


			




	523
	
	
		
    Path path(int i) const {


			




	
	520
	
		
    const Path& path(int i) const {


			




	524
	521
	
		
      return paths[i];


			




	525
	522
	
		
    }


			




	526
	523
	
		

			




        

    






    
    



    


    

     
    
0 comments (0 inline)