Ignore:
Timestamp:
Jun 26, 2007 3:00:48 AM (13 years ago)
Author:
forrest
Message:

moving branches/devel to trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        11MSVisualStudio   https://projects.coin-or.org/svn/MSVisualStudio/trunk/ExternalsDirs/Clp
        22BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
        3 Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
        4 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
        5 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.0/CoinUtils
         3ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
         5Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
         6Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
         7CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
  • trunk/Clp/src/unitTest.cpp

    r799 r1034  
    241241//----------------------------------------------------------------
    242242int mainTest (int argc, const char *argv[],int algorithm,
    243               ClpSimplex empty, bool doPresolve, int switchOffValue)
     243              ClpSimplex empty, bool doPresolve, int switchOffValue,bool doVector)
    244244{
    245245  int i;
     
    503503            if (solution.maximumSeconds()<0.0)
    504504              solution.setMaximumSeconds(120.0);
     505            if (doVector) {
     506              ClpMatrixBase * matrix = solution.clpMatrix();
     507              if (dynamic_cast< ClpPackedMatrix*>(matrix)) {
     508                ClpPackedMatrix * clpMatrix = dynamic_cast< ClpPackedMatrix*>(matrix);
     509                clpMatrix->makeSpecialColumnCopy();
     510              }
     511            }
    505512            solution.initialSolve(solveOptions);
    506513            double time2 = CoinCpuTime()-time1;
     
    591598          solveOptions.setPresolveType(ClpSolve::presolveOff);
    592599      }
     600      if (doVector) {
     601        ClpMatrixBase * matrix = solution.clpMatrix();
     602        if (dynamic_cast< ClpPackedMatrix*>(matrix)) {
     603          ClpPackedMatrix * clpMatrix = dynamic_cast< ClpPackedMatrix*>(matrix);
     604          clpMatrix->makeSpecialColumnCopy();
     605        }
     606      }
    593607      solution.initialSolve(solveOptions);
    594608      double time2 = CoinCpuTime()-time1;
     
    784798    model.setFactorizationFrequency(10);
    785799    model.primal();
    786 
     800    model.primal(0,3);
     801    model.setObjCoeff(3,-2.9473684210526314);
     802    model.primal(0,3);
    787803    // Write saved solutions
    788804    int nc = model.getNumCols();
     
    898914             i,valueIncrease[i],sequenceIncrease[i],
    899915             valueDecrease[i],sequenceDecrease[i]);
    900     assert (fabs(valueDecrease[3]-0.642857)<1.0e-4);
    901     assert (fabs(valueDecrease[8]-2.95113)<1.0e-4);
     916    assert (fabs(valueIncrease[3]-0.642857)<1.0e-4);
     917    assert (fabs(valueIncrease[8]-2.95113)<1.0e-4);
    902918#if 0
    903919    // out until I find optimization bug
     
    14561472    FILE * fp = fopen(fn.c_str(),"r");
    14571473    if (!fp) {
    1458       // Try in Samples
    1459       fn = "Samples/input.130";
     1474      // Try in Data/Sample
     1475      fn = "Data/Sample/input.130";
    14601476      fp = fopen(fn.c_str(),"r");
    14611477    }
    14621478    if (!fp) {
    1463       fprintf(stderr,"Unable to open file input.130 in mpsDir or Samples directory\n");
     1479      fprintf(stderr,"Unable to open file input.130 in mpsDir or Data/Sample directory\n");
    14641480    } else {
    14651481      int problem;
Note: See TracChangeset for help on using the changeset viewer.