- Timestamp:
- Jul 9, 2009 10:05:23 AM (12 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpFactorization.hpp
r1376 r1394 14 14 class CoinOtherFactorization; 15 15 #ifndef CLP_MULTIPLE_FACTORIZATIONS 16 #ifdef CLP_OSL17 16 #define CLP_MULTIPLE_FACTORIZATIONS 4 18 #else19 #define CLP_MULTIPLE_FACTORIZATIONS 320 #endif21 17 #endif 22 18 #ifdef CLP_MULTIPLE_FACTORIZATIONS -
trunk/Clp/src/ClpModel.cpp
r1370 r1394 2585 2585 { 2586 2586 double * array = NULL; 2587 if (problemStatus_==1 &&!secondaryStatus_) {2587 if (problemStatus_==1) { 2588 2588 array = ClpCopyOfArray(ray_,numberRows_); 2589 //#define SWAP_SIGN 2590 #ifdef SWAP_SIGN 2589 #ifndef CLP_NO_SWAP_SIGN 2591 2590 // swap signs to be consistent with norm 2592 2591 for (int i=0;i<numberRows_;i++) -
trunk/Clp/src/ClpPredictorCorrector.cpp
r1370 r1394 3138 3138 #define KILL_ITERATION 50 3139 3139 #else 3140 #if CLP_CAUTION < 1 3141 #define KILL_ITERATION 50 3142 #else 3140 3143 #define KILL_ITERATION 100 3144 #endif 3141 3145 #endif 3142 3146 if (!quadraticObj||1) { -
trunk/Clp/src/ClpSimplexDual.cpp
r1376 r1394 4440 4440 sumDualInfeasibilities_,numberDualInfeasibilities_); 4441 4441 #endif 4442 double approximateObjective=objectiveValue_; 4442 4443 #ifdef CLP_REPORT_PROGRESS 4443 4444 if (ixxxxxx>=ixxyyyy-4&&ixxxxxx<=ixxyyyy) { … … 5120 5121 if (alphaAccuracy_>0.0) 5121 5122 alphaAccuracy_=1.0; 5123 // If we are stopping - use plausible objective 5124 // Maybe only in fast dual 5125 if (problemStatus_>2) 5126 objectiveValue_ = approximateObjective; 5122 5127 } 5123 5128 /* While updateDualsInDual sees what effect is of flip -
trunk/Clp/src/ClpSimplexPrimal.cpp
r1376 r1394 821 821 dummy=4; 822 822 matrix_->generalExpanded(this,9,dummy); 823 #ifdef CLP_CAUTION 823 #ifndef CLP_CAUTION 824 #define CLP_CAUTION 1 825 #endif 826 #if CLP_CAUTION 824 827 double lastAverageInfeasibility=sumDualInfeasibilities_/ 825 828 static_cast<double>(numberDualInfeasibilities_+10); … … 828 831 double sumInfeasibility = nonLinearCost_->sumInfeasibilities(); 829 832 int reason2=0; 830 #if defCLP_CAUTION833 #if CLP_CAUTION 831 834 #if CLP_CAUTION==2 832 835 double test2=1.0e5;
Note: See TracChangeset
for help on using the changeset viewer.