Changeset 7 for branches

Timestamp:

Aug 1, 2002 11:58:30 AM (18 years ago)

Author:

forrest

Message:

For infeasible problems

Location:

branches/devel-1

Files:

• ClpPrimalColumnSteepest.cpp (modified) (1 diff)
• ClpSimplexDual.cpp (modified) (3 diffs)
• ClpSimplexPrimal.cpp (modified) (4 diffs)
• Makefile (modified) (1 diff)

branches/devel-1/ClpPrimalColumnSteepest.cpp

@@ -891 +891 @@
     // initialize to 1.0 
     // and set reference framework
-    if (!reference_)
-      reference_ = new unsigned int[(numberRows+numberColumns+31)>>5];
-    assert (sizeof(unsigned int)==4);
-    
+    if (!reference_) {
+      int nWords = (number+31)>>5;
+      reference_ = new unsigned int[nWords];
+      assert (sizeof(unsigned int)==4);
+      // tiny overhead to zero out (stops valgrind complaining)
+      memset(reference_,0,nWords*sizeof(int));
+    }
     
     for (iSequence=0;iSequence<number;iSequence++) {

branches/devel-1/ClpSimplexDual.cpp

@@ -587 +587 @@
             printf("** no column pivot\n");
 #endif
-          if (!factorization_->pivots()) {
+          if (factorization_->pivots()<5) {
             problemStatus_=-4; //say looks infeasible
             // create ray anyway
@@ -616 +616 @@
           }
           if (iRow<numberRows_) {
-            std::cerr<<"Flagged variables at end"<<std::endl;
-            // what do I do now
-            abort();
+#ifdef CLP_DEBUG
+            std::cerr<<"Flagged variables at end - infeasible?"<<std::endl;
+#endif
+            problemStatus_=-4; //say looks infeasible
+            // create ray anyway
+            delete [] ray_;
+            ray_ = new double [ numberRows_];
+            CoinDisjointCopyN(rowArray_[0]->denseVector(),numberRows_,ray_);
           }
         }
@@ -1812 +1817 @@
           <<OsiMessageEol;
         numberChangedBounds=changeBounds(false,NULL,changeCost);
-        if (numberChangedBounds<=0) {
+        if (numberChangedBounds<=0||dualBound_>1.0e20||
+            (largestPrimalError_>1.0&&dualBound_>1.0e17)) {
           problemStatus_=1; // infeasible
         } else {
           problemStatus_=-1; //iterate
           cleanDuals=true;
-          doOriginalTolerance=1;
+          doOriginalTolerance=2;
           // and delete ray which has been created
           delete [] ray_;

branches/devel-1/ClpSimplexPrimal.cpp

@@ -584 +584 @@
           printf("** no column pivot\n");
 #endif
+        if (nonLinearCost_->numberInfeasibilities())
+          problemStatus_=-4; // might be infeasible 
         break;
       }
@@ -645 +647 @@
   int tentativeStatus = problemStatus_;
 
-  if (problemStatus_>-3) {
+  if (problemStatus_>-3||problemStatus_==-4) {
     // factorize
     // later on we will need to recover from singularities
@@ -666 +668 @@
       changeMade_++; // say change made
     }
-    problemStatus_=-3;
+    if (problemStatus_!=-4)
+      problemStatus_=-3;
   }
   // at this stage status is -3 or -5 if looks unbounded
@@ -687 +690 @@
   // we may wish to say it is optimal even if infeasible
   bool alwaysOptimal = (specialOptions_&1)!=0;
-  if (dualFeasible()) {
+  if (dualFeasible()||problemStatus_==-4) {
     if (nonLinearCost_->numberInfeasibilities()&&!alwaysOptimal) {
       //may need infeasiblity cost changed

branches/devel-1/Makefile

@@ -8 +8 @@
 # I seem to need this at present
 OPTFLAG := -O2
-#OptLevel := -g
+OptLevel := -g
+OPTFLAG := -g
 ifeq ($(OptLevel),-g)
     CXXFLAGS += -DCLP_DEBUG