Changeset 2079 for stable

Timestamp:

Sep 24, 2014 5:54:25 AM (5 years ago)

Author:

forrest

Message:

changes for non simplex solvers

Location:

stable/2.8/Cbc/src

Files:

• CbcModel.cpp (modified) (11 diffs)
• CbcNode.cpp (modified) (7 diffs)

stable/2.8/Cbc/src/CbcModel.cpp

@@ -2761 +2761 @@
     */
     int iObject ;
-    int preferredWay ;
     int numberUnsatisfied = 0 ;
     delete [] currentSolution_;
@@ -2773 +2772 @@
     for (iObject = 0 ; iObject < numberObjects_ ; iObject++) {
         double infeasibility =
-            object_[iObject]->infeasibility(&usefulInfo, preferredWay) ;
+            object_[iObject]->checkInfeasibility(&usefulInfo) ;
         if (infeasibility ) numberUnsatisfied++ ;
     }
@@ -8527 +8526 @@
         OsiBranchingInformation usefulInfo = usefulInformation();
         for (int i = 0; i < numberObjects_ && integerFeasible; i++) {
-            int preferredWay;
-            double infeasibility = object_[i]->infeasibility(&usefulInfo, preferredWay);
+            double infeasibility = object_[i]->checkInfeasibility(&usefulInfo);
             if (infeasibility)
                 integerFeasible = false;
@@ -12373 +12371 @@
     int numberUnsatisfied = 0;
     //double sumUnsatisfied=0.0;
-    int preferredWay;
     int j;
     // Point to current solution
@@ -12394 +12391 @@
 #ifndef SIMPLE_INTEGER
         const OsiObject * object = object_[j];
-        double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+        double infeasibility = object->checkInfeasibility(&usefulInfo);
         if (infeasibility) {
             assert (infeasibility > 0);
@@ -12414 +12411 @@
     for (; j < numberObjects_; j++) {
         const OsiObject * object = object_[j];
-        double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+        double infeasibility = object->checkInfeasibility(&usefulInfo);
         if (infeasibility) {
             assert (infeasibility > 0);
@@ -13908 +13905 @@
             // again
             //std::cout<<solver_<<std::endl;
+
+            OsiCuts feasCuts;
+
+            for (int i = 0; i < numberCutGenerators_ && (feasCuts.sizeRowCuts () == 0); i++) {
+              if (generator_ [i] -> normal () &&
+                  (!generator_ [i] -> needsOptimalBasis () || solver_ -> basisIsAvailable ()))
+                generator_ [i] -> generateCuts (feasCuts, 1 /* = fullscan */, solver_, NULL);
+            }
+            solver_ -> applyCuts (feasCuts);
+
             resolve(solver_);
             double objval = solver_->getObjValue();
@@ -14932 +14939 @@
             if (feasible) {
                 int iObject ;
-                int preferredWay ;
                 int numberUnsatisfied = 0 ;
                 memcpy(currentSolution_, solver_->getColSolution(),
@@ -14941 +14947 @@
                 for (iObject = 0 ; iObject < numberObjects_ ; iObject++) {
                     double infeasibility =
-                        object_[iObject]->infeasibility(&usefulInfo, preferredWay) ;
+                        object_[iObject]->checkInfeasibility(&usefulInfo) ;
                     if (infeasibility ) numberUnsatisfied++ ;
                 }
@@ -17346 +17352 @@
     {
         int iObject ;
-        int preferredWay ;
         int numberUnsatisfied = 0 ;
         memcpy(currentSolution_, solver_->getColSolution(),
@@ -17355 +17360 @@
         for (iObject = 0 ; iObject < numberObjects_ ; iObject++) {
             double infeasibility =
-                object_[iObject]->infeasibility(&usefulInfo, preferredWay) ;
+                object_[iObject]->checkInfeasibility(&usefulInfo) ;
             if (infeasibility) numberUnsatisfied++ ;
         }

stable/2.8/Cbc/src/CbcNode.cpp

@@ -1412 +1412 @@
                         choice[i].possibleBranch = NULL;
                         const OsiObject * object = model->object(thisChoice.objectNumber);
-                        int preferredWay;
-                        double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+                        double infeasibility = object->checkInfeasibility(&usefulInfo);
                         if (!infeasibility) {
                             // take out
@@ -1626 +1625 @@
             CbcObject * obj =   dynamic_cast <CbcObject *>(object) ;
             if (!obj || !obj->optionalObject()) {
-                int preferredWay;
-                double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+                double infeasibility = object->checkInfeasibility(&usefulInfo);
                 if (infeasibility) {
                     useOldWay = true;
@@ -2047 +2045 @@
                 CbcSimpleIntegerDynamicPseudoCost * dynamicObject =
                     dynamic_cast <CbcSimpleIntegerDynamicPseudoCost *>(object) ;
-                int preferredWay;
-                double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+                double infeasibility = object->checkInfeasibility(&usefulInfo);
                 int priorityLevel = object->priority();
                 if (hotstartSolution) {
@@ -2075 +2072 @@
                                     //else
                                     infeasibility = fabs(value - targetValue);
-                                    //if (targetValue==1.0)
-                                    //infeasibility += 1.0;
-                                    if (value > targetValue) {
-                                        preferredWay = -1;
-                                    } else {
-                                        preferredWay = 1;
-                                    }
                                     priorityLevel = CoinAbs(priorityLevel);
                                 } else if (priorityLevel < 0) {
                                     priorityLevel = CoinAbs(priorityLevel);
-                                    if (targetValue == saveLower[iColumn]) {
+                                    if (targetValue == saveLower[iColumn] ||
+                                    targetValue == saveUpper[iColumn]) {
                                         infeasibility = integerTolerance + 1.0e-12;
-                                        preferredWay = -1;
-                                    } else if (targetValue == saveUpper[iColumn]) {
-                                        infeasibility = integerTolerance + 1.0e-12;
-                                        preferredWay = 1;
                                     } else {
                                         // can't
@@ -3588 +3575 @@
             if (branch_) {
                  const OsiObject * object = model->object(bestChoice);
-                 int preferredWay;
-                 double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+                 double infeasibility = object->checkInfeasibility(&usefulInfo);
                  if (!infeasibility) {
                    // take out
@@ -3595 +3581 @@
                    branch_ = NULL;
                  } else {
+                   // get preferred way
+                   int preferredWay;
+                   object->infeasibility(&usefulInfo, preferredWay);
                    CbcBranchingObject * branchObj =
                      dynamic_cast <CbcBranchingObject *>(branch_) ;
@@ -3829 +3818 @@
         if (!dynamicObject)
             continue;
-        int preferredWay;
-        double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+        double infeasibility = object->checkInfeasibility(&usefulInfo);
         int iColumn = dynamicObject->columnNumber();
         if (saveUpper[iColumn] == saveLower[iColumn])