1.1 --- a/lemon/nagamochi_ibaraki.h Fri Nov 30 09:22:38 2007 +0000
1.2 +++ b/lemon/nagamochi_ibaraki.h Tue Dec 04 10:55:27 2007 +0000
1.3 @@ -847,9 +847,9 @@
1.4 /// distinict subnetwork.
1.5 ///
1.6 /// The complexity of the algorithm is \f$ O(ne\log(n)) \f$ but with
1.7 - /// Fibonacci heap it can be decreased to \f$ O(ne+n^2\log(n)) \f$.
1.8 - /// When capacity map is neutral then it uses BucketHeap which
1.9 - /// results \f$ O(ne) \f$ time complexity.
1.10 + /// Fibonacci heap it can be decreased to \f$ O(ne+n^2\log(n)) \f$.
1.11 + /// When unit capacity minimum cut is computed then it uses
1.12 + /// BucketHeap which results \f$ O(ne) \f$ time complexity.
1.13 ///
1.14 /// \warning The value type of the capacity map should be able to hold
1.15 /// any cut value of the graph, otherwise the result can overflow.
1.16 @@ -906,7 +906,7 @@
1.17
1.18 ///@{
1.19
1.20 - struct DefNeutralCapacityTraits : public Traits {
1.21 + struct DefUnitCapacityTraits : public Traits {
1.22 typedef ConstMap<typename Graph::UEdge, Const<int, 1> > CapacityMap;
1.23 static CapacityMap *createCapacityMap(const Graph&) {
1.24 return new CapacityMap();
1.25 @@ -917,11 +917,11 @@
1.26 ///
1.27 /// \ref named-templ-param "Named parameter" for setting
1.28 /// the capacity type to constMap<UEdge, int, 1>()
1.29 - struct DefNeutralCapacity
1.30 + struct DefUnitCapacity
1.31 : public NagamochiIbaraki<Graph, CapacityMap,
1.32 - DefNeutralCapacityTraits> {
1.33 + DefUnitCapacityTraits> {
1.34 typedef NagamochiIbaraki<Graph, CapacityMap,
1.35 - DefNeutralCapacityTraits> Create;
1.36 + DefUnitCapacityTraits> Create;
1.37 };
1.38
1.39
1.40 @@ -1134,7 +1134,7 @@
1.41 ///
1.42 /// This constructor can be used only when the Traits class
1.43 /// defines how can we instantiate a local capacity map.
1.44 - /// If the DefNeutralCapacity used the algorithm automatically
1.45 + /// If the DefUnitCapacity used the algorithm automatically
1.46 /// construct the capacity map.
1.47 ///
1.48 ///\param graph the graph the algorithm will run on.