Changeset 1111 for trunk


Ignore:
Timestamp:
Dec 22, 2008 5:34:24 AM (11 years ago)
Author:
forrest
Message:

small correction

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/examples/driver4.cpp

    r834 r1111  
    218218     So we need pointer to model.  Old way could use modelA. rather than model->
    219219   */
     220  // Messy code below copied from CbcSolver.cpp
     221#ifdef CLP_FAST_CODE
     222// force new style solver
    220223#ifndef NEW_STYLE_SOLVER
     224#define NEW_STYLE_SOLVER 1
     225#endif
     226#else
     227// Not new style solver
     228#ifndef NEW_STYLE_SOLVER
     229#define NEW_STYLE_SOLVER 0
     230#endif
     231#endif
     232#if NEW_STYLE_SOLVER==0
    221233  // Pass to Cbc initialize defaults
    222234  CbcModel modelA(solver1);
     
    233245    CbcMain1(argc-1,argv+1,modelA,callBack);
    234246  } else {
    235     const char * argv2[]={"driver3","-solve","-quit"};
     247    const char * argv2[]={"driver4","-solve","-quit"};
    236248    CbcMain1(3,argv2,modelA,callBack);
    237249  }
Note: See TracChangeset for help on using the changeset viewer.