Changeset 444 for branches/devel/Cbc/src/CbcHeuristicFPump.cpp

Timestamp:

Oct 9, 2006 5:20:45 PM (14 years ago)

Author:

forrest

Message:

fix tiny bug

File:

• branches/devel/Cbc/src/CbcHeuristicFPump.cpp (modified) (2 diffs)

branches/devel/Cbc/src/CbcHeuristicFPump.cpp

@@ -71 +71 @@
   fprintf(fp,"0#include \"CbcHeuristicFPump.hpp\"\n");
   fprintf(fp,"3  CbcHeuristicFPump heuristicFPump(*cbcModel);\n");
+  if (when_!=other.when_)
+    fprintf(fp,"3  heuristicFPump.setWhen(%d);\n",when_);
+  else
+    fprintf(fp,"4  heuristicFPump.setWhen(%d);\n",when_);
   if (maximumPasses_!=other.maximumPasses_)
     fprintf(fp,"3  heuristicFPump.setMaximumPasses(%d);\n",maximumPasses_);
@@ -594 +598 @@
       cutoff -= CoinMax(CoinMax(gap,absoluteIncrement_),model_->getCutoffIncrement());
       printf("round again with cutoff of %g\n",cutoff);
-      if (accumulate_<2)
+      if (accumulate_<2&&usedColumn)
         memset(usedColumn,0,numberColumns);
       totalNumberPasses += numberPasses;