Changeset 1254


Ignore:
Timestamp:
Aug 27, 2018 6:55:23 PM (15 months ago)
Author:
pbelotti
Message:

merge changeset 1252; add performance indicator to OBBT

Location:
stable/0.5/Couenne/src/bound_tightening
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.5/Couenne/src/bound_tightening/boundTightening.cpp

    r1033 r1254  
    184184  double startTime = CoinCpuTime ();
    185185
    186   perfIndicator_ -> setOldBounds (Lb (), Ub ());
     186  FBBTperfIndicator_ -> setOldBounds (Lb (), Ub ());
    187187
    188188  //
     
    226226  bool retval = btCore (chg_bds);
    227227
    228   perfIndicator_ -> update     (Lb (), Ub (), info.level);
    229   perfIndicator_ -> addToTimer (CoinCpuTime () - startTime);
     228  FBBTperfIndicator_ -> update     (Lb (), Ub (), info.level);
     229  FBBTperfIndicator_ -> addToTimer (CoinCpuTime () - startTime);
    230230
    231231  return retval;
  • stable/0.5/Couenne/src/bound_tightening/obbt.cpp

    r698 r1254  
    1818#include "CouenneProblem.hpp"
    1919#include "CouenneInfeasCut.hpp"
     20#include "CouenneBTPerfIndicator.hpp"
    2021
    2122using namespace Ipopt;
     
    189190  // this CGL.
    190191
     192  int retval = 0;
     193
    191194  if (isWiped (cs) || info.pass >= MAX_OBBT_ATTEMPTS)
    192195    return 0;
     196
     197  double startTime = CoinCpuTime ();
     198
     199  OBBTperfIndicator_ -> setOldBounds (Lb (), Ub ());
    193200
    194201  int nTotImproved = 0;
     
    274281    if (nImprov < 0) {
    275282      jnlst_->Printf(J_ITERSUMMARY, J_BOUNDTIGHTENING, "  Couenne: infeasible node after OBBT\n");
    276       return -1;
    277     }
    278   }
    279 
    280   return 0;
     283      retval = -1;
     284    }
     285  }
     286
     287  OBBTperfIndicator_ -> update     (Lb (), Ub (), info.level);
     288  OBBTperfIndicator_ -> addToTimer (CoinCpuTime () - startTime);
     289
     290  return retval;
    281291}
Note: See TracChangeset for help on using the changeset viewer.