Changeset 1377 for trunk/Clp


Ignore:
Timestamp:
Jul 3, 2009 6:52:09 AM (10 years ago)
Author:
forrest
Message:

changes led to asserts

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1376 r1377  
    794794    int iRow = model_->pivotRow();
    795795    // feasible - was it infeasible - if so set tiny
    796     assert (infeas[iRow]);
    797     //if (infeas[iRow])
    798     infeas[iRow] = COIN_INDEXED_REALLY_TINY_ELEMENT;
     796    //assert (infeas[iRow]);
     797    if (infeas[iRow])
     798      infeas[iRow] = COIN_INDEXED_REALLY_TINY_ELEMENT;
    799799  }
    800800  primalUpdate->setNumElements(0);
  • trunk/Clp/src/ClpSimplex.cpp

    r1376 r1377  
    6262  upperOut_(-1),
    6363  dualOut_(-1),
    64   dualTolerance_(0.0),
    65   primalTolerance_(0.0),
     64  dualTolerance_(1.0e-7),
     65  primalTolerance_(1.0e-7),
    6666  sumDualInfeasibilities_(0.0),
    6767  sumPrimalInfeasibilities_(0.0),
     
    173173  upperOut_(-1),
    174174  dualOut_(-1),
    175   dualTolerance_(0.0),
    176   primalTolerance_(0.0),
     175  dualTolerance_(1.0e-7),
     176  primalTolerance_(1.0e-7),
    177177  sumDualInfeasibilities_(0.0),
    178178  sumPrimalInfeasibilities_(0.0),
     
    19411941  upperOut_(-1),
    19421942  dualOut_(-1),
    1943   dualTolerance_(0.0),
    1944   primalTolerance_(0.0),
     1943  dualTolerance_(1.0e-7),
     1944  primalTolerance_(1.0e-7),
    19451945  sumDualInfeasibilities_(0.0),
    19461946  sumPrimalInfeasibilities_(0.0),
     
    20452045  upperOut_(-1),
    20462046  dualOut_(-1),
    2047   dualTolerance_(0.0),
    2048   primalTolerance_(0.0),
     2047  dualTolerance_(1.0e-7),
     2048  primalTolerance_(1.0e-7),
    20492049  sumDualInfeasibilities_(0.0),
    20502050  sumPrimalInfeasibilities_(0.0),
     
    81618161#endif
    81628162  }
    8163     CoinMemcpyN(rowActivity_,numberRows_,rowActivityWork_);
    8164     CoinMemcpyN(columnActivity_,numberColumns_,columnActivityWork_);
     8163  CoinMemcpyN(rowActivity_,numberRows_,rowActivityWork_);
     8164  CoinMemcpyN(columnActivity_,numberColumns_,columnActivityWork_);
    81658165  gutsOfSolution(NULL,NULL);
    8166     CoinMemcpyN(rowActivityWork_,numberRows_,rowActivity_);
    8167     CoinMemcpyN(columnActivityWork_,numberColumns_,columnActivity_);
    8168     CoinMemcpyN(dj_,numberColumns_,reducedCost_);
     8166  CoinMemcpyN(rowActivityWork_,numberRows_,rowActivity_);
     8167  CoinMemcpyN(columnActivityWork_,numberColumns_,columnActivity_);
     8168  CoinMemcpyN(dj_,numberColumns_,reducedCost_);
    81698169  deleteRim(-1);
    81708170  return (primalFeasible()&&dualFeasible());
Note: See TracChangeset for help on using the changeset viewer.