Changeset 848

Timestamp:

Jan 2, 2008 11:04:26 AM (14 years ago)

Author:

forrest

Message:

try slightly different branching

Location:

trunk/Cbc/src

Files:

• CbcBranchActual.cpp (modified) (4 diffs)
• CbcBranchActual.hpp (modified) (3 diffs)
• CbcBranchDynamic.cpp (modified) (17 diffs)
• CbcBranchDynamic.hpp (modified) (4 diffs)
• unitTestClp.cpp (modified) (1 diff)

trunk/Cbc/src/CbcBranchActual.cpp

@@ -847 +847 @@
 CbcSimpleInteger::createBranch(OsiSolverInterface * solver, const OsiBranchingInformation * info, int way) 
 {
+  CbcIntegerBranchingObject * branch = new CbcIntegerBranchingObject(model_,0,-1,0.5);
+  fillCreateBranch(branch,info,way);
+  return branch;
+}
+// Fills in a created branching object
+void 
+CbcSimpleInteger::fillCreateBranch(CbcIntegerBranchingObject * branch, const OsiBranchingInformation * info, int way) 
+{
+  branch->setOriginalObject(this);
   double value = info->solution_[columnNumber_];
   value = CoinMax(value, info->lower_[columnNumber_]);
@@ -863 +872 @@
       value = targetValue+0.1;
   }
