Changeset - r592:e72bacfea6b7
« 591:ccd2d3
593:d6b40e »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Remane GomoryHuTree to GomoryHu (#66)
1 2 1
default
4 files changed with 22 insertions and 22 deletions:
lemon/Makefile.am
1
1
lemon/gomory_hu.h
16
16
test/gomory_hu_test.cc
5
5
↑ Collapse diff ↑
lemon/Makefile.am
Ignore white space 6 line context
... ... 
@@ -70,3 +70,3 @@
70 70 
	lemon/glpk.h \
71 
	lemon/gomory_hu_tree.h \
71 
	lemon/gomory_hu.h \
72 72 
	lemon/graph_to_eps.h \
lemon/gomory_hu.h
Show white space 6 line context
... ... 
@@ -65,3 +65,3 @@
65 65 
            >
66 
  class GomoryHuTree {
66 
  class GomoryHu {
67 67 
  public:
... ... 
@@ -118,3 +118,3 @@
118 118 
    /// \param capacity The capacity map.
119 
    GomoryHuTree(const Graph& graph, const Capacity& capacity)
119 
    GomoryHu(const Graph& graph, const Capacity& capacity)
120 120 
      : _graph(graph), _capacity(capacity),
... ... 
@@ -129,3 +129,3 @@
129 129 
    /// Destructor
130 
    ~GomoryHuTree() {
130 
    ~GomoryHu() {
131 131 
      destroyStructures();
... ... 
@@ -342,4 +342,4 @@
342 342 
    /// This iterator class lists the nodes of a minimum cut found by
343 
    /// GomoryHuTree. Before using it, you must allocate a GomoryHuTree class,
344 
    /// and call its \ref GomoryHuTree::run() "run()" method.
343 
    /// GomoryHu. Before using it, you must allocate a GomoryHu class,
344 
    /// and call its \ref GomoryHu::run() "run()" method.
345 345 
    ///
... ... 
@@ -348,6 +348,6 @@
348 348 
    /// \code
349 
    /// GomoruHuTree<Graph> gom(g, capacities);
349 
    /// GomoruHu<Graph> gom(g, capacities);
350 350 
    /// gom.run();
351 351 
    /// int sum=0;
352 
    /// for(GomoruHuTree<Graph>::MinCutNodeIt n(gom,s,t);n!=INVALID;++n) ++sum;
352 
    /// for(GomoruHu<Graph>::MinCutNodeIt n(gom,s,t);n!=INVALID;++n) ++sum;
353 353 
    /// \endcode
... ... 
@@ -363,4 +363,4 @@
363 363 
      ///
364 
      MinCutNodeIt(GomoryHuTree const &gomory,
365 
                   ///< The GomoryHuTree class. You must call its
364 
      MinCutNodeIt(GomoryHu const &gomory,
365 
                   ///< The GomoryHu class. You must call its
366 366 
                   ///  run() method
... ... 
@@ -439,4 +439,4 @@
439 439 
    /// This iterator class lists the edges of a minimum cut found by
440 
    /// GomoryHuTree. Before using it, you must allocate a GomoryHuTree class,
441 
    /// and call its \ref GomoryHuTree::run() "run()" method.
440 
    /// GomoryHu. Before using it, you must allocate a GomoryHu class,
441 
    /// and call its \ref GomoryHu::run() "run()" method.
442 442 
    ///
... ... 
@@ -445,6 +445,6 @@
445 445 
    /// \code
446 
    /// GomoruHuTree<Graph> gom(g, capacities);
446 
    /// GomoruHu<Graph> gom(g, capacities);
447 447 
    /// gom.run();
448 448 
    /// int value=0;
449 
    /// for(GomoruHuTree<Graph>::MinCutEdgeIt e(gom,s,t);e!=INVALID;++e)
449 
    /// for(GomoruHu<Graph>::MinCutEdgeIt e(gom,s,t);e!=INVALID;++e)
450 450 
    ///   value+=capacities[e];
... ... 
@@ -452,3 +452,3 @@
452 452 
    /// the result will be the same as it is returned by
453 
    /// \ref GomoryHuTree::minCostValue() "gom.minCostValue(s,t)"
453 
    /// \ref GomoryHu::minCostValue() "gom.minCostValue(s,t)"
454 454 
    class MinCutEdgeIt
... ... 
@@ -472,4 +472,4 @@
472 472 
    public:
473 
      MinCutEdgeIt(GomoryHuTree const &gomory,
474 
                   ///< The GomoryHuTree class. You must call its
473 
      MinCutEdgeIt(GomoryHu const &gomory,
474 
                   ///< The GomoryHu class. You must call its
475 475 
                   ///  run() method
test/gomory_hu_test.cc
Ignore white space 6 line context
... ... 
@@ -5,3 +5,3 @@
5 5 
#include <lemon/lgf_reader.h>
6 
#include <lemon/gomory_hu_tree.h>
6 
#include <lemon/gomory_hu.h>
7 7 
#include <cstdlib>
... ... 
@@ -62,3 +62,3 @@
62 62 

			




	63
	
	
		
  GomoryHuTree<Graph> ght(graph, capacity);


			




	
	63
	
		
  GomoryHu<Graph> ght(graph, capacity);


			




	64
	64
	
		
  ght.init();


			




	...
	...
	
		
@@ -77,3 +77,3 @@


			




	77
	77
	
		
      int sum=0;


			




	78
	
	
		
      for(GomoryHuTree<Graph>::MinCutEdgeIt a(ght, u, v);a!=INVALID;++a)


			




	
	78
	
		
      for(GomoryHu<Graph>::MinCutEdgeIt a(ght, u, v);a!=INVALID;++a)


			




	79
	79
	
		
        sum+=capacity[a]; 


			




	...
	...
	
		
@@ -82,5 +82,5 @@


			




	82
	82
	
		
      sum=0;


			




	83
	
	
		
      for(GomoryHuTree<Graph>::MinCutNodeIt n(ght, u, v,true);n!=INVALID;++n)


			




	
	83
	
		
      for(GomoryHu<Graph>::MinCutNodeIt n(ght, u, v,true);n!=INVALID;++n)


			




	84
	84
	
		
        sum++;


			




	85
	
	
		
      for(GomoryHuTree<Graph>::MinCutNodeIt n(ght, u, v,false);n!=INVALID;++n)


			




	
	85
	
		
      for(GomoryHu<Graph>::MinCutNodeIt n(ght, u, v,false);n!=INVALID;++n)


			




	86
	86
	
		
        sum++;


			




        

    






    
    



    


    

     
    
0 comments (0 inline)