Changeset 1832 for trunk/Cbc/src


Ignore:
Timestamp:
Dec 4, 2012 5:14:37 AM (7 years ago)
Author:
stefan
Message:

merge r1831 from trunk

Location:
trunk/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc

  • trunk/Cbc/src/CbcModel.cpp

    r1813 r1832  
    1513115131        savedSolutions_[i] = NULL;
    1513215132    }
     15133    numberSavedSolutions_ = 0;
    1513315134}
    1513415135// Delete a saved solution and move others up
     
    1514415145    }
    1514515146    savedSolutions_[numberSavedSolutions_]=NULL;
     15147    --numberSavedSolutions_;
    1514615148  }
    1514715149}
  • trunk/Cbc/src/CbcSolver.cpp

    r1826 r1832  
    302302  int numberColumns=presolvedModel->getNumCols();
    303303  if (numberSolutions>1) {
     304    model->deleteSolutions();
    304305    double * bestSolution = CoinCopyOfArray(presolvedModel->bestSolution(),numberColumns);
    305306    //double cutoff = presolvedModel->getCutoff();
Note: See TracChangeset for help on using the changeset viewer.