Changeset 2177 for trunk/Clp/src/ClpPresolve.cpp
 Timestamp:
 Oct 8, 2015 6:32:40 AM (4 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Clp/src/ClpPresolve.cpp
r2146 r2177 389 389 } 390 390 #endif 391 //#define PRESOLVE_DEBUG 1 392 #if PRESOLVE_DEBUG 391 #ifdef PRESOLVE_DEBUG 392 #define PRESOLVE_CHECK_SOL 1 393 #endif 394 //#define PRESOLVE_CHECK_SOL 1 395 #if PRESOLVE_CHECK_SOL 393 396 void check_sol(CoinPresolveMatrix *prob, double tol) 394 397 { … … 985 988 986 989 int iLoop; 987 #if PRESOLVE_ DEBUG990 #if PRESOLVE_CHECK_SOL 988 991 check_sol(prob, 1.0e0); 989 992 #endif … … 1149 1152 } 1150 1153 1151 #if PRESOLVE_ DEBUG1154 #if PRESOLVE_CHECK_SOL 1152 1155 check_sol(prob, 1.0e0); 1153 1156 #endif … … 1287 1290 printProgress('O',iLoop+1); 1288 1291 } 1289 #if PRESOLVE_ DEBUG1292 #if PRESOLVE_CHECK_SOL 1290 1293 check_sol(prob, 1.0e0); 1291 1294 #endif … … 1300 1303 printProgress('P',iLoop+1); 1301 1304 } 1302 #if PRESOLVE_ DEBUG1305 #if PRESOLVE_CHECK_SOL 1303 1306 check_sol(prob, 1.0e0); 1304 1307 #endif … … 1313 1316 // Marginally slower on netlib if this call is enabled. 1314 1317 // paction_ = testRedundant(prob,paction_) ; 1315 #if PRESOLVE_ DEBUG1318 #if PRESOLVE_CHECK_SOL 1316 1319 check_sol(prob, 1.0e0); 1317 1320 #endif … … 1349 1352 printProgress('R',iLoop+1); 1350 1353 } 1351 #if PRESOLVE_ DEBUG1354 #if PRESOLVE_CHECK_SOL 1352 1355 check_sol(prob, 1.0e0); 1353 1356 #endif … … 1391 1394 if (!prob>status_) { 1392 1395 paction_ = drop_zero_coefficients(prob, paction_); 1393 #if PRESOLVE_ DEBUG1396 #if PRESOLVE_CHECK_SOL 1394 1397 check_sol(prob, 1.0e0); 1395 1398 #endif … … 1397 1400 paction_ = drop_empty_cols_action::presolve(prob, paction_); 1398 1401 paction_ = drop_empty_rows_action::presolve(prob, paction_); 1399 #if PRESOLVE_ DEBUG1402 #if PRESOLVE_CHECK_SOL 1400 1403 check_sol(prob, 1.0e0); 1401 1404 #endif
Note: See TracChangeset
for help on using the changeset viewer.