Changeset 939


Ignore:
Timestamp:
Jan 12, 2013 2:53:30 PM (7 years ago)
Author:
pbelotti
Message:

cosmetic changes

Location:
trunk/Couenne/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/bound_tightening/twoImpliedBT/TwoImpliedGenCuts.cpp

    r791 r939  
    602602        babInfo -> babPtr ()) {
    603603
    604 #ifdef DEBUG
    605       printf ("FBBT\n");
    606 #endif
    607 
    608604      CouNumber
    609605        UB      = babInfo -> babPtr () -> model (). getObjValue(),
  • trunk/Couenne/src/bound_tightening/twoImpliedBT/TwoImpliedIneqCombine.cpp

    r490 r939  
    2424enum signum {NEG, POS, DN, UP};
    2525
    26   //#define DEBUG
     26//#define DEBUG
    2727
    2828// type for alphas ////////////////////////////////////////////////
     
    120120  }
    121121
    122   // This is not very wise: qsort behaves horribly on already sorted
    123   // arrays (if the pivot element is the last one).
     122  // This is not very wise: qsort behaves horribly (that is, O(n^2))
     123  // on already sorted arrays (if the pivot element is the last one).
    124124
    125125  qsort (pairs, n1, sizeof (indPosPair), compPair);
  • trunk/Couenne/src/cut/sdpcuts/CutGen.cpp

    r938 r939  
    4343  // only at root node once
    4444
    45   if ((info . level * info . pass > 4)) return;
     45  if ((info . level + info . pass > 4)) return;
    4646
    4747  problem_ -> domain () -> push (&si, &cs);
Note: See TracChangeset for help on using the changeset viewer.