Changeset 284


Ignore:
Timestamp:
Jan 24, 2010 10:09:39 AM (10 years ago)
Author:
stefan
Message:

should give ci->model() if ci is given

Location:
stable/0.3/Couenne/src/main
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.3/Couenne/src/main/BonCouenneSetup.cpp

    r258 r284  
    528528    return true;
    529529  }
     530
     531  bool CouenneSetup::InitializeCouenne (char ** argv,
     532          CouenneProblem *couenneProb,
     533          Bonmin::CouenneInterface *ci) {
     534    InitializeCouenne(argv, couenneProb, ci ? ci->model() : NULL, ci);
     535  }
    530536 
    531537  void CouenneSetup::registerOptions(){
  • stable/0.3/Couenne/src/main/BonCouenneSetup.hpp

    r283 r284  
    6767    bool InitializeCouenne(char ** argv = NULL,
    6868         CouenneProblem *couenneProb = NULL,
    69          CouenneInterface *ci = NULL)
    70     { InitializeCouenne(argv, couenneProb, NULL, ci); }
     69         CouenneInterface *ci = NULL);
    7170
    7271    /** register the options */
Note: See TracChangeset for help on using the changeset viewer.