Changeset 763 for stable/0.4


Ignore:
Timestamp:
Aug 9, 2011 5:03:54 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev762

Location:
stable/0.4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne

  • stable/0.4/Couenne/src/branch

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/expression/operators/exprGroup.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/main/BonCouenneSetup.cpp

    r749 r763  
    4949#include "BonNlpHeuristic.hpp"
    5050
    51 #include "Heuristics/BonFixAndSolveHeuristic.hpp"
    52 #include "Heuristics/BonDummyPump.hpp"
    53 #include "Heuristics/BonPumpForMinlp.hpp"
    54 #include "Heuristics/BonHeuristicRINS.hpp"
    55 #include "Heuristics/BonHeuristicLocalBranching.hpp"
    56 #include "Heuristics/BonHeuristicFPump.hpp"
    57 #include "Heuristics/BonHeuristicDiveFractional.hpp"
    58 #include "Heuristics/BonHeuristicDiveVectorLength.hpp"
    59 #include "Heuristics/BonHeuristicDiveMIPFractional.hpp"
    60 #include "Heuristics/BonHeuristicDiveMIPVectorLength.hpp"
    61 #include "Heuristics/BonMilpRounding.hpp"
     51#include "BonFixAndSolveHeuristic.hpp"
     52#include "BonDummyPump.hpp"
     53#include "BonPumpForMinlp.hpp"
     54#include "BonHeuristicRINS.hpp"
     55#include "BonHeuristicLocalBranching.hpp"
     56#include "BonHeuristicFPump.hpp"
     57#include "BonHeuristicDiveFractional.hpp"
     58#include "BonHeuristicDiveVectorLength.hpp"
     59#include "BonHeuristicDiveMIPFractional.hpp"
     60#include "BonHeuristicDiveMIPVectorLength.hpp"
     61#include "BonMilpRounding.hpp"
    6262
    6363#include "BonGuessHeuristic.hpp"
  • stable/0.4/Dependencies

    r756 r763  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
    2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
    3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
    4 ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.3
    5 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
     2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
     3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
     4ThirdParty/HSL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.3
     5ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
    66ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
    77ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
    8 ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.0
    9 ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/stable/1.0
    10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
    11 Cbc  https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
    12 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
    13 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
    14 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
    15 Ipopt  https://projects.coin-or.org/svn/Ipopt/stable/3.10/Ipopt
    16 Bonmin  https://projects.coin-or.org/svn/Bonmin/stable/1.5/Bonmin
     8ThirdParty/SoPlex https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.0
     9ThirdParty/SCIP   https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/stable/1.0
     10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
     11Cbc               https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
     12Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
     13Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
     14Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
     15Ipopt             https://projects.coin-or.org/svn/Ipopt/stable/3.10/Ipopt
     16Bonmin            https://projects.coin-or.org/svn/Bonmin/stable/1.5/Bonmin
Note: See TracChangeset for help on using the changeset viewer.