Changeset 702

Timestamp:

Jul 24, 2007 3:52:59 PM (14 years ago)

Author:

forrest

Message:

changes for gcc 4.3

Location:

trunk/Cbc/src

Files:

• CbcBranchActual.cpp (modified) (2 diffs)
• CbcBranchDynamic.cpp (modified) (1 diff)
• CbcCutGenerator.cpp (modified) (1 diff)
• CbcFathomDynamicProgramming.cpp (modified) (2 diffs)
• CbcFathomDynamicProgramming.hpp (modified) (1 diff)
• CbcLinked.cpp (modified) (2 diffs)
• CbcMessage.cpp (modified) (1 diff)
• CbcModel.cpp (modified) (3 diffs)
• CbcNode.cpp (modified) (3 diffs)
• CbcSolver.cpp (modified) (10 diffs)

trunk/Cbc/src/CbcBranchActual.cpp

@@ -1967 +1967 @@
   if (beforeSolution) {
     if (!bestObject_) {
-      bestNumberUp_=INT_MAX;
-      bestNumberDown_=INT_MAX;
+      bestNumberUp_=COIN_INT_MAX;
+      bestNumberDown_=COIN_INT_MAX;
     }
     // before solution - choose smallest number 
@@ -2117 +2117 @@
        4 - take cheapest up branch if infeasibilities same
     */
-    int bestNumber=INT_MAX;
+    int bestNumber=COIN_INT_MAX;
     double bestCriterion=-1.0e50;
     double alternativeCriterion = -1.0;

trunk/Cbc/src/CbcBranchDynamic.cpp

@@ -1266 +1266 @@
   if (!bestObject_) {
     bestCriterion_=-1.0;
-    bestNumberUp_=INT_MAX;
-    bestNumberDown_=INT_MAX;
+    bestNumberUp_=COIN_INT_MAX;
+    bestNumberDown_=COIN_INT_MAX;
   }
   if (stateOfSearch<=1&&thisOne->model()->currentNode()->depth()>=8) {

trunk/Cbc/src/CbcCutGenerator.cpp

@@ -479 +479 @@
 CbcCutSubsetModifier::CbcCutSubsetModifier ()
   : CbcCutModifier(),
-    firstOdd_(INT_MAX)
+    firstOdd_(COIN_INT_MAX)
 {
 }

trunk/Cbc/src/CbcFathomDynamicProgramming.cpp

@@ -195 +195 @@
   // check size of array needed
   double size=1.0;
-  double check = INT_MAX;
+  double check = COIN_INT_MAX;
   for (i=0;i<numberRows;i++) {
     int n= (int) floor(rhs[i]+0.5);
@@ -224 +224 @@
   // set size needed
   if (size>=check)
-    size_=INT_MAX;
+    size_=COIN_INT_MAX;
   else
     size_=(int) size;

trunk/Cbc/src/CbcFathomDynamicProgramming.hpp

@@ -69 +69 @@
   bool tryColumn(int numberElements, const int * rows,
                     const double * coefficients, float cost,
-                    int upper=INT_MAX);
+                    int upper=COIN_INT_MAX);
   /// Returns cost array
   inline const float * cost() const

trunk/Cbc/src/CbcLinked.cpp

@@ -669 +669 @@
               double * solution2 = NULL;
               int numberColumns = quadraticModel_->numberColumns();
-              int depth=6;
+              int depth = cbcModel_->currentNode() ? cbcModel_->currentNode()->depth() : 0;
               if (depth<5) {
                 ClpSimplex qpTemp(*quadraticModel_);
@@ -683 +683 @@
                 assert (!qpTemp.problemStatus());
                 if (qpTemp.objectiveValue()<bestObjectiveValue_-1.0e-3&&!qpTemp.problemStatus()) {
+                  solution2 = CoinCopyOfArray(qpTemp.primalColumnSolution(),numberColumns);
                 } else {
                   printf("QP says expensive - kill\n");
+                  modelPtr_->setProblemStatus(1);
+                  modelPtr_->setObjectiveValue(COIN_DBL_MAX);
+                  break;
                 }
               }
-              cbcModel_->lockThread();
               const double * solution = getColSolution();
               // add OA cut
-              double offset=0.0;
-              double * gradient = new double [numberColumns+1];
-              // gradient from bilinear
-              int i;
-              CoinZeroN(gradient,numberColumns+1);
-              //const double * objective = modelPtr_->objective();
-              assert (objectiveRow_>=0);
-              const double * element = originalRowCopy_->getElements();
-              const int * column2 = originalRowCopy_->getIndices();
-              const CoinBigIndex * rowStart = originalRowCopy_->getVectorStarts();
-              //const int * rowLength = originalRowCopy_->getVectorLengths();
-              //int numberColumns2 = coinModel_.numberColumns();
-              for ( i=rowStart[objectiveRow_];i<rowStart[objectiveRow_+1];i++) 
-                gradient[column2[i]] = element[i];
-              //const double * columnLower = modelPtr_->columnLower();
-              //const double * columnUpper = modelPtr_->columnUpper();
-              for ( i =0;i<numberObjects_;i++) {
-                OsiBiLinear * obj = dynamic_cast<OsiBiLinear *> (object_[i]);
-                if (obj) {
-                  int xColumn = obj->xColumn();
-                  int yColumn = obj->yColumn();
-                  if (xColumn!=yColumn) {
-                    double coefficient = /* 2.0* */obj->coefficient();
-                    gradient[xColumn] += coefficient*solution[yColumn];
-                    gradient[yColumn] += coefficient*solution[xColumn];
-                    offset += coefficient*solution[xColumn]*solution[yColumn];
-                  } else {
-                    double coefficient = obj->coefficient();
-                    gradient[xColumn] += 2.0*coefficient*solution[yColumn];
-                    offset += coefficient*solution[xColumn]*solution[yColumn];
-                  }
-                }
-              }
-              // assume convex
-              double rhs = 0.0;
-              int * column = new int[numberColumns+1];
-              int n=0;
-              for (int i=0;i<numberColumns;i++) {
-                double value = gradient[i];
-                if (fabs(value)>1.0e-12) {
-                  gradient[n]=value;
-                  rhs += value*solution[i];
-                  column[n++]=i;
-                }
-              }
-              gradient[n]=-1.0;
-              assert (objectiveVariable_>=0);
-              rhs -= solution[objectiveVariable_];
-              column[n++]=objectiveVariable_;
-              if (rhs>offset+1.0e-5) {
-                gen2->addCut(-COIN_DBL_MAX,offset+1.0e-7,n,column,gradient);
-                //printf("added cut with %d elements\n",n);
-              }
+              doAOCuts(gen2, solution, solution);
               if (solution2) {
                 doAOCuts(gen2, solution, solution2);
                 delete [] solution2;
               }
-              delete [] gradient;
-              delete [] column;
-              cbcModel_->unlockThread();
               break;
             }

trunk/Cbc/src/CbcMessage.cpp

@@ -7 +7 @@
 
 #include "CbcMessage.hpp"
+#include <cstring>
 
 typedef struct {

trunk/Cbc/src/CbcModel.cpp

@@ -2814 +2814 @@
   continuousObjective_(COIN_DBL_MAX),
   originalContinuousObjective_(COIN_DBL_MAX),
-  continuousInfeasibilities_(INT_MAX),
+  continuousInfeasibilities_(COIN_INT_MAX),
   maximumCutPassesAtRoot_(20),
   maximumCutPasses_(10),
@@ -2952 +2952 @@
   continuousObjective_(COIN_DBL_MAX),
   originalContinuousObjective_(COIN_DBL_MAX),
-  continuousInfeasibilities_(INT_MAX),
+  continuousInfeasibilities_(COIN_INT_MAX),
   maximumCutPassesAtRoot_(20),
   maximumCutPasses_(10),
@@ -3375 +3375 @@
     continuousObjective_=COIN_DBL_MAX;
     originalContinuousObjective_=COIN_DBL_MAX;
-    continuousInfeasibilities_=INT_MAX;
+    continuousInfeasibilities_=COIN_INT_MAX;
     maximumNumberCuts_=0;
     tree_->cleanTree(this,-COIN_DBL_MAX,bestPossibleObjective_);

trunk/Cbc/src/CbcNode.cpp

@@ -1231 +1231 @@
       // initialize sum of "infeasibilities"
       sumInfeasibilities_ = 0.0;
-      int bestPriority=INT_MAX;
+      int bestPriority=COIN_INT_MAX;
       /*
         Scan for branching objects that indicate infeasibility. Choose the best
@@ -2021 +2021 @@
         double averageCostPerIteration=0.0;
         double totalNumberIterations=1.0;
-        int smallestNumberInfeasibilities=INT_MAX;
+        int smallestNumberInfeasibilities=COIN_INT_MAX;
         for (i=0;i<numberStrong;i++) {
           totalNumberIterations += choice[i].numItersDown +
@@ -2406 +2406 @@
       // initialize sum of "infeasibilities"
       sumInfeasibilities_ = 0.0;
-      int bestPriority=INT_MAX;
+      int bestPriority=COIN_INT_MAX;
       int number01 = 0;
       const fixEntry * entry = NULL;

trunk/Cbc/src/CbcSolver.cpp

@@ -99 +99 @@
 #include "OsiColCut.hpp"
 #ifndef COIN_HAS_LINK
-#ifdef COIN_HAS_ASL
+//#ifdef COIN_HAS_ASL
 #define COIN_HAS_LINK
-#endif
+//#endif
 #endif
 #ifdef COIN_HAS_LINK
@@ -469 +469 @@
   }
 }
-#ifdef COIN_HAS_LINK
+#ifdef COIN_HAS_ASL
 /*  Returns OsiSolverInterface (User should delete)
     On entry numberKnapsack is maximum number of Total entries
@@ -1464 +1464 @@
     int * sosPriority=NULL;
     CglStored storedAmpl;
+    CoinModel * coinModel = NULL;
 #ifdef COIN_HAS_ASL
-    CoinModel * coinModel = NULL;
     ampl_info info;
     CoinModel saveCoinModel;
@@ -1484 +1484 @@
             noPrinting=false;
             info.logLevel=atoi(equals+1);
+            int log = whichParam(LOGLEVEL,numberParameters,parameters);
+            parameters[log].setIntValue(info.logLevel);
             // mark so won't be overWritten
             info.numberRows=-1234567;
@@ -1559 +1561 @@
         // need some relative granularity
         si->setDefaultBound(100.0);
-        si->setDefaultMeshSize(0.01);
+        si->setDefaultMeshSize(0.001);
         si->setDefaultBound(100000.0);
         si->setIntegerPriority(1000);
         si->setBiLinearPriority(10000);
         CoinModel * model2 = (CoinModel *) coinModel;
-        si->load(*model2,true,info.logLevel);
+        int logLevel = whichParam(LOGLEVEL,numberParameters,parameters);
+        si->load(*model2,true,logLevel);
         // redo
         solver = model.solver();
@@ -1571 +1574 @@
         clpSolver->messageHandler()->setLogLevel(0) ;
         testOsiParameters=0;
+        parameters[whichParam(TESTOSI,numberParameters,parameters)].setIntValue(0);
         complicatedInteger=1;
         if (info.cut) {
@@ -2749 +2753 @@
                     // need some relative granularity
                     si->setDefaultBound(100.0);
-                    si->setDefaultMeshSize(0.01);
+                    si->setDefaultMeshSize(0.001);
                     si->setDefaultBound(1000.0);
                     si->setIntegerPriority(1000);
@@ -2755 +2759 @@
                     si->setSpecialOptions2(2+4+8);
                     CoinModel * model2 = (CoinModel *) coinModel;
-                    si->load(*model2,true,info.logLevel);
+                    si->load(*model2,true, parameters[log].intValue());
                     // redo
                     solver = model.solver();
@@ -3283 +3287 @@
               }
               int testOsiOptions = parameters[whichParam(TESTOSI,numberParameters,parameters)].intValue();
-#ifdef COIN_HAS_LINK
+#ifdef COIN_HAS_ASL
               // If linked then see if expansion wanted
               {
@@ -4994 +4998 @@
                 // need some relative granularity
                 si->setDefaultBound(100.0);
-                si->setDefaultMeshSize(0.01);
+                si->setDefaultMeshSize(0.001);
                 si->setDefaultBound(100.0);
                 si->setIntegerPriority(1000);