Changeset 1328 for trunk/Clp


Ignore:
Timestamp:
Jan 23, 2009 2:02:49 PM (11 years ago)
Author:
forrest
Message:

add some asserts and clean up a fathoming option

Location:
trunk/Clp/src
Files:
4 edited

Legend:

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

    r1321 r1328  
    22012201  // Deal with matrix
    22022202
    2203   delete rowCopy_;
     2203  delete rowCopy_; 
    22042204  rowCopy_=NULL;
    2205   delete scaledMatrix_;
     2205  delete scaledMatrix_; 
    22062206  scaledMatrix_=NULL;
    22072207  if (!matrix_)
  • trunk/Clp/src/ClpPackedMatrix.cpp

    r1321 r1328  
    19471947          indexRowU[numberElements]=iRow;
    19481948          rowCount[iRow]++;
     1949          assert (elementByColumn[j]);
    19491950          elementU[numberElements++]=elementByColumn[j];
    19501951        }
     
    19651966          indexRowU[numberElements]=iRow;
    19661967          rowCount[iRow]++;
     1968          assert (elementByColumn[j]);
    19671969          elementU[numberElements++]=
    19681970            elementByColumn[j]*scale*rowScale[iRow];
  • trunk/Clp/src/ClpSimplex.cpp

    r1321 r1328  
    16631663  changeMade_++; // something has happened
    16641664  // incoming variable
    1665   if (handler_->detail(CLP_SIMPLEX_HOUSE1,messages_)<100) {
     1665  if (handler_->logLevel()>7) {
     1666    //if (handler_->detail(CLP_SIMPLEX_HOUSE1,messages_)<100) {
    16661667    handler_->message(CLP_SIMPLEX_HOUSE1,messages_)
    16671668      <<directionOut_
     
    17291730  matrix_->updatePivot(this,oldIn,oldOut);
    17301731  objectiveValue_ += objectiveChange/(objectiveScale_*rhsScale_);
    1731   if (handler_->detail(CLP_SIMPLEX_HOUSE2,messages_)<100) {
     1732  if (handler_->logLevel()>7) {
     1733    //if (handler_->detail(CLP_SIMPLEX_HOUSE2,messages_)<100) {
    17321734    handler_->message(CLP_SIMPLEX_HOUSE2,messages_)
    17331735      <<numberIterations_<<objectiveValue()
     
    19881990  perturbationArray_(NULL),
    19891991  baseModel_(NULL)
    1990 {
     1992{ 
    19911993  int i;
    19921994  for (i=0;i<6;i++) {
     
    1075310755    delete [] bestStatus;
    1075410756    setDblParam(ClpDualObjectiveLimit, saveBestObjective);
     10757    int saveOptions=specialOptions_;
     10758    specialOptions_&=~65536;
    1075510759    dual();
     10760    specialOptions_=saveOptions;
    1075610761    info->numberNodesExplored_ = numberNodes;
    1075710762    info->numberIterations_ = numberIterations;
     
    1109711102    }
    1109811103    // solve
     11104    double dummyChange;
     11105    (static_cast<ClpSimplexDual *>(this))->changeBounds(3,NULL,dummyChange);
     11106    //int saveNumberFake = numberFake_;
    1109911107    fastDual2(info);
    1110011108    numberNodes++;
     
    1141211420  assert ((info->solverOptions_&65536)==0);
    1141311421  info->solverOptions_ |= 65536;
    11414   if ((specialOptions_&65536)==0)
     11422  if ((specialOptions_&65536)==0) {
    1141511423    factorization_->setPersistenceFlag(2);
     11424  } else {
     11425    factorization_->setPersistenceFlag(2);
     11426    startPermanentArrays();
     11427  }
    1141611428  //assert (!lower_);
    1141711429  // create modifiable copies of model rim and do optional scaling
     
    1143111443      }
    1143211444      delete [] columnScale_;
     11445      if (savedColumnScale_&&savedColumnScale_==columnScale_)
     11446        savedColumnScale_=NULL;
     11447      if (savedRowScale_&&savedRowScale_==rowScale_)
     11448        savedRowScale_=NULL;
    1143311449      columnScale_ = temp;
    1143411450    }
     
    1144011456        temp[i+numberRows_]=1.0/value;
    1144111457      }
     11458      if (savedColumnScale_&&savedColumnScale_==columnScale_)
     11459        savedColumnScale_=NULL;
     11460      if (savedRowScale_&&savedRowScale_==rowScale_)
     11461        savedRowScale_=NULL;
    1144211462      delete [] rowScale_;
    1144311463      rowScale_ = temp;
  • trunk/Clp/src/ClpSimplexDual.cpp

    r1323 r1328  
    40994099    double thisObj = objectiveValue_-bestPossibleImprovement_;
    41004100#ifdef CLP_INVESTIGATE
     4101    assert (bestPossibleImprovement_>-1000.0&&objectiveValue_>-1.0e100);
    41014102    if (bestPossibleImprovement_)
    41024103      printf("obj %g add in %g -> %g\n",objectiveValue_,bestPossibleImprovement_,
Note: See TracChangeset for help on using the changeset viewer.