Changeset 1014 for stable/0.4


Ignore:
Timestamp:
Nov 12, 2013 10:22:56 AM (6 years ago)
Author:
stefan
Message:

merge r988 from trunk

Location:
stable/0.4/Couenne
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne

  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/heuristics/BonNlpHeuristic.hpp

    r488 r1014  
    1919namespace Couenne {
    2020
    21   /** An heuristic to call an NlpSolver if all CouenneObjects are
    22       close to be satisfied (for other integer objects, rounding is
    23       performed, is SOS are not satisfied does not run).
     21  /** A heuristic to call an NlpSolver if all CouenneObjects are close
     22      to be satisfied (for other integer objects, rounding is
     23      performed, if SOS's are not satisfied it does not run).
    2424   */
    2525
  • stable/0.4/Couenne/src/heuristics/CouenneFeasPump.cpp

    r733 r1014  
    275275#define RND_DECR_EXPONENT .5
    276276
    277             if (iSol [i] >= lb [i] - 1.) down =      1. / pow (1. + (downMoves += 1.), RND_DECR_EXPONENT);
    278             if (iSol [i] <= ub [i] + 1.) up   = 1. - 1. / pow (1. + (upMoves   += 1.), RND_DECR_EXPONENT);
     277            if (iSol [i] >= lb [i] + 1.) down =      1. / pow (1. + (downMoves += 1.), RND_DECR_EXPONENT);
     278            if (iSol [i] <= ub [i] - 1.) up   = 1. - 1. / pow (1. + (upMoves   += 1.), RND_DECR_EXPONENT);
    279279
    280280            if      (rnd < down) iSol [i] -= 1.;
  • stable/0.4/Couenne/src/standardize/constrStandardize.cpp

    r881 r1014  
    154154                                  p -> domain (), aSign);
    155155
    156 //      if (p -> Jnlst () -> ProduceOutput (Ipopt::J_ALL, J_REFORMULATE)) {
    157 //        printf ("AuxSet:\n");
    158 //        for (std::set <exprAux *, compExpr>::iterator i = p -> AuxSet () -> begin ();
    159 //             i != p -> AuxSet () -> end (); ++i)
    160 //          if ((*i) -> Image () == NULL) {
    161 //            (*i) -> print (); printf (" does not have an image!!!\n");
    162 //          } else {
    163 //            printf ("-- "); (*i) -> print (); printf (" := ");
    164 //            (*i) -> Image () -> print (); printf ("\n");
    165 //          }
    166 //      }
     156        if (p -> Jnlst () -> ProduceOutput (Ipopt::J_ALL, J_REFORMULATE)) {
     157          printf ("AuxSet:\n");
     158          for (std::set <exprAux *, compExpr>::iterator i = p -> AuxSet () -> begin ();
     159               i != p -> AuxSet () -> end (); ++i)
     160            if ((*i) -> Image () == NULL) {
     161              (*i) -> print (); printf (" does not have an image!!!\n");
     162            } else {
     163              printf ("-- "); (*i) -> print (); printf (" := ");
     164              (*i) -> Image () -> print (); printf ("\n");
     165            }
     166        }
    167167
    168168        std::set <exprAux *, compExpr>::iterator i = p -> AuxSet () -> end ();
Note: See TracChangeset for help on using the changeset viewer.