Changeset 691


Ignore:
Timestamp:
Nov 7, 2005 2:17:27 PM (15 years ago)
Author:
forrest
Message:

mainly for Francois

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpDualRowSteepest.cpp

    r634 r691  
    4141  model_ = rhs.model_;
    4242  if ((model_&&model_->whatsChanged()&1)!=0) {
     43    int number = model_->numberRows();
     44    if (rhs.savedWeights_)
     45      number = CoinMin(number,rhs.savedWeights_->capacity());
    4346    if (rhs.infeasible_) {
    4447      infeasible_= new CoinIndexedVector(rhs.infeasible_);
     
    4750    }
    4851    if (rhs.weights_) {
    49       assert(model_);
    50       int number = model_->numberRows();
    5152      weights_= new double[number];
    5253      ClpDisjointCopyN(rhs.weights_,number,weights_);
     
    110111    delete alternateWeights_;
    111112    delete savedWeights_;
     113    assert(model_);
     114    int number = model_->numberRows();
     115    if (rhs.savedWeights_)
     116      number = CoinMin(number,rhs.savedWeights_->capacity());
    112117    if (rhs.infeasible_!=NULL) {
    113118      infeasible_= new CoinIndexedVector(rhs.infeasible_);
     
    116121    }
    117122    if (rhs.weights_!=NULL) {
    118       assert(model_);
    119       int number = model_->numberRows();
    120123      weights_= new double[number];
    121124      ClpDisjointCopyN(rhs.weights_,number,weights_);
  • trunk/ClpSolve.cpp

    r682 r691  
    19341934    int saveLevel = logLevel();
    19351935    if ((specialOptions_&1024)==0)
    1936       setLogLevel(1);
     1936      setLogLevel(CoinMin(1,saveLevel));
    19371937    else
    1938       setLogLevel(0);
     1938      setLogLevel(CoinMin(0,saveLevel));
    19391939    pinfo.postsolve(true);
    19401940    factorization_->areaFactor(model2->factorization()->adjustedAreaFactor());
Note: See TracChangeset for help on using the changeset viewer.