Changeset 462


Ignore:
Timestamp:
Oct 1, 2004 4:01:19 PM (16 years ago)
Author:
forrest
Message:

stuff

Location:
trunk/Test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Test/ClpMain.cpp

    r451 r462  
    1414#include "CoinPragma.hpp"
    1515#include "CoinHelperFunctions.hpp"
    16 #define CLPVERSION "0.99.9"
     16#define CLPVERSION "0.99.99"
    1717
    1818#include "CoinMpsIO.hpp"
     
    6868
    6969  LOGLEVEL=101,MAXFACTOR,PERTVALUE,MAXITERATION,PRESOLVEPASS,IDIOT,SPRINT,
    70   OUTPUTFORMAT,SLPVALUE,
     70  OUTPUTFORMAT,SLPVALUE,PRESOLVEOPTIONS,PRINTOPTIONS,
    7171 
    7272  DIRECTION=201,DUALPIVOT,SCALING,ERRORSALLOWED,KEEPNAMES,SPARSEFACTOR,
     
    891891    int outputFormat=2;
    892892    int slpValue=-1;
     893    int printOptions=0;
     894    int presolveOptions=0;
    893895    int doCrash=0;
    894896    int doSprint=-1;
     
    12961298       );
    12971299    parameters[numberParameters++]=
     1300      ClpItem("preO!pt","Presolve options",
     1301              0,INT_MAX,PRESOLVEOPTIONS,false);
     1302    parameters[numberParameters++]=
    12981303      ClpItem("presolve","Whether to presolve problem",
    12991304              "on",PRESOLVE);
     
    13591364       );
    13601365    parameters[numberParameters-1].setDoubleValue(models->infeasibilityCost());
     1366    parameters[numberParameters++]=
     1367      ClpItem("printO!ptions","Print options",
     1368              0,INT_MAX,PRINTOPTIONS,false);
    13611369    parameters[numberParameters++]=
    13621370      ClpItem("quit","Stops clp execution",
     
    16551663            else if (parameters[iParam].type()==SLPVALUE)
    16561664              slpValue = value;
     1665            else if (parameters[iParam].type()==PRESOLVEOPTIONS)
     1666              presolveOptions = value;
     1667            else if (parameters[iParam].type()==PRINTOPTIONS)
     1668              printOptions = value;
    16571669            else
    16581670              parameters[iParam].setIntParameter(models+iModel,value);
     
    18241836              }
    18251837              solveOptions.setSolveType(method);
     1838              solveOptions.setSpecialOption(4,presolveOptions);
     1839              solveOptions.setSpecialOption(5,printOptions);
    18261840              if (method==ClpSolve::useDual) {
    18271841                // dual
  • trunk/Test/unitTest.cpp

    r448 r462  
    10261026  // test network
    10271027#define QUADRATIC
    1028 #ifndef QUADRATIC
    10291028  if (1) {   
    10301029    std::string fn = mpsDir+"input.130";
     
    11541153                        lowerColumn,upperColumn,objective,
    11551154                        lower,upper);
    1156      
    11571155      model.factorization()->maximumPivots(200+model.numberRows()/100);
    11581156      model.createStatus();
     
    11921190    }
    11931191  }
    1194 #endif
    11951192#ifdef QUADRATIC
    11961193  // Test quadratic to solve linear
Note: See TracChangeset for help on using the changeset viewer.