Changeset 74
- Timestamp:
- Mar 4, 2005 1:18:37 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CbcBranchActual.cpp
r59 r74 678 678 solver->setColLower(columnNumber_,nearest); 679 679 solver->setColUpper(columnNumber_,nearest); 680 } 681 /* Column number if single column object -1 otherwise, 682 so returns >= 0 683 Used by heuristics 684 */ 685 int 686 CbcSimpleInteger::columnNumber() const 687 { 688 return columnNumber_; 680 689 } 681 690 -
trunk/CbcBranchBase.cpp
r2 r74 78 78 { 79 79 return 1.0e-5; 80 } 81 // Column number if single column object -1 otherwise 82 int 83 CbcObject::columnNumber() const 84 { 85 // Say not as at present only used by heuristics 86 return -1; 80 87 } 81 88 // Default Constructor -
trunk/CbcBranchLotsize.cpp
r72 r74 466 466 return infeasibility; 467 467 } 468 /* Column number if single column object -1 otherwise, 469 so returns >= 0 470 Used by heuristics 471 */ 472 int 473 CbcLotsize::columnNumber() const 474 { 475 return columnNumber_; 476 } 468 477 // This looks at solution and sets bounds to contain solution 469 478 /** More precisely: it first forces the variable within the existing -
trunk/include/CbcBranchActual.hpp
r59 r74 236 236 inline int modelSequence() const 237 237 {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; 238 244 239 245 /// Original bounds -
trunk/include/CbcBranchBase.hpp
r6 r74 132 132 inline int id() const 133 133 { return id_;}; 134 135 /// Column number if single column object -1 otherwise 136 virtual int columnNumber() const; 134 137 135 138 /// update model -
trunk/include/CbcBranchLotsize.hpp
r72 r74 94 94 {return columnNumber_;}; 95 95 96 /** Column number if single column object -1 otherwise, 97 so returns >= 0 98 Used by heuristics 99 */ 100 virtual int columnNumber() const; 96 101 /// Original bounds 97 102 inline double originalLowerBound() const
Note: See TracChangeset
for help on using the changeset viewer.