Changeset 74


Ignore:
Timestamp:
Mar 4, 2005 1:18:37 PM (17 years ago)
Author:
forrest
Message:

adding something to say if object a column

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcBranchActual.cpp

    r59 r74  
    678678  solver->setColLower(columnNumber_,nearest);
    679679  solver->setColUpper(columnNumber_,nearest);
     680}
     681/* Column number if single column object -1 otherwise,
     682   so returns >= 0
     683   Used by heuristics
     684*/
     685int
     686CbcSimpleInteger::columnNumber() const
     687{
     688  return columnNumber_;
    680689}
    681690
  • trunk/CbcBranchBase.cpp

    r2 r74  
    7878{
    7979  return 1.0e-5;
     80}
     81// Column number if single column object -1 otherwise
     82int
     83CbcObject::columnNumber() const
     84{
     85  // Say not as at present only used by heuristics
     86  return -1;
    8087}
    8188// Default Constructor
  • trunk/CbcBranchLotsize.cpp

    r72 r74  
    466466  return infeasibility;
    467467}
     468/* Column number if single column object -1 otherwise,
     469   so returns >= 0
     470   Used by heuristics
     471*/
     472int
     473CbcLotsize::columnNumber() const
     474{
     475  return columnNumber_;
     476}
    468477// This looks at solution and sets bounds to contain solution
    469478/** More precisely: it first forces the variable within the existing
  • trunk/include/CbcBranchActual.hpp

    r59 r74  
    236236  inline int modelSequence() const
    237237  {return columnNumber_;};
     238 
     239  /** Column number if single column object -1 otherwise,
     240      so returns >= 0
     241      Used by heuristics
     242  */
     243  virtual int columnNumber() const;
    238244
    239245  /// Original bounds
  • trunk/include/CbcBranchBase.hpp

    r6 r74  
    132132  inline int id() const
    133133  { return id_;};
     134 
     135  /// Column number if single column object -1 otherwise
     136  virtual int columnNumber() const;
    134137 
    135138   /// update model
  • trunk/include/CbcBranchLotsize.hpp

    r72 r74  
    9494  {return columnNumber_;};
    9595
     96  /** Column number if single column object -1 otherwise,
     97      so returns >= 0
     98      Used by heuristics
     99  */
     100  virtual int columnNumber() const;
    96101  /// Original bounds
    97102  inline double originalLowerBound() const
Note: See TracChangeset for help on using the changeset viewer.