Changeset 2530:f86f7e4eb2ba in lemon-0.x for lemon/nagamochi_ibaraki.h

Timestamp:

12/04/07 11:55:27 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3407

Message:

Reimplementation of Hao-Orlin algorithm
Little modifictaion in NagamochiIbaraki?
More docs for minimum cut algorithms

File:

• lemon/nagamochi_ibaraki.h (modified) (4 diffs)

lemon/nagamochi_ibaraki.h

@@ -848 +848 @@
   ///
   /// The complexity of the algorithm is \f$ O(ne\log(n)) \f$ but with
-  /// Fibonacci heap it can be decreased to \f$ O(ne+n^2\log(n)) \f$. 
-  /// When capacity map is neutral then it uses BucketHeap which
-  /// results \f$ O(ne) \f$ time complexity.
+  /// Fibonacci heap it can be decreased to \f$ O(ne+n^2\log(n)) \f$.
+  /// When unit capacity minimum cut is computed then it uses
+  /// BucketHeap which results \f$ O(ne) \f$ time complexity.
   ///
   /// \warning The value type of the capacity map should be able to hold
@@ -907 +907 @@
     ///@{
 
-    struct DefNeutralCapacityTraits : public Traits {
+    struct DefUnitCapacityTraits : public Traits {
       typedef ConstMap<typename Graph::UEdge, Const<int, 1> > CapacityMap;
       static CapacityMap *createCapacityMap(const Graph&) {
@@ -918 +918 @@
     /// \ref named-templ-param "Named parameter" for setting 
     /// the capacity type to constMap<UEdge, int, 1>()
-    struct DefNeutralCapacity
+    struct DefUnitCapacity
       : public NagamochiIbaraki<Graph, CapacityMap, 
-                                DefNeutralCapacityTraits> { 
+                                DefUnitCapacityTraits> { 
       typedef NagamochiIbaraki<Graph, CapacityMap, 
-                               DefNeutralCapacityTraits> Create;
+                               DefUnitCapacityTraits> Create;
     };
 
@@ -1135 +1135 @@
     /// This constructor can be used only when the Traits class
     /// defines how can we instantiate a local capacity map.
-    /// If the DefNeutralCapacity used the algorithm automatically
+    /// If the DefUnitCapacity used the algorithm automatically
     /// construct the capacity map.
     ///