Changeset 1584 for trunk

Timestamp:

Jul 30, 2010 2:42:08 PM (11 years ago)

Author:

lou

Message:

Change signature of getDualRays from (int) to (int,bool) to allow choice of
partial (row components) or full (row and column components) dual ray. Matches
Osi trunk revision 1551.

Location:

trunk/Clp/src/OsiClp

Files:

• OsiClpSolverInterface.cpp (modified) (1 diff)
• OsiClpSolverInterface.hpp (modified) (2 diffs)

trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

@@ -2791 +2791 @@
 
 //------------------------------------------------------------------
-std::vector<double*> OsiClpSolverInterface::getDualRays(int /*maxNumRays*/) const
-{
+std::vector<double*> OsiClpSolverInterface::getDualRays(int maxNumRays,
+                                                        bool fullRay) const
+{
+  if (fullRay == true) {
+    throw CoinError("Full dual rays not yet implemented.","getDualRays",
+                    "OsiClpSolverInterface");
+  }
   return std::vector<double*>(1, modelPtr_->infeasibilityRay());
 }

trunk/Clp/src/OsiClp/OsiClpSolverInterface.hpp

@@ -503 +503 @@
   /** Get as many dual rays as the solver can provide. (In case of proven
       primal infeasibility there should be at least one.)
-      
+
+      The first getNumRows() ray components will always be associated with
+      the row duals (as returned by getRowPrice()). If \c fullRay is true,
+      the final getNumCols() entries will correspond to the ray components
+      associated with the nonbasic variables. If the full ray is requested
+      and the method cannot provide it, it will throw an exception.
+
       <strong>NOTE for implementers of solver interfaces:</strong> <br>
       The double pointers in the vector should point to arrays of length
@@ -512 +518 @@
       vector using delete[].
   */
-  virtual std::vector<double*> getDualRays(int maxNumRays) const;
+  virtual std::vector<double*> getDualRays(int maxNumRays,
+                                           bool fullRay = false) const;
   /** Get as many primal rays as the solver can provide. (In case of proven
       dual infeasibility there should be at least one.)