Changeset 1427 for trunk

Timestamp:

Sep 3, 2009 11:40:20 AM (12 years ago)

Author:

forrest

Message:

minor changes for examples

Location:

trunk/Clp/src

Files:

• ClpSimplex.cpp (modified) (2 diffs)
• ClpSimplexDual.cpp (modified) (1 diff)

trunk/Clp/src/ClpSimplex.cpp

@@ -1529 +1529 @@
             }
             break;
+          }
+        }
+        if (numberBasic<numberRows_) {
+          // add some slacks in case odd warmstart
+#ifdef CLP_INVESTIGATE
+          printf("BAD %d basic, %d rows %d slacks\n",
+                 numberBasic,numberRows_,totalSlacks);
+#endif
+          int iRow=numberRows_-1;
+          while (numberBasic<numberRows_) {
+            if (getRowStatus(iRow)!=basic) {
+              setRowStatus(iRow,basic);
+              numberBasic++;
+              totalSlacks++;
+              iRow--;
+            } else {
+              break;
+            }
           }
         }
@@ -11027 +11045 @@
   // for now let ...iBasic give pivot row
   int factorizationStatus = internalFactorize(0);
-  if (factorizationStatus<0) {
+  if (factorizationStatus<0||
+      (factorizationStatus&&factorizationStatus<=numberRows_)) {
     // some error
+#if 0
     // we should either debug or ignore 
-#ifndef NDEBUG
+#ifdef CLP_INVESTIGATE
+    //#ifndef NDEBUG
     printf("***** ClpDual strong branching factorization error - debug\n");
-#endif
     abort();
+    //#endif
+#endif
     return -2;
-  } else if (factorizationStatus&&factorizationStatus<=numberRows_) {
-    handler_->message(CLP_SINGULARITIES,messages_)
-      <<factorizationStatus
-      <<CoinMessageEol;
-    abort();
-    return -3;
+#else
+    dual(0,7);
+    createRim(7+8+16+32,true,0);
+    int factorizationStatus = internalFactorize(0);
+    assert (factorizationStatus==0);
+    if (factorizationStatus)
+      abort();
+#endif
   }
   // Start of fast iterations

trunk/Clp/src/ClpSimplexDual.cpp

@@ -5961 +5961 @@
 int ClpSimplexDual::fastDual(bool alwaysFinish)
 {
+  progressFlag_=0;
   bestObjectiveValue_ = objectiveValue_;
   algorithm_ = -1;