Changeset - r487:acfb0f24d178
« 486:a2fd8b
488:2b5496 »
gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Rename Residual to ResidualDigraph (#67) The new name is more analogous to other adaptor names.
0 2 0
default
2 files changed with 17 insertions and 18 deletions:
lemon/adaptors.h
12
13
test/graph_adaptor_test.cc
5
5
↑ Collapse diff ↑
lemon/adaptors.h
Show white space 6 line context
... ... 
@@ -2668,6 +2668,6 @@
2668 2668 
  ///
2669 
  /// Residual can be used for composing the \e residual digraph for directed
2670 
  /// flow and circulation problems. Let \f$ G=(V, A) \f$ be a directed graph
2671 
  /// and let \f$ F \f$ be a number type. Let \f$ flow, cap: A\to F \f$ be
2672 
  /// functions on the arcs.
2669 
  /// ResidualDigraph can be used for composing the \e residual digraph
2670 
  /// for directed flow and circulation problems. Let \f$ G=(V, A) \f$
2671 
  /// be a directed graph and let \f$ F \f$ be a number type.
2672 
  /// Let \f$ flow, cap: A\to F \f$ be functions on the arcs.
2673 2673 
  /// This adaptor implements a digraph structure with node set \f$ V \f$
... ... 
@@ -2706,3 +2706,3 @@
2706 2706 
  template<typename GR, typename CM, typename FM, typename TL>
2707 
  class Residual
2707 
  class ResidualDigraph
2708 2708 
#else
... ... 
@@ -2712,3 +2712,3 @@
2712 2712 
           typename TL = Tolerance<typename CM::Value> >
2713 
  class Residual :
2713 
  class ResidualDigraph :
2714 2714 
    public FilterArcs<
... ... 
@@ -2732,3 +2732,3 @@
2732 2732 
    typedef typename CapacityMap::Value Value;
2733 
    typedef Residual Adaptor;
2733 
    typedef ResidualDigraph Adaptor;
2734 2734 

			




	...
	...
	
		
@@ -2763,4 +2763,4 @@


			




	2763
	2763
	
		
    /// digraph, the capacity map, the flow map, and a tolerance object.


			




	2764
	
	
		
    Residual(const Digraph& digraph, const CapacityMap& capacity,


			




	2765
	
	
		
             FlowMap& flow, const Tolerance& tolerance = Tolerance())


			




	
	2764
	
		
    ResidualDigraph(const Digraph& digraph, const CapacityMap& capacity,


			




	
	2765
	
		
                    FlowMap& flow, const Tolerance& tolerance = Tolerance())


			




	2766
	2766
	
		
      : Parent(), _capacity(&capacity), _flow(&flow), _graph(digraph),


			




	...
	...
	
		
@@ -2871,6 +2871,5 @@


			




	2871
	2871
	
		
  template<typename GR, typename CM, typename FM>


			




	2872
	
	
		
  Residual<GR, CM, FM> residual(const GR& digraph,


			




	2873
	
	
		
                                const CM& capacity_map,


			




	2874
	
	
		
                                FM& flow_map) {


			




	2875
	
	
		
    return Residual<GR, CM, FM> (digraph, capacity_map, flow_map);


			




	
	2872
	
		
  ResidualDigraph<GR, CM, FM>


			




	
	2873
	
		
  residualDigraph(const GR& digraph, const CM& capacity_map, FM& flow_map) {


			




	
	2874
	
		
    return ResidualDigraph<GR, CM, FM> (digraph, capacity_map, flow_map);


			




	2876
	2875
	
		
  }

			




        

    

    

    

        

            

                

                    test/graph_adaptor_test.cc
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -583,6 +583,6 @@


			




	583
	583
	
		

			




	584
	
	
		
void checkResidual() {


			




	
	584
	
		
void checkResidualDigraph() {


			




	585
	585
	
		
  // Check concepts


			




	586
	
	
		
  checkConcept<concepts::Digraph, Residual<concepts::Digraph> >();


			




	587
	
	
		
  checkConcept<concepts::Digraph, Residual<ListDigraph> >();


			




	
	586
	
		
  checkConcept<concepts::Digraph, ResidualDigraph<concepts::Digraph> >();


			




	
	587
	
		
  checkConcept<concepts::Digraph, ResidualDigraph<ListDigraph> >();


			




	588
	588
	
		

			




	...
	...
	
		
@@ -591,3 +591,3 @@


			




	591
	591
	
		
  typedef Digraph::ArcMap<int> IntArcMap;


			




	592
	
	
		
  typedef Residual<Digraph, IntArcMap> Adaptor;


			




	
	592
	
		
  typedef ResidualDigraph<Digraph, IntArcMap> Adaptor;


			




	593
	593
	
		

			




	...
	...
	
		
@@ -1472,3 +1472,3 @@


			




	1472
	1472
	
		
  checkUndirector();


			




	1473
	
	
		
  checkResidual();


			




	
	1473
	
		
  checkResidualDigraph();


			




	1474
	1474
	
		
  checkSplitNodes();


			




        

    






    
    



    


    

     
    
0 comments (0 inline)