Changeset 9521


Ignore:
Timestamp:
Dec 21, 2014 10:57:40 AM (4 years ago)
Author:
wehart
Message:

Disabling the bilevel subcommand.

Removing the linear_dual preprocessing plugin,
which is now redundant with the --transform command-line
option.

Location:
pyomo/trunk/pyomo/bilevel
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • pyomo/trunk/pyomo/bilevel/plugins/__init__.py

    r9519 r9521  
    99
    1010def load():
    11     import pyomo.bilevel.plugins.driver
     11    #import pyomo.bilevel.plugins.driver
    1212    import pyomo.bilevel.plugins.dual
    1313    import pyomo.bilevel.plugins.solver1
  • pyomo/trunk/pyomo/bilevel/tests/test_linear_dual.py

    r9520 r9521  
    4040import pyomo.opt
    4141import pyomo.scripting.pyomo_command as pyomo_main
    42 from pyomo.bilevel.plugins.driver import bilevel_exec
     42#from pyomo.bilevel.plugins.driver import bilevel_exec
    4343from pyomo.scripting.util import cleanup
    4444from pyomo.util.plugin import ExtensionPoint
     
    5252        args = []
    5353        args.append('-c')
    54         pproc = None
    5554        if 'solver' in kwds:
    5655            _solver = kwds.get('solver','glpk')
     
    6059            pp = kwds['preprocess']
    6160            if pp == 'linear_dual':
    62                 import pyomo.bilevel.linear_dual
    63                 pproc = pyomo.bilevel.linear_dual.transform
     61                args.append('--transform=bilevel.linear_dual')
    6462        args.append('--symbolic-solver-labels')
    6563        args.append('--save-results=result.yml')
     
    7775
    7876        print('***')
    79         if pproc:
    80             pproc.activate()
    81             print("Activating " + kwds['preprocess'])
    8277        #print(' '.join(args))
    83         #output = pyomo_main.run(args)
    8478        try:
    85             if pproc:
    86                 output = pyomo_main.run(args)
    87             else:
    88                 output = bilevel_exec(args)
     79            output = pyomo_main.run(args)
    8980        except:
    9081            output = None
    9182        cleanup()
    92         if pproc:
    93             pproc.deactivate()
    9483        print('***')
    9584        return output
Note: See TracChangeset for help on using the changeset viewer.