Changeset 494 for branches/devel/Cbc/src/CbcLinked.cpp

Timestamp:

Dec 1, 2006 12:56:52 PM (14 years ago)

Author:

forrest

Message:

mods

File:

• branches/devel/Cbc/src/CbcLinked.cpp (modified) (4 diffs)

branches/devel/Cbc/src/CbcLinked.cpp

@@ -78 +78 @@
 
   }
-  static int iPass=0;
-  char temp[50];
-  iPass++;
-  sprintf(temp,"cc%d",iPass);
-  writeMps(temp);
-  printf("wrote cc%d\n",iPass);
+  //static int iPass=0;
+  //char temp[50];
+  //iPass++;
+  //sprintf(temp,"cc%d",iPass);
+  //writeMps(temp);
+  //printf("wrote cc%d\n",iPass);
   OsiClpSolverInterface::initialSolve();
   int secondaryStatus = modelPtr_->secondaryStatus();
@@ -3000 +3000 @@
     }
   }
+  if (yRow_<0)
+    yLambda = xLambda;
 #if 0
   if (fabs(x-xLambda)>1.0e-4||
@@ -3339 +3341 @@
   const CoinPackedMatrix * matrix = solver->getMatrixByCol();
   const double * element = matrix->getElements();
+  const double * objective = solver->getObjCoefficients();
   const int * row = matrix->getIndices();
   const CoinBigIndex * columnStart = matrix->getVectorStarts();
@@ -3361 +3364 @@
         xybar[j] = element[k]*multiplier;
     }
+    if (yRow_<0)
+      y=x;
+    if (xyRow_<0)
+      xybar[j] = objective[iColumn]*multiplier;
     assert (fabs(xybar[j]-x*y)<1.0e-4);
     if (j==0)