Changeset 2201 for coopr.plugins/trunk


Ignore:
Timestamp:
Jan 29, 2010 7:38:14 PM (9 years ago)
Author:
wehart
Message:

Update to Coopr to account for changes in PyUtilib? package names.

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

Legend:

Unmodified
Added
Removed
  • coopr.plugins/trunk/coopr/plugins/converter/__init__.py

    r1768 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
    12 pyutilib.plugin.core.PluginGlobals.push_env( 'coopr.opt' )
     11import pyutilib.component.core
     12pyutilib.component.core.PluginGlobals.push_env( 'coopr.opt' )
    1313
    1414import glpsol
     
    1616import pyomo
    1717
    18 pyutilib.plugin.core.PluginGlobals.pop_env()
     18pyutilib.component.core.PluginGlobals.pop_env()
  • coopr.plugins/trunk/coopr/plugins/converter/glpsol.py

    r1772 r2201  
    1313from coopr.opt.base import *
    1414
    15 from pyutilib.plugin.core import *
    16 from pyutilib.plugin.config import *
    17 from pyutilib.plugin.executables import *
     15from pyutilib.component.core import *
     16from pyutilib.component.config import *
     17from pyutilib.component.executables import *
    1818import pyutilib.subprocess
    1919import pyutilib.common
  • coopr.plugins/trunk/coopr/plugins/converter/pico.py

    r1794 r2201  
    1313from coopr.opt.base import *
    1414
    15 from pyutilib.plugin.core import *
    16 from pyutilib.plugin.config import *
    17 from pyutilib.plugin.executables import *
     15from pyutilib.component.core import *
     16from pyutilib.component.config import *
     17from pyutilib.component.executables import *
    1818import pyutilib.services
    1919import pyutilib.common
  • coopr.plugins/trunk/coopr/plugins/converter/pyomo.py

    r1794 r2201  
    1515from pico import PicoMIPConverter
    1616
    17 from pyutilib.plugin.core import *
    18 from pyutilib.plugin.config import *
    19 from pyutilib.plugin.executables import *
     17from pyutilib.component.core import *
     18from pyutilib.component.config import *
     19from pyutilib.component.executables import *
    2020import pyutilib.services
    2121
  • coopr.plugins/trunk/coopr/plugins/mip/CBC.py

    r2048 r2201  
    1818import pyutilib.misc
    1919import pyutilib.common
    20 import pyutilib.plugin.core
     20import pyutilib.component.core
    2121import mockmip
    2222
     
    6969        executable = pyutilib.services.registered_executable("cbc")
    7070        if executable is None:
    71             pyutilib.plugin.core.PluginGlobals.env().log.error("Could not locate the 'cbc' executable, which is required for solver %s" % self.name)
     71            pyutilib.component.core.PluginGlobals.env().log.error("Could not locate the 'cbc' executable, which is required for solver %s" % self.name)
    7272            self.enable = False
    7373            return None
  • coopr.plugins/trunk/coopr/plugins/mip/CPLEX.py

    r2168 r2201  
    2020import pyutilib.common
    2121import pyutilib.misc
    22 import pyutilib.plugin.core
     22import pyutilib.component.core
    2323import string
    2424import re
     
    167167        executable = pyutilib.services.registered_executable("cplex")
    168168        if executable is None:
    169             pyutilib.plugin.core.PluginGlobals.env().log.error("Could not locate the 'cplex' executable, which is required for solver %s" % self.name)
     169            pyutilib.component.core.PluginGlobals.env().log.error("Could not locate the 'cplex' executable, which is required for solver %s" % self.name)
    170170            self.enable = False
    171171            return None
  • coopr.plugins/trunk/coopr/plugins/mip/GLPK.py

    r2048 r2201  
    1919import pyutilib.misc
    2020import pyutilib.common
    21 import pyutilib.plugin.core
     21import pyutilib.component.core
    2222
    2323
     
    4444        executable = pyutilib.services.registered_executable("glpsol")
    4545        if executable is None:
    46             pyutilib.plugin.core.PluginGlobals.env().log.error("Could not locate the 'glpsol' executable, which is required for solver %s" % self.name)
     46            pyutilib.component.core.PluginGlobals.env().log.error("Could not locate the 'glpsol' executable, which is required for solver %s" % self.name)
    4747            self.enable = False
    4848            return None
  • coopr.plugins/trunk/coopr/plugins/mip/NLOPT.py

    r2187 r2201  
    1717import pyutilib.common
    1818import pyutilib.common
    19 import pyutilib.plugin.core
     19import pyutilib.component.core
    2020import mockmip
    2121import os
     
    4343        executable = pyutilib.services.registered_executable(options.solver)
    4444        if executable is None:
    45             pyutilib.plugin.core.PluginGlobals.env().log.error("Could not locate the '%s' executable, which is required for solver %s" % (self.name, options.solver))
     45            pyutilib.component.core.PluginGlobals.env().log.error("Could not locate the '%s' executable, which is required for solver %s" % (self.name, options.solver))
    4646            self.enable = False
    4747            return None
  • coopr.plugins/trunk/coopr/plugins/mip/PICO.py

    r2048 r2201  
    1717import pyutilib.common
    1818import pyutilib.common
    19 import pyutilib.plugin.core
     19import pyutilib.component.core
    2020import mockmip
    2121import os
     
    4545        executable = pyutilib.services.registered_executable("PICO")
    4646        if executable is None:
    47             pyutilib.plugin.core.PluginGlobals.env().log.error("Could not locate the 'PICO' executable, which is required for solver %s" % self.name)
     47            pyutilib.component.core.PluginGlobals.env().log.error("Could not locate the 'PICO' executable, which is required for solver %s" % self.name)
    4848            self.enable = False
    4949            return None
  • coopr.plugins/trunk/coopr/plugins/mip/__init__.py

    r2187 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
    12 pyutilib.plugin.core.PluginGlobals.push_env( 'coopr.opt' )
     11import pyutilib.component.core
     12pyutilib.component.core.PluginGlobals.push_env( 'coopr.opt' )
    1313
    1414from PICO import PICO, MockPICO
     
    1919#from NLWRITE import NLWRITE
    2020
    21 pyutilib.plugin.core.PluginGlobals.pop_env()
     21pyutilib.component.core.PluginGlobals.pop_env()
  • coopr.plugins/trunk/coopr/plugins/smanager/__init__.py

    r1768 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
    12 pyutilib.plugin.core.PluginGlobals.push_env( 'coopr.opt' )
     11import pyutilib.component.core
     12pyutilib.component.core.PluginGlobals.push_env( 'coopr.opt' )
    1313
    1414import pyro
    1515
    16 pyutilib.plugin.core.PluginGlobals.pop_env()
     16pyutilib.component.core.PluginGlobals.pop_env()
  • coopr.plugins/trunk/coopr/plugins/smanager/pyro.py

    r2042 r2201  
    1313
    1414import pyutilib.misc
    15 import pyutilib.plugin.core
     15import pyutilib.component.core
    1616from coopr.opt.parallel.manager import *
    1717from coopr.opt.parallel.solver import *
  • coopr.plugins/trunk/coopr/plugins/tests/mip/test_convert.py

    r1794 r2201  
    2020import pyutilib.services
    2121import pyutilib.common
    22 import pyutilib.plugin.core
    23 import pyutilib.plugin.config
     22import pyutilib.component.core
     23import pyutilib.component.config
    2424import xml
    2525import filecmp
     
    8181        # Reset all options
    8282        #
    83         for ep in pyutilib.plugin.core.ExtensionPoint(pyutilib.plugin.config.IOption):
     83        for ep in pyutilib.component.core.ExtensionPoint(pyutilib.component.config.IOption):
    8484            ep.reset()
    8585
  • coopr.plugins/trunk/coopr/plugins/tests/mip/test_factory.py

    r1939 r2201  
    1717import coopr
    1818import pyutilib.services
    19 import pyutilib.plugin.core
     19import pyutilib.component.core
    2020
    2121
     
    8686        Testing methods in the solverwriter factory registration process
    8787        """
    88         ep = pyutilib.plugin.core.ExtensionPoint(coopr.opt.ISolverRegistration)
     88        ep = pyutilib.component.core.ExtensionPoint(coopr.opt.ISolverRegistration)
    8989        service = ep.service("_mock_pico")
    9090        self.failUnlessEqual(service.type(), "_mock_pico")
     
    116116        Testing methods in the writer factory registration process
    117117        """
    118         ep = pyutilib.plugin.core.ExtensionPoint(coopr.opt.IWriterRegistration)
     118        ep = pyutilib.component.core.ExtensionPoint(coopr.opt.IWriterRegistration)
    119119        service = ep.service("wtest")
    120120        self.failUnlessEqual(service.type(), "wtest")
     
    145145        Testing methods in the reader factory registration process
    146146        """
    147         ep = pyutilib.plugin.core.ExtensionPoint(coopr.opt.IReaderRegistration)
     147        ep = pyutilib.component.core.ExtensionPoint(coopr.opt.IReaderRegistration)
    148148        service = ep.service("rtest")
    149149        self.failUnlessEqual(service.type(), "rtest")
Note: See TracChangeset for help on using the changeset viewer.