Changeset 1029 for trunk


Ignore:
Timestamp:
Dec 1, 2013 1:55:41 PM (6 years ago)
Author:
pbelotti
Message:

update FP weights correctly

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/heuristics/CouenneFeasPump.cpp

    r1028 r1029  
    183183
    184184  do {
     185
     186    if (niter) {
     187      multDistNLP_  *= fabs (save_mDN); // update within loop
     188      multHessNLP_  *= fabs (save_mHN);
     189      multObjFNLP_  *= fabs (save_mON);
     190      multDistMILP_ *= fabs (save_mDM);
     191      multHessMILP_ *= fabs (save_mHM);
     192      multObjFMILP_ *= fabs (save_mOM);
     193    }
     194
     195    printf ("multipliers (%d): %g, %g, %g, %g, %g, %g\n", niter,
     196            multDistNLP (),
     197            multHessNLP (),
     198            multObjFNLP (),
     199            multDistMILP (),
     200            multHessMILP (),
     201            multObjFMILP ());
    185202
    186203    if (CoinCpuTime () > problem_ -> getMaxCpuTime ())
     
    656673    //multHessNLP_ *= save_multHessNLP_; // exponential reduction
    657674
    658     multDistNLP_  *= fabs (save_mDN); // update within loop
    659     multHessNLP_  *= fabs (save_mHN);
    660     multObjFNLP_  *= fabs (save_mON);
    661     multDistMILP_ *= fabs (save_mDM);
    662     multHessMILP_ *= fabs (save_mHM);
    663     multObjFMILP_ *= fabs (save_mOM);
    664 
    665675  } while ((niter++ < maxIter_) &&
    666676           (retval == 0));
Note: See TracChangeset for help on using the changeset viewer.