Changeset 70

Timestamp:

Mar 2, 2005 3:51:01 PM (16 years ago)

Author:

forrest

Message:

make it cleaner for addObjects

File:

• trunk/CbcModel.cpp (modified) (2 diffs)

trunk/CbcModel.cpp

@@ -491 +491 @@
   CbcCompareObjective compareObjective ;
   CbcCompareDepth compareDepth ;
-  CbcCompareDefault compareDefault(dblParam_[CbcInfeasibilityWeight]) ;
+  CbcCompareDefault compareDefault ;
   if (!nodeCompare_)
     tree_->setComparison(compareDefault) ;
@@ -3609 +3609 @@
 CbcModel::addObjects(int numberObjects, CbcObject ** objects)
 {
+  // If integers but not enough objects fudge
+  if (numberIntegers_>numberObjects_)
+    findIntegers(true);
   int newNumberObjects= numberObjects+numberObjects_;
   CbcObject ** temp  = new CbcObject * [newNumberObjects];