Changeset 856


Ignore:
Timestamp:
Jan 16, 2008 7:43:22 PM (11 years ago)
Author:
lou
Message:

Update stable/CbcGenSolvers to recognise OsiMsk? and OsiCpx?. This matches trunk
revisions r836 and r855.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.0/Cbc/src/CbcGenSolvers.cpp

    r640 r856  
    3636#endif
    3737
     38#ifdef COIN_HAS_CPX
     39# include "OsiCpxSolverInterface.hpp"
     40# ifndef CBC_DEFAULT_SOLVER
     41#   define CBC_DEFAULT_SOLVER "cpx"
     42# endif
     43#endif
     44
    3845#ifdef COIN_HAS_DYLP
    3946# include "OsiDylpSolverInterface.hpp"
     
    4754# ifndef CBC_DEFAULT_SOLVER
    4855#   define CBC_DEFAULT_SOLVER "glpk"
     56# endif
     57#endif
     58
     59#ifdef COIN_HAS_MSK
     60# include "OsiMskSolverInterface.hpp"
     61# ifndef CBC_DEFAULT_SOLVER
     62#   define CBC_DEFAULT_SOLVER "msk"
    4963# endif
    5064#endif
     
    110124  solvers["clp"] = new OsiClpSolverInterface ;
    111125# endif
     126# ifdef COIN_HAS_CPX
     127  solvers["cpx"] = new OsiCpxSolverInterface ;
     128# endif
    112129# ifdef COIN_HAS_DYLP
    113130  solvers["dylp"] = new OsiDylpSolverInterface  ;
     
    115132# ifdef COIN_HAS_GLPK
    116133  solvers["glpk"] = new OsiGlpkSolverInterface  ;
     134# endif
     135# ifdef COIN_HAS_MSK
     136  solvers["msk"] = new OsiMskSolverInterface  ;
    117137# endif
    118138/*
Note: See TracChangeset for help on using the changeset viewer.