Ignore:
Timestamp:
Oct 9, 2002 3:32:58 PM (17 years ago)
Author:
forrest
Message:

Allow Presolve to work with gaps

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel-1/Test/ClpMain.cpp

    r33 r34  
    7474  DUALTOLERANCE=1,PRIMALTOLERANCE,DUALBOUND,PRIMALWEIGHT,
    7575
    76   LOGLEVEL=101,MAXFACTOR,PERTURBATION,MAXITERATION,PRESOLVE,
     76  LOGLEVEL=101,MAXFACTOR,PERTURBATION,MAXITERATION,PRESOLVEPASS,
    7777 
    7878  DIRECTION=201,DUALPIVOT,SCALING,ERRORSALLOWED,KEEPNAMES,SPARSEFACTOR,
    79   PRIMALPIVOT,
     79  PRIMALPIVOT,PRESOLVE,
    8080 
    8181  DIRECTORY=301,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,BAB,
     
    796796    parameters[numberParameters-1].append("off");
    797797    parameters[numberParameters++]=
    798       ClpItem("presolve","Whether to presolve problem - how many passes",
    799               0,100,PRESOLVE);
     798      ClpItem("presolve","Whether to presolve problem",
     799              "off",PRESOLVE);
     800    parameters[numberParameters-1].append("on");
     801    parameters[numberParameters++]=
     802      ClpItem("passP!resolve","How many passes in presolve",
     803              0,100,PRESOLVEPASS);
    800804    parameters[numberParameters++]=
    801805      ClpItem("spars!eFactor","Whether factorization treated as sparse",
     
    993997          int value = getIntField(argc,argv,&valid);
    994998          if (!valid) {
    995             if (parameters[iParam].type()==PRESOLVE)
     999            if (parameters[iParam].type()==PRESOLVEPASS)
    9961000              preSolve = value;
    9971001            else
     
    10581062            case KEEPNAMES:
    10591063              keepImportNames = 1-action;
     1064              break;
     1065            case PRESOLVE:
     1066              preSolve = action*5;
    10601067              break;
    10611068            default:
Note: See TracChangeset for help on using the changeset viewer.