Changeset 2447


Ignore:
Timestamp:
Apr 7, 2019 5:56:25 AM (7 weeks ago)
Author:
forrest
Message:

out some multi line comments

Location:
trunk/Clp/src
Files:
4 edited

Legend:

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

    r2440 r2447  
    19231923  //}
    19241924  //}
    1925 #if 0 //ndef _MSC_VER                                                              \
    1926   // The local static var k is a problem when trying to build a DLL. Since this is \
    1927   // just for debugging (likely done on *nix), just hide it from Windows           \
     1925#if 0 //ndef _MSC_VER                                                           
     1926  // The local static var k is a problem when trying to build a DLL. Since this is
     1927  // just for debugging (likely done on *nix), just hide it from Windows       
    19281928  // -- lh, 101016 --
    19291929     if (0)  {
  • trunk/Clp/src/ClpSimplexDual.cpp

    r2440 r2447  
    14121412#endif
    14131413              //#define FEB_TRY
    1414 #if 1 //def FEB_TRY \
    1415   // Make safer?
     1414#if 1
     1415              // Make safer?
    14161416              factorization_->saferTolerances(-0.99, -1.03);
    14171417#endif
     
    46524652      const double *reducedCost;
    46534653      double tentativeTheta = 1.0e15;
    4654       double upperTheta = 1.0e31;
     4654      //double upperTheta = 1.0e31;
    46554655      bestPossible = 0.0;
    4656       double multiplier[] = { -1.0, 1.0 };
     4656      //double multiplier[] = { -1.0, 1.0 };
    46574657      double dualT = -dualTolerance_;
    46584658      int nSections = 2;
  • trunk/Clp/src/ClpSimplexPrimal.cpp

    r2385 r2447  
    32123212              << CoinMessageEol;
    32133213            setFlagged(sequenceIn_);
    3214 #if 1 //def FEB_TRY \
     3214#if 1 //def FEB_TRY
    32153215  // could do conditional reset of weights to get larger djs
    32163216            primalColumnPivot_->saveWeights(this, 6);
  • trunk/Clp/src/ClpSolve.cpp

    r2439 r2447  
    35023502          model2->defaultFactorizationFrequency();
    35033503        }
    3504 #if 1 //ndef ABC_INHERIT //#if 1 \
     3504#if 1 //ndef ABC_INHERIT
    35053505  // throw some into basis
    35063506        if (!forceFixing) {
Note: See TracChangeset for help on using the changeset viewer.