Changeset 74

Timestamp:

Mar 4, 2005 1:18:37 PM (16 years ago)

Author:

forrest

Message:

adding something to say if object a column

Location:

trunk

Files:

• CbcBranchActual.cpp (modified) (1 diff)
• CbcBranchBase.cpp (modified) (1 diff)
• CbcBranchLotsize.cpp (modified) (1 diff)
• include/CbcBranchActual.hpp (modified) (1 diff)
• include/CbcBranchBase.hpp (modified) (1 diff)
• include/CbcBranchLotsize.hpp (modified) (1 diff)

trunk/CbcBranchActual.cpp

@@ -678 +678 @@
   solver->setColLower(columnNumber_,nearest);
   solver->setColUpper(columnNumber_,nearest);
+}
+/* Column number if single column object -1 otherwise,
+   so returns >= 0
+   Used by heuristics
+*/
+int 
+CbcSimpleInteger::columnNumber() const
+{
+  return columnNumber_;
 }
 

trunk/CbcBranchBase.cpp

@@ -78 +78 @@
 {
   return 1.0e-5;
+}
+// Column number if single column object -1 otherwise
+int 
+CbcObject::columnNumber() const
+{
+  // Say not as at present only used by heuristics
+  return -1;
 }
 // Default Constructor 

trunk/CbcBranchLotsize.cpp

@@ -466 +466 @@
   return infeasibility;
 }
+/* Column number if single column object -1 otherwise,
+   so returns >= 0
+   Used by heuristics
+*/
+int 
+CbcLotsize::columnNumber() const
+{
+  return columnNumber_;
+}
 // This looks at solution and sets bounds to contain solution
 /** More precisely: it first forces the variable within the existing

trunk/include/CbcBranchActual.hpp

@@ -236 +236 @@
   inline int modelSequence() const
   {return columnNumber_;};
+  
+  /** Column number if single column object -1 otherwise,
+      so returns >= 0
+      Used by heuristics
+  */
+  virtual int columnNumber() const;
 
   /// Original bounds

trunk/include/CbcBranchBase.hpp

@@ -132 +132 @@
   inline int id() const
   { return id_;};
+  
+  /// Column number if single column object -1 otherwise
+  virtual int columnNumber() const;
   
    /// update model

trunk/include/CbcBranchLotsize.hpp

@@ -94 +94 @@
   {return columnNumber_;};
 
+  /** Column number if single column object -1 otherwise,
+      so returns >= 0
+      Used by heuristics
+  */
+  virtual int columnNumber() const;
   /// Original bounds
   inline double originalLowerBound() const