Changeset 619 for branches/devel/Cbc/src


Ignore:
Timestamp:
Jun 5, 2007 8:26:35 AM (12 years ago)
Author:
forrest
Message:

needed to go with Cbcstrategy

Location:
branches/devel/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcBranchActual.cpp

    r539 r619  
    875875}
    876876
     877/*  Change column numbers after preprocessing
     878 */
     879void
     880CbcSimpleInteger::resetSequenceEtc(int numberColumns, const int * originalColumns)
     881{
     882  int iColumn;
     883  for (iColumn=0;iColumn<numberColumns;iColumn++) {
     884    if (columnNumber_==originalColumns[iColumn])
     885      break;
     886  }
     887  assert (iColumn<numberColumns);
     888  columnNumber_ = iColumn;
     889}
     890
    877891// Infeasibility - large is 0.5
    878892double
     
    967981CbcIntegerBranchingObject::~CbcIntegerBranchingObject ()
    968982{
     983  // for debugging threads
     984  way_=-23456789;
    969985}
    970986
     
    982998CbcIntegerBranchingObject::branch()
    983999{
     1000  // for debugging threads
     1001  if (way_<-1||way_>100000) {
     1002    printf("way %d, left %d, iCol %d, variable %d\n",
     1003           way_,numberBranchesLeft(),
     1004           originalCbcObject_->columnNumber(),variable_);
     1005    assert (way_!=-23456789);
     1006  }
    9841007  decrementNumberBranchesLeft();
    9851008  int iColumn = originalCbcObject_->columnNumber();
  • branches/devel/Cbc/src/CbcBranchActual.hpp

    r463 r619  
    252252  */
    253253  virtual int columnNumber() const;
     254  /// Set column number
     255  inline void setColumnNumber(int value)
     256  { columnNumber_ = value;};
    254257
    255258  /** Reset variable bounds to their original values.
     
    258261   */
    259262  virtual void resetBounds(const OsiSolverInterface * solver) ;
     263  /**  Change column numbers after preprocessing
     264   */
     265  virtual void resetSequenceEtc(int numberColumns, const int * originalColumns) ;
    260266  /// Original bounds
    261267  inline double originalLowerBound() const
Note: See TracChangeset for help on using the changeset viewer.