Changeset 1015 for stable/0.4


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

merge r997 from trunk

Location:
stable/0.4/Couenne
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne

  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/bound_tightening

  • stable/0.4/Couenne/src/bound_tightening/aggressiveBT.cpp

    r905 r1015  
    145145      try {
    146146
    147         nlp -> options () -> SetNumericValue ("max_cpu_time", CoinMax (0., getMaxCpuTime () - CoinCpuTime ()));
     147        nlp -> options () -> SetNumericValue ("max_cpu_time", CoinMax (0.1, getMaxCpuTime () - CoinCpuTime ()));
    148148        nlp -> initialSolve ();
    149149      }
  • stable/0.4/Couenne/src/heuristics/BonNlpHeuristic.cpp

    r969 r1015  
    311311    // apply NLP solver /////////////////////////////////
    312312    try {
    313       nlp_ -> options () -> SetNumericValue ("max_cpu_time", CoinMax (0., couenne_ -> getMaxCpuTime () - CoinCpuTime ()));
     313      nlp_ -> options () -> SetNumericValue ("max_cpu_time", CoinMax (0.1, couenne_ -> getMaxCpuTime () - CoinCpuTime ()));
    314314      nlp_ -> initialSolve ();
    315315    }
  • stable/0.4/Couenne/src/interfaces/BonCouenneInterface.cpp

    r907 r1015  
    151151    if (is_feasible) {
    152152      try {
    153         options () -> SetNumericValue ("max_cpu_time", CoinMax (0., (p -> getMaxCpuTime () - CoinCpuTime ()) / 2));
     153        options () -> SetNumericValue ("max_cpu_time", CoinMax (0.1, (p -> getMaxCpuTime () - CoinCpuTime ()) / 2));
    154154        initialSolve ();
    155155      }
     
    235235
    236236            try {
    237               options () -> SetNumericValue ("max_cpu_time", CoinMax (0., p -> getMaxCpuTime () - CoinCpuTime ()));
     237              options () -> SetNumericValue ("max_cpu_time", CoinMax (0.1, p -> getMaxCpuTime () - CoinCpuTime ()));
    238238              resolve (); // solve with integer variables fixed
    239239            }
Note: See TracChangeset for help on using the changeset viewer.