Changeset 270 for trunk/Samples

Timestamp:

Mar 10, 2006 5:34:29 PM (15 years ago)

Author:

forrest

Message:

quad

Location:

trunk/Samples

Files:

• ClpQuadInterface.cpp (modified) (1 diff)
• Makefile.qmip (modified) (1 diff)
• qmip.cpp (modified) (1 diff)

trunk/Samples/ClpQuadInterface.cpp

@@ -32 +32 @@
   ClpObjective * saveObjective  = modelPtr_->objectiveAsObject();
   modelPtr_->setObjectivePointer(quadraticObjective_);
+  //modelPtr_->setLogLevel(1);
   // Could load up any data into a solver
   modelPtr_->primal();

trunk/Samples/Makefile.qmip

@@ -75 +75 @@
 TESTSRC := qmip.cpp
 TESTSRC += CbcBranchUser.cpp
-TESTSRC += CbcHeuristicUser.cpp
+#TESTSRC += CbcHeuristicUser.cpp
 TESTSRC += CbcCompareUser.cpp
 TESTSRC += ClpQuadInterface.cpp

trunk/Samples/qmip.cpp

@@ -129 +129 @@
                              fabs(model.getMinimizationObjValue())*1.0e-3+1.0e-4));
 
-  if (model.getNumCols()<500)
-    model.setMaximumCutPassesAtRoot(-100); // always do 100 if possible
-  else if (model.getNumCols()<5000)
-    model.setMaximumCutPassesAtRoot(100); // use minimum drop
-  else
-    model.setMaximumCutPassesAtRoot(20);
+  model.setMaximumCutPassesAtRoot(0);
+  model.setMaximumCutPasses(0);
 
   // Switch off strong branching if wanted