Ignore:
Timestamp:
Oct 31, 2011 7:34:55 PM (8 years ago)
Author:
tkr
Message:

Merging r1750 and r1751 from trunk

Location:
stable/2.7/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7/Cbc

  • stable/2.7/Cbc/src/CbcSolverExpandKnapsack.hpp

    r1573 r1752  
    2020               int fixedPriority, int SOSPriority, CoinModel & tightenedModel);
    2121
     22void
     23afterKnapsack(const CoinModel & coinModel2, const int * whichColumn, const int * knapsackStart,
     24              const int * knapsackRow, int numberKnapsack,
     25              const double * knapsackSolution, double * solution, int logLevel);
     26
    2227#endif
    2328
Note: See TracChangeset for help on using the changeset viewer.