Changeset 1057 for trunk


Ignore:
Timestamp:
Jan 31, 2014 8:46:15 PM (6 years ago)
Author:
pbelotti
Message:

setting externals

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.13/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.14/
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.3.9/
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.14/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.15/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.3.10/
        44ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.6/
        5 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.4.9/
        6 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.11/
        7 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.8/
        8 ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/releases/1.2.4/
         5ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.4.10/
         6ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.12/
         7ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.9/
         8ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/releases/1.2.5/
        99ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/trunk
        1010CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.8/CoinUtils
         
        1313Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.8/Clp
        1414Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.7/Osi
        15 Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.4/Ipopt
         15Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.11.7/Ipopt
        1616Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.5.3/Bonmin
  • trunk/Couenne/src/heuristics/CouenneFeasPump.cpp

    r1030 r1057  
    4545  if ((nCalls_ == 0) ||                                   // check upper limit on number of runs
    4646      //(problem_ -> nIntVars () <= 0) ||                 // feas pump on NLP? Why not?
    47       (CoinCpuTime () > problem_ -> getMaxCpuTime ()) || // don't start if time is out
     47      (CoinCpuTime () >= problem_ -> getMaxCpuTime ()) || // don't start if time is out
    4848      ((numberSolvePerLevel_ >= 0) &&                     // stop FP after a certain level
    4949       (CoinDrand48 () > 1. / CoinMax                     // decided randomly and inversely proportional
     
    7070
    7171  problem_ -> domain () -> push (*(problem_ -> domain () -> current ()));
     72
     73  // Initial Bound Tightening: since Cbc prefers (reasonably) to call
     74  // a heuristic before any cut separator and because BT is instead
     75  // quite fast, let's see if we can reduce bounds to get a tighter
     76  // MILP relaxation.
     77
     78  t_chg_bounds *chg_bds = new t_chg_bounds [problem_ -> nVars ()];
     79
     80  for (int i=problem_ -> nVars (); i--;) {
     81    chg_bds [i]. setLower (t_chg_bounds::CHANGED);
     82    chg_bds [i]. setUpper (t_chg_bounds::CHANGED);
     83  }
     84
     85  bool is_still_feas = problem_ -> btCore (chg_bds);
     86
     87  delete [] chg_bds;
     88
     89  // Now that bounds are possibly reduced, put current point within
     90  // bounds
     91
     92  double
     93    *lb  = problem_ -> domain () -> lb (),
     94    *ub  = problem_ -> domain () -> ub (),
     95    *sol = problem_ -> domain () -> x  ();
     96
     97  for (int i=problem_ -> nVars (); i--;)
     98
     99    if      (sol [i] < lb [i]) sol [i] = lb [i];
     100    else if (sol [i] > ub [i]) sol [i] = ub [i];
    72101
    73102  // fix integer coordinates of current (MINLP feasible!) solution
  • trunk/Dependencies

    r1027 r1057  
    1313Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
    1414Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
    15 Ipopt             https://projects.coin-or.org/svn/Ipopt/stable/3.10/Ipopt
     15Ipopt             https://projects.coin-or.org/svn/Ipopt/stable/3.11/Ipopt
    1616Bonmin            https://projects.coin-or.org/svn/Bonmin/stable/1.5/Bonmin
Note: See TracChangeset for help on using the changeset viewer.