Changeset 466


Ignore:
Timestamp:
Oct 6, 2004 2:54:01 PM (15 years ago)
Author:
forrest
Message:

deleting all and restoring all

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpModel.cpp

    r465 r466  
    175175  columnLower_=ClpCopyOfArray(collb,numberColumns_,0.0);
    176176  columnUpper_=ClpCopyOfArray(colub,numberColumns_,COIN_DBL_MAX);
    177   // set default solution
     177  // set default solution and clean bounds
    178178  for (iRow=0;iRow<numberRows_;iRow++) {
    179179    if (rowLower_[iRow]>0.0) {
     
    184184      rowActivity_[iRow]=0.0;
    185185    }
     186    if (rowLower_[iRow]<-1.0e27)
     187      rowLower_[iRow]=-COIN_DBL_MAX;
     188    if (rowUpper_[iRow]>1.0e27)
     189      rowUpper_[iRow]=COIN_DBL_MAX;
    186190  }
    187191  for (iColumn=0;iColumn<numberColumns_;iColumn++) {
     
    193197      columnActivity_[iColumn]=0.0;
    194198    }
     199    if (columnLower_[iColumn]<-1.0e27)
     200      columnLower_[iColumn]=-COIN_DBL_MAX;
     201    if (columnUpper_[iColumn]>1.0e27)
     202      columnUpper_[iColumn]=COIN_DBL_MAX;
    195203  }
    196204}
  • trunk/ClpPackedMatrix.cpp

    r461 r466  
    152152  ClpPackedMatrix * copy = new ClpPackedMatrix();
    153153  copy->matrix_= new CoinPackedMatrix();
     154  copy->matrix_->setExtraGap(0.0);
     155  copy->matrix_->setExtraMajor(0.0);
    154156  copy->matrix_->reverseOrderedCopyOf(*matrix_);
    155   copy->matrix_->removeGaps();
     157  //copy->matrix_->removeGaps();
    156158  copy->numberActiveColumns_ = copy->matrix_->getNumCols();
    157159  copy->hasGaps_=false;
     
    17741776{
    17751777  int iColumn;
     1778  // make sure matrix correct size
     1779  matrix_->setDimensions(model->numberRows(),model->numberColumns());
    17761780  CoinBigIndex numberLarge=0;;
    17771781  CoinBigIndex numberSmall=0;;
Note: See TracChangeset for help on using the changeset viewer.