Changeset 1115


Ignore:
Timestamp:
Sep 24, 2007 11:58:15 AM (13 years ago)
Author:
forrest
Message:

mainly fix isFixed bug when reusing factorization

Location:
trunk/Clp/src
Files:
3 edited

Legend:

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

    r1112 r1115  
    21472147  parameters[numberParameters-1].append("equalall");
    21482148  parameters[numberParameters-1].append("strategy");
     2149  parameters[numberParameters-1].append("aggregate");
    21492150  parameters[numberParameters-1].setLonghelp
    21502151    (
  • trunk/Clp/src/ClpSimplex.cpp

    r1112 r1115  
    34413441              }
    34423442            }
     3443          } else if (status==isFixed&&upper_[i]>lower_[i]) {
     3444            // was fixed - not now
     3445            if (solution_[i]<=lower_[i]) {
     3446              setStatus(i,atLowerBound);
     3447            } else if (solution_[i]>=upper_[i]) {
     3448              setStatus(i,atUpperBound);
     3449            } else {
     3450              setStatus(i,superBasic);
     3451            }
    34433452          }
    34443453        }
  • trunk/Clp/src/Idiot.cpp

    r1054 r1115  
    475475    whenUsed_=new int[ncols];
    476476  } else {
     477#ifdef COIN_DEVELOP
    477478    printf("%d slacks\n",numberSlacks);
     479#endif
    478480    oddSlacks=true;
    479481    int extra = (int) (nrows*sizeof(double)/sizeof(int));
Note: See TracChangeset for help on using the changeset viewer.