-  CbcBranchingObject * branch = new CbcIntegerBranchingObject(model_,columnNumber_,way,
-                                             value);
-  branch->setOriginalObject(this);
-  return branch;
+  branch->fillPart(columnNumber_,way,value);
 }
 /* Column number if single column object -1 otherwise,
@@ -946 +952 @@
 {
   int iColumn = variable;
+  assert (model_->solver()->getNumCols()>0);
   down_[0] = model_->solver()->getColLower()[iColumn];
   down_[1] = floor(value_);
@@ -955 +962 @@
   numberExtraChangedBounds_ = 0;
 #endif
+}
+// Does part of constructor
+void 
+CbcIntegerBranchingObject::fillPart (int variable,
+                                 int way , double value) 
+{
+  //originalObject_=NULL;
+  branchIndex_=0;
+  value_=value;
+  numberBranches_=2;
+  //model_= model;
+  //originalCbcObject_=NULL;
+  variable_=variable;
+  way_=way;
+  int iColumn = variable;
+  down_[0] = model_->solver()->getColLower()[iColumn];
+  down_[1] = floor(value_);
+  up_[0] = ceil(value_);
+  up_[1] = model_->getColUpper()[iColumn];
 }
 // Useful constructor for fixing

trunk/Cbc/src/CbcBranchActual.hpp

@@ -6 +6 @@
 #include "CbcBranchBase.hpp"
 #include "CoinPackedMatrix.hpp"
-
+class CbcIntegerBranchingObject;
 /// Define a clique class
 
@@ -250 +250 @@
   virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
                                             const OsiBranchingInformation * info, int way) ;
+  /// Fills in a created branching object
+  void fillCreateBranch(CbcIntegerBranchingObject * branching, const OsiBranchingInformation * info, int way) ;
 
   using CbcObject::solverBranch ;
@@ -438 +440 @@
   /// Destructor 
   virtual ~CbcIntegerBranchingObject ();
-  
+
+  /// Does part of constructor
+  void fillPart ( int variable, int way , double value) ;
   using CbcBranchingObject::branch ;
   /** \brief Sets the bounds for the variable according to the current arm

trunk/Cbc/src/CbcBranchDynamic.cpp

@@ -132 +132 @@
     method_(0)
 {
+#ifdef CBC_INSTRUMENT
+  numberTimesInfeasible_=0;
+#endif
 }
 
@@ -166 +169 @@
     method_(0)
 {
+#ifdef CBC_INSTRUMENT
+  numberTimesInfeasible_=0;
+#endif
   const double * cost = model->getObjCoefficients();
   double costValue = CoinMax(1.0e-5,fabs(cost[iColumn]));
@@ -231 +237 @@
     method_(0)
 {
+#ifdef CBC_INSTRUMENT
+  numberTimesInfeasible_=0;
+#endif
   downDynamicPseudoCost_ = downDynamicPseudoCost;
   upDynamicPseudoCost_ = upDynamicPseudoCost;
@@ -300 +309 @@
 
 {
+#ifdef CBC_INSTRUMENT
+  numberTimesInfeasible_=rhs.numberTimesInfeasible_;
+#endif
 }
 
@@ -340 +352 @@
     numberTimesUpTotalFixed_ = rhs.numberTimesUpTotalFixed_;
     numberTimesProbingTotal_ = rhs.numberTimesProbingTotal_;
+#ifdef CBC_INSTRUMENT
+    numberTimesInfeasible_=rhs.numberTimesInfeasible_;
+#endif
     method_=rhs.method_;
   }
@@ -612 +627 @@
   else 
     distanceToCutoff = 1.0e2 + fabs(objectiveValue);
+  distanceToCutoff = CoinMax(distanceToCutoff,1.0e-12*(1.0+fabs(objectiveValue)));
 #endif
   double sum;
@@ -694 +710 @@
     return 0.0;
   } else {
+#ifdef CBC_INSTRUMENT
+    numberTimesInfeasible_++;
+#endif
     int stateOfSearch = model_->stateOfSearch()%10;
     double returnValue=0.0;
@@ -760 +779 @@
       returnValue *= 1.0e-3;
     }
+#ifdef CBC_INSTRUMENT
+    int nn = numberTimesInfeasible_  - CoinMax(numberTimesUp_,numberTimesDown_);
+    assert (nn>=0);
+    if (nn)
+      returnValue *= sqrt((double) nn);
+#endif
 #ifdef COIN_DEVELOP
     History hist;
@@ -809 +834 @@
     distanceToCutoff = 1.0e2 + fabs(objectiveValue);
 #endif
+  distanceToCutoff = CoinMax(distanceToCutoff,1.0e-12*(1.0+fabs(objectiveValue)));
   double sum;
   int number;
@@ -1036 +1062 @@
   double change = data.change_;
 #define TYPERATIO 0.9
-#define MINIMUM_MOVEMENT 0.0
+#define MINIMUM_MOVEMENT 0.1
 #ifdef COIN_DEVELOP
   History hist;
@@ -1102 +1128 @@
     if (distanceToCutoff>1.0e20) 
       distanceToCutoff=10.0+fabs(originalValue);
-    sum += numberTimesDownInfeasible_*distanceToCutoff;
+    sum += numberTimesDownInfeasible_*CoinMax(distanceToCutoff,1.0e-12*(1.0+fabs(originalValue)));
     number += numberTimesDownInfeasible_;
     setDownDynamicPseudoCost(sum/(double) number);
@@ -1166 +1192 @@
     if (distanceToCutoff>1.0e20) 
       distanceToCutoff=10.0+fabs(originalValue);
-    sum += numberTimesUpInfeasible_*distanceToCutoff;
+    sum += numberTimesUpInfeasible_*CoinMax(distanceToCutoff,1.0e-12*(1.0+fabs(originalValue)));
     number += numberTimesUpInfeasible_;
     setUpDynamicPseudoCost(sum/(double) number);
@@ -1232 +1258 @@
            numberTimesUp_,numberTimesUpInfeasible_,meanUp,devUp);
 #else
-    printf("%d down %d times (%d inf) mean %g  up %d times (%d inf) mean %g\n",
+    int n=0;
+#ifdef CBC_INSTRUMENT
+    n=numberTimesInfeasible_;
+#endif
+    printf("%d down %d times (%d inf) mean %g  up %d times (%d inf) mean %g - pseudocosts %g %g - inftimes %d\n",
            columnNumber_,
            numberTimesDown_,numberTimesDownInfeasible_,meanDown,
-           numberTimesUp_,numberTimesUpInfeasible_,meanUp);
+           numberTimesUp_,numberTimesUpInfeasible_,meanUp,downDynamicPseudoCost_,upDynamicPseudoCost_,n);
 #endif
   } else {
@@ -1253 +1283 @@
     else 
       distanceToCutoff = 1.0e2 + fabs(objectiveValue);
+    distanceToCutoff = CoinMax(distanceToCutoff,1.0e-12*(1.0+fabs(objectiveValue)));
     double sum;
     int number;
@@ -1298 +1329 @@
   object_=object;
 }
+// Does part of work for constructor
+void 
+CbcDynamicPseudoCostBranchingObject::fillPart (int variable,
+                                           int way , double value, 
+                                           CbcSimpleIntegerDynamicPseudoCost * object) 
+{
+  CbcIntegerBranchingObject::fillPart(variable,way,value);
+  changeInGuessed_=1.0e-5;
+  object_=object;
+}
 // Useful constructor for fixing
 CbcDynamicPseudoCostBranchingObject::CbcDynamicPseudoCostBranchingObject (CbcModel * model, 
@@ -1335 +1376 @@
   return (new CbcDynamicPseudoCostBranchingObject(*this));
 }
-
 
 // Destructor 
@@ -1687 +1727 @@
     else 
       distanceToCutoff = 1.0e2 + fabs(objectiveValue);
+    distanceToCutoff = CoinMax(distanceToCutoff,1.0e-12*(1.0+fabs(objectiveValue)));
     double continuousObjective = model->getContinuousObjective();
     double distanceToCutoffC =  model->getCutoff()  - continuousObjective;
     if (distanceToCutoffC>1.0e20) 
       distanceToCutoffC = 1.0e2 + fabs(objectiveValue);
+    distanceToCutoffC = CoinMax(distanceToCutoffC,1.0e-12*(1.0+fabs(objectiveValue)));
     int numberInfC = model->getContinuousInfeasibilities();
     double perInf = distanceToCutoffC/((double) numberInfC);

trunk/Cbc/src/CbcBranchDynamic.hpp

@@ -67 +67 @@
   virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
                                             const OsiBranchingInformation * info, int way) ;
+  /// Fills in a created branching object
+  void fillCreateBranch(CbcIntegerBranchingObject * branching, const OsiBranchingInformation * info, int way) ;
+
 
   /** Pass in information on branch just done and create CbcObjectUpdateData instance.
@@ -297 +300 @@
   /// Number of times probing done 
   int numberTimesProbingTotal_;
+  /// Number of times infeasible when tested
+#define CBC_INSTRUMENT
+#ifdef CBC_INSTRUMENT
+  mutable int numberTimesInfeasible_;
+#endif
   /** Method - 
       0 - pseudo costs
@@ -354 +362 @@
   /// Destructor 
   virtual ~CbcDynamicPseudoCostBranchingObject ();
+
+  /// Does part of constructor
+  void fillPart (int variable,
+             int way , double value, 
+             CbcSimpleIntegerDynamicPseudoCost * object) ;
   
   using CbcBranchingObject::branch ;
@@ -377 +390 @@
   inline CbcSimpleIntegerDynamicPseudoCost * object() const
   { return object_;}
+  /// Set object
+  inline void setObject(CbcSimpleIntegerDynamicPseudoCost * object)
+  { object_=object;}
 protected:
   /// Change in guessed objective value for next branch

trunk/Cbc/src/unitTestClp.cpp

@@ -376 +376 @@
                   << "; error=" << fabs(objValue[m] - soln); 
         numberFailures++;
-#ifdef COIN_DEVELOP
+        //#ifdef COIN_DEVELOP
         abort();
-#endif
+        //#endif
       }
     } else {