Changeset 2203

Timestamp:

Jun 26, 2015 10:38:52 AM (4 years ago)

Author:

forrest

Message:

Positive Edge in Cbc

File:

• trunk/Cbc/src/CbcSolver.cpp (modified) (5 diffs)

trunk/Cbc/src/CbcSolver.cpp

@@ -37 +37 @@
 #include "ClpDualRowSteepest.hpp"
 #include "ClpDualRowDantzig.hpp"
+#include "ClpPEDualRowSteepest.hpp"
+#include "ClpPEDualRowDantzig.hpp"
+#include "ClpPEPrimalColumnSteepest.hpp"
+#include "ClpPEPrimalColumnDantzig.hpp"
 #include "ClpLinearObjective.hpp"
 #include "ClpPrimalColumnSteepest.hpp"
@@ -2456 +2460 @@
                                 ClpDualRowSteepest steep(2);
                                 lpSolver->setDualRowPivotAlgorithm(steep);
-                            } else {
+                            } else if (action == 3) {
                                 ClpDualRowSteepest steep;
                                 lpSolver->setDualRowPivotAlgorithm(steep);
+                            } else if (action == 4) {
+                              // Positive edge steepest
+                              ClpPEDualRowSteepest p(fabs(parameters_[whichParam(CLP_PARAM_DBL_PSI, numberParameters_, parameters_)].doubleValue()));
+                              lpSolver->setDualRowPivotAlgorithm(p);
+                            } else if (action == 5) {
+                              // Positive edge Dantzig
+                              ClpPEDualRowDantzig p(fabs(parameters_[whichParam(CLP_PARAM_DBL_PSI, numberParameters_, parameters_)].doubleValue()));
+                              lpSolver->setDualRowPivotAlgorithm(p);
                             }
                             break;
@@ -2483 +2495 @@
                                 ClpPrimalColumnSteepest steep(10);
                                 lpSolver->setPrimalColumnPivotAlgorithm(steep);
+                            } else if (action == 7) {
+                              // Positive edge steepest
+                              ClpPEPrimalColumnSteepest p(fabs(parameters_[whichParam(CLP_PARAM_DBL_PSI, numberParameters_, parameters_)].doubleValue()));
+                              lpSolver->setPrimalColumnPivotAlgorithm(p);
+                            } else if (action == 8) {
+                              // Positive edge Dantzig
+                              ClpPEPrimalColumnDantzig p(fabs(parameters_[whichParam(CLP_PARAM_DBL_PSI, numberParameters_, parameters_)].doubleValue()));
+                              lpSolver->setPrimalColumnPivotAlgorithm(p);
                             }
                             break;
@@ -2727 +2747 @@
                             double objScale =
                                 parameters_[whichParam(CLP_PARAM_DBL_OBJSCALE2, numberParameters_, parameters_)].doubleValue();
+                            // deal with positive edge
+                            double psi = parameters_[whichParam(CLP_PARAM_DBL_PSI, numberParameters_, parameters_)].doubleValue();
+                            if (psi>0.0) {
+                              ClpDualRowPivot * dualp = lpSolver->dualRowPivot();
+                              ClpDualRowSteepest * d1 = dynamic_cast<ClpDualRowSteepest *>(dualp);
+                              ClpDualRowDantzig * d2 = dynamic_cast<ClpDualRowDantzig *>(dualp);
+                              if (d1) {
+                                ClpPEDualRowSteepest p(psi,d1->mode());
+                                lpSolver->setDualRowPivotAlgorithm(p);
+                              } else if (d2) {
+                                ClpPEDualRowDantzig p(psi);
+                                lpSolver->setDualRowPivotAlgorithm(p);
+                              }
+                              ClpPrimalColumnPivot * primalp = lpSolver->primalColumnPivot();
+                              ClpPrimalColumnSteepest * p1 = dynamic_cast<ClpPrimalColumnSteepest *>(primalp);
+                              ClpPrimalColumnDantzig * p2 = dynamic_cast<ClpPrimalColumnDantzig *>(primalp);
+                              if (p1) {
+                                ClpPEPrimalColumnSteepest p(psi,p1->mode());
+                                lpSolver->setPrimalColumnPivotAlgorithm(p);
+                              } else if (p2) {
+                                ClpPEPrimalColumnDantzig p(psi);
+                                lpSolver->setPrimalColumnPivotAlgorithm(p);
+                              }
+                            }
                             if (objScale != 1.0) {
                                 int iColumn;
@@ -3408 +3452 @@
                                 si->getModelPtr()->scaling(doScaling);
                                 ClpSimplex * lpSolver = si->getModelPtr();
+                                // deal with positive edge
+                                double psi = parameters_[whichParam(CLP_PARAM_DBL_PSI, numberParameters_, parameters_)].doubleValue();
+                                if (psi>0.0) {
+                                  ClpDualRowPivot * dualp = lpSolver->dualRowPivot();
+                                  ClpDualRowSteepest * d1 = dynamic_cast<ClpDualRowSteepest *>(dualp);
+                                  ClpDualRowDantzig * d2 = dynamic_cast<ClpDualRowDantzig *>(dualp);
+                                  if (d1) {
+                                    ClpPEDualRowSteepest p(psi,d1->mode());
+                                    lpSolver->setDualRowPivotAlgorithm(p);
+                                  } else if (d2) {
+                                    ClpPEDualRowDantzig p(psi);
+                                    lpSolver->setDualRowPivotAlgorithm(p);
+                                  }
+                                  ClpPrimalColumnPivot * primalp = lpSolver->primalColumnPivot();
+                                  ClpPrimalColumnSteepest * p1 = dynamic_cast<ClpPrimalColumnSteepest *>(primalp);
+                                  ClpPrimalColumnDantzig * p2 = dynamic_cast<ClpPrimalColumnDantzig *>(primalp);
+                                  if (p1) {
+                                    ClpPEPrimalColumnSteepest p(psi,p1->mode());
+                                    lpSolver->setPrimalColumnPivotAlgorithm(p);
+                                  } else if (p2) {
+                                    ClpPEPrimalColumnDantzig p(psi);
+                                    lpSolver->setPrimalColumnPivotAlgorithm(p);
+                                  }
+                                }
                                 if (doVector) {
                                     ClpMatrixBase * matrix = lpSolver->clpMatrix();