Changeset 1795 for stable/2.7

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:

• . (modified) (1 prop)
• src/CbcModel.hpp (modified) (2 diffs)

stable/2.7/Cbc/src/CbcModel.hpp

@@ -1176 +1176 @@
         Returns objective value (worse than cutoff if not feasible)
         Previously computed objective value is now passed in (in case user does not do solve)
-    */
-    double checkSolution(double cutoff, double * solution,
+        virtual so user can override
+    */
+    virtual double checkSolution(double cutoff, double * solution,
                          int fixVariables, double originalObjValue);
     /** Test the current solution for feasiblility.
@@ -1841 +1842 @@
 
     /// Destructor
-    ~CbcModel ();
+    virtual ~CbcModel ();
 
     /// Returns solver - has current state