Changeset 1418

Timestamp:

Jan 20, 2010 4:48:56 AM (10 years ago)

Author:

forrest

Message:

fix odd accuracy problem when very large elements

Location:

trunk/Cbc/src

Files:

• CbcModel.cpp (modified) (1 diff)
• CbcNode.cpp (modified) (1 diff)
• CbcSolver.cpp (modified) (1 diff)

trunk/Cbc/src/CbcModel.cpp

@@ -10211 +10211 @@
       //obj2->setNumberBeforeTrust(numberBeforeTrust_);
     }
+    obj1 = dynamic_cast <CbcSimpleInteger *>(object_[iObject]) ;
+    if (obj1)
+      obj1->setPosition(iObject);
   }
   if (branchingMethod_) {

trunk/Cbc/src/CbcNode.cpp

@@ -3108 +3108 @@
           break;
         }
+        // Double check looks OK - just look at rows with all integers
+        if (model->allDynamic()) {
+          double * solution = CoinCopyOfArray(saveSolution,numberColumns);
+          for (int i=0;i<numberColumns;i++) {
+            if (model->isInteger(i))
+              solution[i]=floor(solution[i]+0.5);
+          }
+          int numberRows = solver->getNumRows();
+          double * rowActivity = new double [numberRows];
+          CoinZeroN(rowActivity,numberRows);
+          solver->getMatrixByCol()->times(solution,rowActivity);
+          //const double * element = model->solver()->getMatrixByCol()->getElements();
+          const int * row = model->solver()->getMatrixByCol()->getIndices();
+          const CoinBigIndex * columnStart = model->solver()->getMatrixByCol()->getVectorStarts();
+          const int * columnLength = model->solver()->getMatrixByCol()->getVectorLengths();
+          int nFree=0;
+          int nFreeNon=0;
+          int nFixedNon=0;
+          double mostAway=0.0;
+          int whichAway=-1;
+          const double * columnLower = solver->getColLower();
+          const double * columnUpper = solver->getColUpper();
+          for (int i=0;i<numberColumns;i++) {
+            if (!model->isInteger(i)) {
+              // mark rows as flexible
+              CoinBigIndex start = columnStart[i];
+              CoinBigIndex end = start + columnLength[i];
+              for (CoinBigIndex j=start;j<end;j++) {
+                int iRow = row[j];
+                rowActivity[iRow]=COIN_DBL_MAX;
+              }
+            } else if (columnLower[i]<columnUpper[i]) {
+              if (solution[i]!=saveSolution[i]) {
+                nFreeNon++;
+                if (fabs(solution[i]-saveSolution[i])>mostAway) {
+                  mostAway=fabs(solution[i]-saveSolution[i]);
+                  whichAway=i;
+                }
+              } else {
+                nFree++;
+              }
+            } else if (solution[i]!=saveSolution[i]) {
+              nFixedNon++;
+            }
+          }
+          const double * lower = solver->getRowLower();
+          const double * upper = solver->getRowUpper();
+          bool satisfied=true;
+          for (int i=0;i<numberRows;i++) {
+            double value = rowActivity[i];
+            if (value!=COIN_DBL_MAX) {
+              if (value>upper[i]+1.0e-5||value<lower[i]-1.0e-5) {
+                satisfied=false;
+              }
+            }
+          }
+          delete [] rowActivity;
+          delete [] solution;
+          if (!satisfied) {
+#ifdef CLP_INVESTIGATE
+            printf("%d free ok %d free off target %d fixed off target\n",
+                   nFree,nFreeNon,nFixedNon);
+#endif
+            if (nFreeNon) {
+              // try branching on these
+              delete branch_;
+              for (int i = 0; i < numberObjects; i++) {
+                OsiObject * object = model->modifiableObject(i);
+                CbcSimpleIntegerDynamicPseudoCost * obj =
+                    dynamic_cast <CbcSimpleIntegerDynamicPseudoCost *>(object) ;
+                assert (obj);
+                int iColumn = obj->columnNumber();
+                if (iColumn==whichAway) {
+                  int preferredWay = (saveSolution[iColumn]>solution[iColumn])
+                    ? -1 : +1;
+                  usefulInfo.integerTolerance_=0.0;
+                  branch_ = obj->createCbcBranch(solver, &usefulInfo, preferredWay);
+                  break;
+                }
+              }
+              anyAction=0;
+              break;
+              delete [] saveLower;
+              delete [] saveUpper;
+              delete [] saveSolution;
+              return 0;
+            }
+          }
+        }
       } else if (iPass==1) {
         // looks like a solution - get paranoid

trunk/Cbc/src/CbcSolver.cpp

@@ -10369 +10369 @@
                 fp=stderr;
               } else {
-                if (field[0]=='/'||field[0]=='\\') {
+                bool absolutePath;
+                if (dirsep=='/') {
+                  // non Windows (or cygwin)
+                  absolutePath=(field[0]=='/');
+                } else {
+                  //Windows (non cycgwin)
+                  absolutePath=(field[0]=='\\');
+                  // but allow for :
+                  if (strchr(field.c_str(),':'))
+                    absolutePath=true;
+                }
+                if (absolutePath) {
                   fileName = field;
                 } else if (field[0]=='~') {