Changeset 2177


Ignore:
Timestamp:
Oct 8, 2015 6:32:40 AM (4 years ago)
Author:
forrest
Message:

minor debug changes

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r2176 r2177  
    32453245 adjust bounds, maybe we need that here."
    32463246     );
    3247      CLP_PARAM_DBL_PSI,
    32483247     parameters[numberParameters++] =
    32493248          CbcOrClpParam("psi", "Two-dimension pricing factor for Positive edge",
     
    387738767 - 128 Try and create cliques\n 8 - 256 If all +1 try hard for dominated rows\n \
    3878387710 - 1024 Use a larger feasibility tolerance in presolve\n \
    3879 11 - 2048 Try probing before creating cliques"
     387811 - 2048 Try probing before creating cliques\n \
     387912 - 4096 Switch off duplicate column checking for integers"
    38803880     );
    38813881     parameters[numberParameters++] =
  • trunk/Clp/src/ClpPresolve.cpp

    r2146 r2177  
    389389}
    390390#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
    393396void check_sol(CoinPresolveMatrix *prob, double tol)
    394397{
     
    985988
    986989          int iLoop;
    987 #if     PRESOLVE_DEBUG
     990#if     PRESOLVE_CHECK_SOL
    988991          check_sol(prob, 1.0e0);
    989992#endif
     
    11491152                    }
    11501153
    1151 #if     PRESOLVE_DEBUG
     1154#if     PRESOLVE_CHECK_SOL
    11521155                    check_sol(prob, 1.0e0);
    11531156#endif
     
    12871290                    printProgress('O',iLoop+1);
    12881291               }
    1289 #if     PRESOLVE_DEBUG
     1292#if     PRESOLVE_CHECK_SOL
    12901293               check_sol(prob, 1.0e0);
    12911294#endif
     
    13001303                    printProgress('P',iLoop+1);
    13011304               }
    1302 #if     PRESOLVE_DEBUG
     1305#if     PRESOLVE_CHECK_SOL
    13031306               check_sol(prob, 1.0e0);
    13041307#endif
     
    13131316               // Marginally slower on netlib if this call is enabled.
    13141317               // paction_ = testRedundant(prob,paction_) ;
    1315 #if     PRESOLVE_DEBUG
     1318#if     PRESOLVE_CHECK_SOL
    13161319               check_sol(prob, 1.0e0);
    13171320#endif
     
    13491352                    printProgress('R',iLoop+1);
    13501353               }
    1351 #if     PRESOLVE_DEBUG
     1354#if     PRESOLVE_CHECK_SOL
    13521355               check_sol(prob, 1.0e0);
    13531356#endif
     
    13911394     if (!prob->status_) {
    13921395          paction_ = drop_zero_coefficients(prob, paction_);
    1393 #if     PRESOLVE_DEBUG
     1396#if     PRESOLVE_CHECK_SOL
    13941397          check_sol(prob, 1.0e0);
    13951398#endif
     
    13971400          paction_ = drop_empty_cols_action::presolve(prob, paction_);
    13981401          paction_ = drop_empty_rows_action::presolve(prob, paction_);
    1399 #if     PRESOLVE_DEBUG
     1402#if     PRESOLVE_CHECK_SOL
    14001403          check_sol(prob, 1.0e0);
    14011404#endif
Note: See TracChangeset for help on using the changeset viewer.