Changeset 2450:719220885b90 in lemon-0.x

Timestamp:

06/05/07 19:27:54 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Negate the meaning of the delta parameter

File:

• lemon/circulation.h (modified) (5 diffs)

lemon/circulation.h

@@ -38 +38 @@
   ///for the Network Circulation Problem.
   ///The exact formulation of this problem is the following.
-  /// \f[\sum_{e\in\rho(v)}x(e)-\sum_{e\in\delta(v)}x(e)\leq delta(v)\quad \forall v\in V \f]
+  /// \f[\sum_{e\in\rho(v)}x(e)-\sum_{e\in\delta(v)}x(e)\leq -delta(v)\quad \forall v\in V \f]
   /// \f[ lo(e)\leq x(e) \leq up(e) \quad \forall e\in E \f]
   ///
@@ -96 +96 @@
       _x=_lo;
 
-      for(NodeIt n(_g);n!=INVALID;++n) _excess[n]=-_delta[n];
+      for(NodeIt n(_g);n!=INVALID;++n) _excess[n]=_delta[n];
 
       for(EdgeIt e(_g);e!=INVALID;++e)
@@ -121 +121 @@
       for(NodeIt n(_g);n!=INVALID;++n)
         {
-          Value dif=_delta[n];
+          Value dif=-_delta[n];
           for(InEdgeIt e(_g,n);e!=INVALID;++e) dif-=x[e];
           for(OutEdgeIt e(_g,n);e!=INVALID;++e) dif+=x[e];
@@ -141 +141 @@
       for(NodeIt n(_g);n!=INVALID;++n)
         if(bar[n])
-          delta+=_delta[n];
+          delta-=_delta[n];
       for(EdgeIt e(_g);e!=INVALID;++e)
         {
@@ -280 +280 @@
     
     ///Barrier is a set \e B of nodes for which
-    /// \f[ \sum_{v\in B}delta(v)<\sum_{e\in\rho(B)}lo(e)-\sum_{e\in\delta(B)}up(e) \f]
+    /// \f[ \sum_{v\in B}-delta(v)<\sum_{e\in\rho(B)}lo(e)-\sum_{e\in\delta(B)}up(e) \f]
     ///holds. The existence of a set with this property prooves that a feasible
     ///flow cannot exists.