Ignore:
Timestamp:
Jun 20, 2011 9:36:43 AM (9 years ago)
Author:
pbelotti
Message:

FP: avoid passing depth as an argument -- retrieved from model_. Optimized some code in pool.findClosestAndReplace(). Removed global variable currentmilpmethod, replaced with static int within findSolution() --- though still not so thread safe. Diversified power operators to make it easy to insert new patch by Stefan Vigerske.

File:
1 edited

Legend:

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

    r610 r698  
    166166                     prob -> nOrigIntVars (),
    167167                     prob -> nVars    () - prob -> nOrigVars (),
    168                      prob -> nIntVars () - prob -> nOrigIntVars ());
     168                     CoinMax (0, prob -> nIntVars () - prob -> nOrigIntVars ()));
    169169
    170170    double time_start = CoinCpuTime();
Note: See TracChangeset for help on using the changeset viewer.