Changeset 1356 for stable/1.10

Timestamp:

Apr 15, 2009 10:40:38 AM (12 years ago)

Author:

forrest

Message:

fix assert on scaling

File:

• stable/1.10/Clp/src/ClpSimplexDual.cpp (modified) (2 diffs)

stable/1.10/Clp/src/ClpSimplexDual.cpp

@@ -5617 +5617 @@
     // external view - in case really getting optimal 
     columnUpper_[iColumn] = newUpper[i];
-    assert (inverseColumnScale_);
+    assert (inverseColumnScale_||scalingFlag_<=0);
     if (scalingFlag_<=0) 
       upper_[iColumn] = newUpper[i]*rhsScale_;
@@ -5685 +5685 @@
     // external view - in case really getting optimal 
     columnLower_[iColumn] = newLower[i];
-    assert (inverseColumnScale_);
+    assert (inverseColumnScale_||scalingFlag_<=0);
     if (scalingFlag_<=0) 
       lower_[iColumn] = newLower[i]*rhsScale_;