Changeset 3095


Ignore:
Timestamp:
Oct 13, 2010 10:18:37 PM (11 years ago)
Author:
wehart
Message:

Adding solver documentation.

Adding asl:PICO tests.

Location:
coopr.plugins/trunk/coopr/plugins
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • coopr.plugins/trunk/coopr/plugins/mip/ASL.py

    r2664 r3095  
    2929    """
    3030
    31     pyutilib.component.core.alias('asl')
     31    pyutilib.component.core.alias('asl', doc='Shell interface to a generic optimizer that uses the AMPL Solver Library to interface with application')
    3232
    3333    def __init__(self, **kwds):
  • coopr.plugins/trunk/coopr/plugins/mip/CBCplugin.py

    r3002 r3095  
    4242    """
    4343
    44     pyutilib.component.core.alias('cbc')
     44    pyutilib.component.core.alias('cbc',  doc='Shell interface to the CLP/CBC LP/MIP solver')
    4545
    4646    def __init__(self, **kwds):
  • coopr.plugins/trunk/coopr/plugins/mip/CPLEX.py

    r2926 r3095  
    3333    """
    3434
    35     pyutilib.component.core.alias('cplex')
     35    pyutilib.component.core.alias('cplex', doc='Shell interface to the CPLEX LP/MIP solver')
    3636
    3737    def __init__(self, **kwds):
  • coopr.plugins/trunk/coopr/plugins/mip/CPLEXDirect.py

    r2985 r3095  
    4545    """
    4646
    47     pyutilib.component.core.alias('cplexdirect')
     47    pyutilib.component.core.alias('cplexdirect',  doc='Direct Python interface to the CPLEX LP/MIP solver')
    4848
    4949    def __init__(self, **kwds):
  • coopr.plugins/trunk/coopr/plugins/mip/GLPK.py

    r2925 r3095  
    2727    """The GLPK LP/MIP solver"""
    2828
    29     alias('glpk')
     29    alias('glpk', doc='Shell interface to the GNU Linear Programming Kit')
    3030
    3131    def __init__(self, **kwds):
  • coopr.plugins/trunk/coopr/plugins/mip/GUROBI.py

    r3091 r3095  
    3232    """
    3333
    34     pyutilib.component.core.alias('gurobi')
     34    pyutilib.component.core.alias('gurobi',  doc='Shell interface to the GUROBI LP/MIP solver')
    3535
    3636    def __init__(self, **kwds):
  • coopr.plugins/trunk/coopr/plugins/mip/PICO.py

    r3063 r3095  
    2828    """
    2929
    30     pyutilib.component.core.alias('pico')
     30    pyutilib.component.core.alias('pico', doc='Shell interface to the PICO MIP solver')
    3131
    3232    def __init__(self, **kwds):
  • coopr.plugins/trunk/coopr/plugins/mip/ossolver.py

    r2776 r3095  
    2121    """The Optimization Systems solver."""
    2222
    23     alias('ossolver')
     23    alias('ossolver', doc='A draft interface to a generic OS solver')
    2424
    2525    def __init__ (self, **kwargs):
  • coopr.plugins/trunk/coopr/plugins/testdriver/mip.py

    r2718 r3095  
    1515from pyutilib.component.core import *
    1616import pyutilib.services
    17 
     17from pyutilib.misc import Options
    1818
    1919class CooprMIPTestDriver(Plugin):
     
    3939        pyutilib.services.TempfileManager.tempdir = options.currdir
    4040        #
    41         testcase.opt = coopr.opt.SolverFactory(options.solver, options=options.solver_options)
     41        if ':' in options.solver:
     42            solver, sub_solver = options.solver.split(':')
     43            if options.solver_options is None:
     44                _options = Options()
     45            else:
     46                _options = options.solver_options
     47            _options.solver = sub_solver
     48            testcase.opt = coopr.opt.SolverFactory(solver, options=_options)
     49        else:
     50            testcase.opt = coopr.opt.SolverFactory(options.solver, options=options.solver_options)
    4251        if testcase.opt is None or not testcase.opt.available(False):
    4352            testcase.skipTest('Solver %s is not available' % options.solver)
  • coopr.plugins/trunk/coopr/plugins/tests/mip/test_mip.yml

    r2722 r3095  
    1313    cbc:
    1414    _mock_cbc:
     15    asl_pico:
     16       name: 'asl:pico'
    1517
    1618problems:
     
    6668            pico:
    6769            _mock_pico:
     70            asl_pico:
    6871        problems:
    6972            test1:
Note: See TracChangeset for help on using the changeset viewer.