Ignore:
Timestamp:
Sep 24, 2009 4:48:01 PM (10 years ago)
Author:
forrest
Message:

minor changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/unitTest.cpp

    r1402 r1434  
    252252//----------------------------------------------------------------
    253253int mainTest (int argc, const char *argv[],int algorithm,
    254               ClpSimplex empty, bool doPresolve, int switchOffValue,bool doVector)
     254              ClpSimplex empty, ClpSolve solveOptionsIn,
     255              int switchOffValue,bool doVector)
    255256{
    256257  int i;
     
    562563#endif
    563564      ClpSolve::SolveType method;
    564       ClpSolve::PresolveType presolveType;
    565       ClpSolve solveOptions;
    566       if (doPresolve)
    567         presolveType=ClpSolve::presolveOn;
    568       else
    569         presolveType=ClpSolve::presolveOff;
    570       solveOptions.setPresolveType(presolveType,5);
     565      ClpSolve solveOptions=solveOptionsIn;
    571566      std::string nameAlgorithm;
    572567      if (algorithm!=5) {
Note: See TracChangeset for help on using the changeset viewer.