Changeset 2481 for trunk


Ignore:
Timestamp:
Feb 9, 2019 6:41:47 AM (5 months ago)
Author:
unxusr
Message:

fix for building with ASL

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/test/gamsTest.cpp

    r2469 r2481  
    9797  solver1.setObjSense(-1);
    9898
     99  CbcSolverUsefulData data;
    99100  CbcModel model(solver1);
    100   CbcMain0(model);
     101  CbcMain0(model, data);
    101102
    102103  int which[3] = { 0, 1, 2 };
     
    106107
    107108  const char *argv2[] = { "gamstest_sos1a", "-solve", "-quit" };
    108   CbcMain1(3, argv2, model);
     109  CbcMain1(3, argv2, model, data);
    109110  cout << endl;
    110111  if (!model.isProvenOptimal()) {
     
    289290    }
    290291    CbcModel model(solver1);
    291     CbcMain0(model);
     292    CbcSolverUsefulData data;
     293    CbcMain0(model, data);
    292294    int which[3] = { 0, 1, 2 };
    293295    CbcObject *sosobject = new CbcSOS(&model, 3, which, NULL, 0, 2);
     
    296298    const char *argv2[] = { "gamstest_sos2a", "-solve", "-quit" };
    297299    cout << "\nSolving sos2a model with w1 having lower bound " << solver1.getColLower()[0] << endl;
    298     CbcMain1(3, argv2, model);
     300    CbcMain1(3, argv2, model, data);
    299301    cout << endl;
    300302    if (!model.isProvenOptimal()) {
     
    403405  for (int testcase = 0; testcase < 5; ++testcase) {
    404406    CbcModel model(solver1);
    405     CbcMain0(model);
     407    CbcSolverUsefulData data;
     408    CbcMain0(model, data);
    406409
    407410    double points[4] = { 0., 0., 0., 10. };
     
    477480         << endl;
    478481    const char *argv2[] = { "gamstest_semicon1", "-solve", "-quit" };
    479     CbcMain1(3, argv2, model);
     482    CbcMain1(3, argv2, model, data);
    480483    cout << endl;
    481484    if (!model.isProvenOptimal()) {
     
    613616  for (int testcase = 0; testcase < 6; ++testcase) {
    614617    CbcModel model(solver1);
    615     CbcMain0(model);
     618    CbcSolverUsefulData data;
     619    CbcMain0(model, data);
    616620
    617621    double points[10];
     
    710714         << endl;
    711715    const char *argv2[] = { "gamstest_semiint1", "-solve", "-quit" };
    712     CbcMain1(3, argv2, model);
     716    CbcMain1(3, argv2, model, data);
    713717    cout << endl;
    714718    if (!model.isProvenOptimal()) {
Note: See TracChangeset for help on using the changeset viewer.