Changeset 612

Timestamp:

May 15, 2007 6:11:44 AM (14 years ago)

Author:

forrest

Message:

for nonlinear

Location:

branches/devel/Cbc/src

Files:

• CbcLinked.cpp (modified) (2 diffs)
• CbcSolver.cpp (modified) (8 diffs)

branches/devel/Cbc/src/CbcLinked.cpp

@@ -6483 +6483 @@
     double upperColumn=columnUpper(iColumn);
     double gap = upperColumn-lowerColumn;
+    if (gap>1.0e8)
+      gap=1.0e8;
     assert (fabs(floor(gap+0.5)-gap)<1.0e-5);
     whichColumn[numJ]=iColumn;
@@ -6891 +6893 @@
             if (jColumn>=0) {
               columnQuadratic[numberQuadratic]=jColumn;
-              elementQuadratic[numberQuadratic++]=2.0*value; // convention
+              //? elementQuadratic[numberQuadratic++]=2.0*value; // convention
+              elementQuadratic[numberQuadratic++]=value; // ? what about diagonal
               largestColumn = CoinMax(largestColumn,jColumn);
             } else if (jColumn==-2) {

branches/devel/Cbc/src/CbcSolver.cpp

@@ -475 +475 @@
                int * knapsackRow, int &numberKnapsack,
                CglStored & stored, int logLevel,
-               int fixedPriority, int SOSPriority)
+               int fixedPriority, int SOSPriority,CoinModel & tightenedModel)
 {
   int maxTotal = numberKnapsack;
@@ -514 +514 @@
   CoinModel coinModel=*si->coinModel();
   assert(coinModel.numberRows()>0);
+  tightenedModel = coinModel;
   int numberRows = coinModel.numberRows();
   // Mark variables
@@ -953 +954 @@
   si=NULL;
   if (!badModel) {
+    finalModel->setDblParam(OsiObjOffset,coinModel.objectiveOffset());
     return finalModel;
   } else {
@@ -1300 +1302 @@
 #ifdef COIN_HAS_ASL
     CoinModel * coinModel = NULL;
+<<<<<<< .mine
+    CglStored storedAmpl;
+=======
+>>>>>>> .r611
     ampl_info info;
-    CglStored storedAmpl;
     CoinModel saveCoinModel;
+    CoinModel saveTightenedModel;
     int * whichColumn = NULL;
     int * knapsackStart=NULL;
@@ -1407 +1413 @@
         complicatedInteger=1;
         if (info.cut) {
-          printf("warning - cuts with LOS\n");
+          printf("Sorry - can't do cuts with LOS as ruins delicate row order\n");
+          abort();
           int numberRows = info.numberRows;
           int * whichRow = new int [numberRows];
@@ -1429 +1436 @@
           }
           solver->deleteRows(nDelete,whichRow);
+          // and special matrix
+          si->cleanMatrix()->deleteRows(nDelete,whichRow);
           delete [] whichRow;
         }
@@ -3157 +3166 @@
                       OsiSolverInterface * solver = expandKnapsack(saveCoinModel,whichColumn,knapsackStart,
                                                                    knapsackRow,numberKnapsack,
-                                                                   storedAmpl,logLevel,extra1,extra2);
+                                                                   storedAmpl,logLevel,extra1,extra2,
+                                                                   saveTightenedModel);
                       if (solver) {
                         clpSolver = dynamic_cast< OsiClpSolverInterface*> (solver);
@@ -4457 +4467 @@
                       info.primalSolution = (double *) malloc(numberColumns*sizeof(double));
                       // Fills in original solution (coinModel length)
-                      afterKnapsack(saveCoinModel,  whichColumn,  knapsackStart, 
+                      afterKnapsack(saveTightenedModel,  whichColumn,  knapsackStart, 
                                     knapsackRow,  numberKnapsack,
                                     lpSolver->primalColumnSolution(), info.primalSolution,1);