Changeset 1870


Ignore:
Timestamp:
Jul 22, 2012 12:13:48 PM (7 years ago)
Author:
stefan
Message:

merge r1868 from trunk: allow fix to force to stay in dual

Location:
stable/1.14/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14/Clp

  • stable/1.14/Clp/src

  • stable/1.14/Clp/src/ClpSimplex.hpp

    r1753 r1870  
    10761076         2048 bit - perturb in complete fathoming
    10771077         4096 bit - try more for complete fathoming
     1078         8192 bit - don't even think of using primal if user asks for dual (and vv)
    10781079     */
    10791080     inline int moreSpecialOptions() const {
     
    10941095         2048 bit - perturb in complete fathoming
    10951096         4096 bit - try more for complete fathoming
     1097         8192 bit - don't even think of using primal if user asks for dual (and vv)
    10961098     */
    10971099     inline void setMoreSpecialOptions(int value) {
  • stable/1.14/Clp/src/ClpSimplexDual.cpp

    r1753 r1870  
    49714971                    if (!numberIterations_ && sumPrimalInfeasibilities_ >
    49724972                        1.0e5*(savePrimalInfeasibilities+1.0e3) &&
    4973                         (moreSpecialOptions_ & 256) == 0) {
     4973                        (moreSpecialOptions_ & (256|8192)) == 0) {
    49744974                      // Use primal
    49754975                      int nTotal = numberRows_ + numberColumns_;
  • stable/1.14/Clp/src/ClpSimplexPrimal.cpp

    r1753 r1870  
    12431243                         problemStatus_ = -1;
    12441244                    } else if (numberDualInfeasibilities_ == 0 && largestDualError_ > 1.0e-2 &&
    1245                                (moreSpecialOptions_ & 256) == 0) {
     1245                               (moreSpecialOptions_ & (256|8192)) == 0) {
    12461246                         goToDual = true;
    12471247                         factorization_->pivotTolerance(CoinMax(0.9, factorization_->pivotTolerance()));
Note: See TracChangeset for help on using the changeset viewer.