- Timestamp:
- Sep 3, 2009 11:40:20 AM (12 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpSimplex.cpp
r1426 r1427 1529 1529 } 1530 1530 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 } 1531 1549 } 1532 1550 } … … 11027 11045 // for now let ...iBasic give pivot row 11028 11046 int factorizationStatus = internalFactorize(0); 11029 if (factorizationStatus<0) { 11047 if (factorizationStatus<0|| 11048 (factorizationStatus&&factorizationStatus<=numberRows_)) { 11030 11049 // some error 11050 #if 0 11031 11051 // we should either debug or ignore 11032 #ifndef NDEBUG 11052 #ifdef CLP_INVESTIGATE 11053 //#ifndef NDEBUG 11033 11054 printf("***** ClpDual strong branching factorization error - debug\n"); 11034 #endif11035 11055 abort(); 11056 //#endif 11057 #endif 11036 11058 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 11043 11067 } 11044 11068 // Start of fast iterations -
trunk/Clp/src/ClpSimplexDual.cpp
r1426 r1427 5961 5961 int ClpSimplexDual::fastDual(bool alwaysFinish) 5962 5962 { 5963 progressFlag_=0; 5963 5964 bestObjectiveValue_ = objectiveValue_; 5964 5965 algorithm_ = -1;
Note: See TracChangeset
for help on using the changeset viewer.