Ignore:
Timestamp:
Mar 16, 2009 6:25:57 AM (12 years ago)
Author:
forrest
Message:

changes to simplex and lots of stuff and start Mumps cholesky

File:
1 edited

Legend:

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

    r1328 r1344  
    177177    eventHandler_=NULL;
    178178  }
    179   whatsChanged_=0;
     179  whatsChanged_ = 0;
    180180  delete matrix_;
    181181  matrix_=NULL;
     
    291291  delete [] rowObjective_;
    292292  rowObjective_=ClpCopyOfArray(rowObjective,numberRows_);
    293   whatsChanged_=0;
     293  whatsChanged_ = 0;
    294294}
    295295void
     
    796796      rowUpper_ = ClpCopyOfArray ( rhs.rowUpper_, numberRows_ );
    797797      columnLower_ = ClpCopyOfArray ( rhs.columnLower_, numberColumns_ );
    798       int scaleLength = ((specialOptions_&131072)==0) ? 1 : 2;
    799798      columnUpper_ = ClpCopyOfArray ( rhs.columnUpper_, numberColumns_ );
    800       rowScale_ = ClpCopyOfArray(rhs.rowScale_,numberRows_*scaleLength);
    801       columnScale_ = ClpCopyOfArray(rhs.columnScale_,numberColumns_*scaleLength);
     799      rowScale_ = ClpCopyOfArray(rhs.rowScale_,numberRows_*2);
     800      columnScale_ = ClpCopyOfArray(rhs.columnScale_,numberColumns_*2);
    802801      if (rhs.objective_)
    803802        objective_  = rhs.objective_->clone();
     
    855854      ClpDisjointCopyN ( rhs.columnLower_, numberColumns_,columnLower_ );
    856855      assert ((specialOptions_&131072)==0);
     856      abort();
    857857      ClpDisjointCopyN ( rhs.columnUpper_, numberColumns_,columnUpper_ );
    858858      if (rhs.objective_) {
     
    27072707  bool savePrefix =m.messageHandler()->prefix();
    27082708  m.messageHandler()->setPrefix(handler_->prefix());
     2709  m.setSmallElementValue(CoinMax(smallElement_,m.getSmallElementValue()));
    27092710  double time1 = CoinCpuTime(),time2;
    27102711  int status=0;
     
    37773778  }
    37783779  for (i=0;i<numberColumns_;i++) {
    3779     double multiplier = 1.0/columnScale_[i];
     3780    double multiplier = 1.0*inverseColumnScale_[i];
    37803781    columnActivity_[i] *= multiplier;
    37813782    reducedCost_[i] *= columnScale_[i];
     
    38043805    // reverse scaling
    38053806    for (i=0;i<numberRows_;i++)
    3806       rowScale_[i] = 1.0/rowScale_[i];
     3807      rowScale_[i] = 1.0*inverseRowScale_[i];
    38073808    for (i=0;i<numberColumns_;i++)
    3808       columnScale_[i] = 1.0/columnScale_[i];
     3809      columnScale_[i] = 1.0*inverseColumnScale_[i];
    38093810    gutsOfScaling();
    38103811  }
     
    39713972  savedRowScale_ = NULL;
    39723973  savedColumnScale_ = NULL;
     3974}
     3975// Set new row matrix
     3976void
     3977ClpModel::setNewRowCopy(ClpMatrixBase * newCopy)
     3978{
     3979  delete rowCopy_;
     3980  rowCopy_ = newCopy;
    39733981}
    39743982/* Find a network subset.
Note: See TracChangeset for help on using the changeset viewer.