Changeset 1512 for trunk

Timestamp:

Feb 8, 2010 11:26:25 AM (11 years ago)

Author:

forrest

Message:

fix seg fault on null problem and messagee in idiot

Location:

trunk/Clp/src

Files:

• ClpSimplex.cpp (modified) (1 diff)
• Idiot.cpp (modified) (1 diff)

trunk/Clp/src/ClpSimplex.cpp

@@ -5127 +5127 @@
 {
   //double savedPivotTolerance = factorization_->pivotTolerance();
-  int saveQuadraticActivated = objective_->activated();
-  objective_->setActivated(0);
+  int saveQuadraticActivated = 0;
+  if (objective_) {
+    saveQuadraticActivated = objective_->activated();
+    objective_->setActivated(0);
+  } else {
+    // create dummy stuff
+    assert (!numberColumns_);
+    if (!numberRows_) 
+      problemStatus_=0; // say optimal
+    return 0;
+  }
   ClpObjective * saveObjective = objective_;
   CoinAssert (ifValuesPass>=0&&ifValuesPass<3);

trunk/Clp/src/Idiot.cpp

@@ -830 +830 @@
     }
     if (iteration>50&&n==numberAway&&result.infeas<1.0e-4) {
+#ifdef CLP_INVESTIGATE
       printf("infeas small %g\n",result.infeas);
+#endif
       break; // not much happening
     }