Changeset 494 for branches/devel/Cbc


Ignore:
Timestamp:
Dec 1, 2006 12:56:52 PM (13 years ago)
Author:
forrest
Message:

mods

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcLinked.cpp

    r493 r494  
    7878
    7979  }
    80   static int iPass=0;
    81   char temp[50];
    82   iPass++;
    83   sprintf(temp,"cc%d",iPass);
    84   writeMps(temp);
    85   printf("wrote cc%d\n",iPass);
     80  //static int iPass=0;
     81  //char temp[50];
     82  //iPass++;
     83  //sprintf(temp,"cc%d",iPass);
     84  //writeMps(temp);
     85  //printf("wrote cc%d\n",iPass);
    8686  OsiClpSolverInterface::initialSolve();
    8787  int secondaryStatus = modelPtr_->secondaryStatus();
     
    30003000    }
    30013001  }
     3002  if (yRow_<0)
     3003    yLambda = xLambda;
    30023004#if 0
    30033005  if (fabs(x-xLambda)>1.0e-4||
     
    33393341  const CoinPackedMatrix * matrix = solver->getMatrixByCol();
    33403342  const double * element = matrix->getElements();
     3343  const double * objective = solver->getObjCoefficients();
    33413344  const int * row = matrix->getIndices();
    33423345  const CoinBigIndex * columnStart = matrix->getVectorStarts();
     
    33613364        xybar[j] = element[k]*multiplier;
    33623365    }
     3366    if (yRow_<0)
     3367      y=x;
     3368    if (xyRow_<0)
     3369      xybar[j] = objective[iColumn]*multiplier;
    33633370    assert (fabs(xybar[j]-x*y)<1.0e-4);
    33643371    if (j==0)
Note: See TracChangeset for help on using the changeset viewer.