Changeset 2006 for stable/1.15/Clp/src/AbcSimplex.cpp
 Timestamp:
 Dec 12, 2013 10:40:41 AM (6 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

stable/1.15/Clp/src/AbcSimplex.cpp
r1989 r2006 139 139 lowerBasic_=lowerSaved_+numberTotal; 140 140 upperBasic_=upperSaved_+numberTotal; 141 costBasic_=costSaved_+ numberTotal;141 costBasic_=costSaved_+2*numberTotal; 142 142 solutionBasic_=solutionSaved_+numberTotal; 143 143 djBasic_=djSaved_+numberTotal; … … 5599 5599 elAddress[i]=usefulArray_[i].denseVector(); 5600 5600 } else { 5601 if(elAddress[0]!=usefulArray_[0].denseVector()) { 5602 printf("elAddress not zero and does not match??\n"); 5603 for (int i=0;i<ABC_NUMBER_USEFUL_NORMAL;i++) 5604 elAddress[i]=usefulArray_[i].denseVector(); 5605 } 5601 5606 for (int i=0;i<ABC_NUMBER_USEFUL_NORMAL;i++) 5602 5607 assert(elAddress[i]==usefulArray_[i].denseVector()); … … 5897 5902 return 1; 5898 5903 #endif 5899 double objective = model>rawObjectiveValue(); 5900 if (model>algorithm() < 0) 5901 objective = model>bestPossibleImprovement(); 5904 double objective; 5905 if (model_>algorithm() < 0) { 5906 objective = model_>rawObjectiveValue(); 5907 objective = model_>bestPossibleImprovement(); 5908 } else { 5909 objective = model>abcNonLinearCost()>feasibleReportCost(); 5910 } 5902 5911 double infeasibility; 5903 5912 double realInfeasibility = 0.0; 5904 5913 int numberInfeasibilities; 5905 5914 int iterationNumber = model>numberIterations(); 5906 numberTimesFlagged_ = 0;5915 //numberTimesFlagged_ = 0; 5907 5916 if (model>algorithm() < 0) { 5908 5917 // dual
Note: See TracChangeset
for help on using the changeset viewer.