Changeset 1427 for trunk/Clp


Ignore:
Timestamp:
Sep 3, 2009 11:40:20 AM (10 years ago)
Author:
forrest
Message:

minor changes for examples

Location:
trunk/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSimplex.cpp

    r1426 r1427  
    15291529            }
    15301530            break;
     1531          }
     1532        }
     1533        if (numberBasic<numberRows_) {
     1534          // add some slacks in case odd warmstart
     1535#ifdef CLP_INVESTIGATE
     1536          printf("BAD %d basic, %d rows %d slacks\n",
     1537                 numberBasic,numberRows_,totalSlacks);
     1538#endif
     1539          int iRow=numberRows_-1;
     1540          while (numberBasic<numberRows_) {
     1541            if (getRowStatus(iRow)!=basic) {
     1542              setRowStatus(iRow,basic);
     1543              numberBasic++;
     1544              totalSlacks++;
     1545              iRow--;
     1546            } else {
     1547              break;
     1548            }
    15311549          }
    15321550        }
     
    1102711045  // for now let ...iBasic give pivot row
    1102811046  int factorizationStatus = internalFactorize(0);
    11029   if (factorizationStatus<0) {
     11047  if (factorizationStatus<0||
     11048      (factorizationStatus&&factorizationStatus<=numberRows_)) {
    1103011049    // some error
     11050#if 0
    1103111051    // we should either debug or ignore
    11032 #ifndef NDEBUG
     11052#ifdef CLP_INVESTIGATE
     11053    //#ifndef NDEBUG
    1103311054    printf("***** ClpDual strong branching factorization error - debug\n");
    11034 #endif
    1103511055    abort();
     11056    //#endif
     11057#endif
    1103611058    return -2;
    11037   } else if (factorizationStatus&&factorizationStatus<=numberRows_) {
    11038     handler_->message(CLP_SINGULARITIES,messages_)
    11039       <<factorizationStatus
    11040       <<CoinMessageEol;
    11041     abort();
    11042     return -3;
     11059#else
     11060    dual(0,7);
     11061    createRim(7+8+16+32,true,0);
     11062    int factorizationStatus = internalFactorize(0);
     11063    assert (factorizationStatus==0);
     11064    if (factorizationStatus)
     11065      abort();
     11066#endif
    1104311067  }
    1104411068  // Start of fast iterations
  • trunk/Clp/src/ClpSimplexDual.cpp

    r1426 r1427  
    59615961int ClpSimplexDual::fastDual(bool alwaysFinish)
    59625962{
     5963  progressFlag_=0;
    59635964  bestObjectiveValue_ = objectiveValue_;
    59645965  algorithm_ = -1;
Note: See TracChangeset for help on using the changeset viewer.