Ignore:
Timestamp:
May 9, 2010 1:25:07 PM (10 years ago)
Author:
pbelotti
Message:

change nlp solver interface to access options. Solving ticket #4 on timelimit. Corrected coefficient assignment in quadratic

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenne.cpp

    r312 r335  
    5454
    5555  char * pbName = NULL;
    56   double time_start = CoinCpuTime();
    5756
    5857  const int infeasible = 1;
     
    8988    if (!couenne.InitializeCouenne (argv, p, NULL, ci))
    9089      throw infeasible;
     90
     91    double time_start = CoinCpuTime();
    9192
    9293#if 0
     
    99100    couenne.options () -> GetNumericValue ("time_limit", timeLimit, "couenne.");
    100101    couenne.setDoubleParameter (BabSetupBase::MaxTime,
    101                                 timeLimit - (time_start = (CoinCpuTime () - time_start)));
     102                                CoinMax (0., timeLimit - time_start));
    102103
    103104    //////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.