Ignore:
Timestamp:
Mar 7, 2014 12:18:15 PM (6 years ago)
Author:
forrest
Message:

changes to abc

File:
1 edited

Legend:

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

    r1910 r2024  
    144144  minimumGoodReducedCosts_ = -1;
    145145}
    146 
     146#ifdef ABC_SPRINT
     147/* Subset constructor (without gaps). */
     148AbcMatrix::AbcMatrix (const AbcMatrix & wholeMatrix,
     149                      int numberRows, const int * whichRows,
     150                      int numberColumns, const int * whichColumns)
     151{
     152#ifndef COIN_SPARSE_MATRIX
     153  matrix_ = new CoinPackedMatrix(*wholeMatrix.matrix_,numberRows,whichRows,
     154                                 numberColumns,whichColumns);
     155#else
     156  matrix_ = new CoinPackedMatrix(rhs, -0, -0);
     157  abort();
     158#endif
     159  matrix_->cleanMatrix();
     160  model_=NULL;
     161  rowStart_ = NULL;
     162  element_ = NULL;
     163  column_ = NULL;
     164#ifdef COUNT_COPY
     165  countRealColumn_ = NULL;
     166  countStartLarge_ = NULL;
     167  countRow_ = NULL;
     168  countElement_ = NULL;
     169  smallestCount_ = 0;
     170  largestCount_ = 0;
     171#endif
     172  numberColumnBlocks_=1;
     173  startColumnBlock_[0]=0;
     174  startColumnBlock_[1]=0;
     175  numberRowBlocks_ = 0;
     176  startFraction_ = 0;
     177  endFraction_ = 1.0;
     178  savedBestDj_ = 0;
     179  originalWanted_ = 0;
     180  currentWanted_ = 0;
     181  savedBestSequence_ = -1;
     182  minimumObjectsScan_ = -1;
     183  minimumGoodReducedCosts_ = -1;
     184}
     185#endif
    147186//-------------------------------------------------------------------
    148187// Destructor
     
    31503189   int maximumRows=model_->maximumAbcNumberRows();
    31513190   int number=updateForTableauRow.getNumElements();
    3152    assert (number);
     3191   // was assert (number);
     3192   if (!number) {
     3193     printf("Null tableau row!\n");
     3194   }
    31533195   bool useRowCopy = (gotRowCopy()&&(number<<2)<maximumRows);
    31543196   //useRowCopy=false;
Note: See TracChangeset for help on using the changeset viewer.