Changeset 86

Timestamp:

Mar 23, 2005 4:51:39 PM (16 years ago)

Author:

forrest

Message:

inline with doc

Location:

trunk/Samples

Files:

• CbcCompareUser.cpp (modified) (1 diff)
• Makefile (modified) (3 diffs)
• crew.cpp (modified) (2 diffs)
• longthin.cpp (modified) (1 diff)

trunk/Samples/CbcCompareUser.cpp

@@ -95 +95 @@
       return x->depth() < y->depth();
   } else {
-    // after solution or very beginning
+    // after solution
     double weight = CoinMax(weight_,0.0);
     return x->objectiveValue()+ weight*x->numberUnsatisfied() > 

trunk/Samples/Makefile

@@ +1 @@
+OptLevel := -O1
 OptLevel := -g
 
@@ -72 +73 @@
 ifeq ($(findstring Linux,${UNAME}),Linux)
         CXXFLAGS +=     -DREADLINE
-        LDFLAGS += -lhistory -lreadline -ltermcap
+#       LDFLAGS += -lhistory -lreadline -ltermcap
 endif
 CXXFLAGS  += -I. 
@@ -81 +82 @@
 TESTSRC := $(DRIVER).cpp
 TESTSRC += CbcCompareUser.cpp
+TESTSRC += CbcSolver2.cpp
 TESTSRC += CbcBranchUser.cpp
 TESTSRC += CbcHeuristicUser.cpp
-TESTSRC += CbcTreeLocal.cpp
+TESTSRC += CbcHeuristicGreedy.cpp
 TESTOBJ := $(addprefix $(TARGETDIR)/, $(TESTSRC:.cpp=.o))
 TESTDEP := $(addprefix $(DEPDIR)/, $(TESTSRC:.cpp=.d))

trunk/Samples/crew.cpp

@@ -14 +14 @@
 #include "CbcModel.hpp"
 #include "CbcBranchActual.hpp"
-#include "CbcBranchUser.hpp"
 #include "CbcCompareUser.hpp"
 
@@ -52 +51 @@
   OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver3);
   assert (osiclp);
-
-  // Redundant definition of default branching (as Default == User)
-  CbcBranchUserDecision branch;
-  model.setBranchingMethod(&branch);
 
   // Definition of node choice

trunk/Samples/longthin.cpp

@@ -112 +112 @@
   for (iColumn=0;iColumn<numberColumns;iColumn++) {
     if (solver3->isInteger(iColumn)) {
-      double costPer = objective[iColumn]/ ((double) columnLength[iColumn]);
+      /*  Branching up gets us much closer to an integer solution so we want
+          to encourage up - so we will branch up if variable value > 0.333333.
+          The expected cost of going up obviously depends on the cost of the
+          variable so we just choose pseudo costs to reflect that.  We could also
+          decide to try and use the pseudo costs to make it more likely to branch
+          on a variable with many coefficients.  This leads to the computation below.
+      */
+      double cost = objective[iColumn]*(1.0 + 0.2*((double) columnLength[iColumn]));
       CbcSimpleIntegerPseudoCost * newObject =
         new CbcSimpleIntegerPseudoCost(&model,numberIntegers,iColumn,
-                                       costPer,costPer);
+                                       2.0*cost,cost);
       newObject->setMethod(3);
       objects[numberIntegers++]= newObject;