Changeset 1795 for stable/2.7


Ignore:
Timestamp:
Sep 3, 2012 8:58:59 AM (7 years ago)
Author:
stefan
Message:

merge r1794 from trunk: make CbcModel::checkSolution virtual

Location:
stable/2.7/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7/Cbc

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

    r1779 r1795  
    11761176        Returns objective value (worse than cutoff if not feasible)
    11771177        Previously computed objective value is now passed in (in case user does not do solve)
    1178     */
    1179     double checkSolution(double cutoff, double * solution,
     1178        virtual so user can override
     1179    */
     1180    virtual double checkSolution(double cutoff, double * solution,
    11801181                         int fixVariables, double originalObjValue);
    11811182    /** Test the current solution for feasiblility.
     
    18411842
    18421843    /// Destructor
    1843     ~CbcModel ();
     1844    virtual ~CbcModel ();
    18441845
    18451846    /// Returns solver - has current state
Note: See TracChangeset for help on using the changeset viewer.