Changeset 1926


Ignore:
Timestamp:
May 24, 2013 6:19:49 AM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1925

Location:
stable/2.8
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8

  • stable/2.8/Cbc

  • stable/2.8/Cbc/README

    r1902 r1926  
    2525WHAT'S NEW
    2626==========
     27
     28Release 2.8.2:
     29
     301. Fixed recognition of Glpk source in main configure.
     31
     32Release 2.8.1:
     33
     34   Ted, please fill this in!
    2735
    2836Release 2.8.0:
  • stable/2.8/Cbc/src/CbcModel.cpp

    r1916 r1926  
    39033903            setBestSolution(CBC_SOLUTION, objectiveValue,
    39043904                            solver_->getColSolution()) ;
     3905            if (eventHandler) {
     3906              // we are stopping anyway so no need to test return code
     3907              eventHandler->event(CbcEventHandler::solution);
     3908            }
    39053909            delete newNode ;
    39063910            newNode = NULL ;
  • stable/2.8/Cbc/src/Cbc_ampl.cpp

    r1888 r1926  
    156156    0,
    157157    0,
    158     20070606
     158    20130502
    159159};
    160160// strdup used to avoid g++ compiler warning
     
    766766        moreInfo_(NULL),
    767767        type_(-1),
     768        noNames_(false),
    768769        links_(0)
    769770{
  • stable/2.8/configure

    r1919 r1926  
    2149321493    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
    2149421494    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    21495     for i in $srcdir/ThirdParty/Glpk/glpk/include/glpk.h; do
     21495    for i in $srcdir/ThirdParty/Glpk/glpk/src/glpk.h; do
    2149621496         if test -r $i; then
    2149721497           coin_has_glpk="yes"
  • stable/2.8/configure.ac

    r1919 r1926  
    4646AC_COIN_MAIN_PACKAGEDIR(Blas,   ThirdParty,[daxpy.f])
    4747AC_COIN_MAIN_PACKAGEDIR(Lapack, ThirdParty,[LAPACK/SRC/dlarf.f])
    48 AC_COIN_MAIN_PACKAGEDIR(Glpk,   ThirdParty,[glpk/include/glpk.h])
     48AC_COIN_MAIN_PACKAGEDIR(Glpk,   ThirdParty,[glpk/src/glpk.h])
    4949AC_COIN_MAIN_PACKAGEDIR(Metis,  ThirdParty,[metis-4.0/Lib/balance.c])
    5050AC_COIN_MAIN_PACKAGEDIR(Mumps,  ThirdParty,[MUMPS/src/dmumps_part1.F])
Note: See TracChangeset for help on using the changeset viewer.