Changeset 2201


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

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

Files:
61 edited

Legend:

Unmodified
Added
Removed
  • coopr.colin/trunk/coopr/colin/__init__.py

    r2183 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
     11import pyutilib.component.core
    1212
    13 pyutilib.plugin.core.PluginGlobals.push_env( 'coopr.colin' )
     13pyutilib.component.core.PluginGlobals.push_env( 'coopr.colin' )
    1414
    1515from core import *
    1616import solver
    1717
    18 pyutilib.plugin.core.PluginGlobals.pop_env()
     18pyutilib.component.core.PluginGlobals.pop_env()
    1919
    2020
  • coopr.colin/trunk/coopr/colin/core/colin_xml_io.py

    r2190 r2201  
    1313"""
    1414
    15 from pyutilib.plugin.core import *
     15from pyutilib.component.core import *
    1616from problem_io import *
    1717import xml.dom.minidom
  • coopr.colin/trunk/coopr/colin/core/dakota_text_io.py

    r2190 r2201  
    1818
    1919import re
    20 from pyutilib.plugin.core import *
     20from pyutilib.component.core import *
    2121from problem_io import *
    2222from pyutilib.math import as_number
  • coopr.colin/trunk/coopr/colin/core/problem.py

    r2190 r2201  
    2222from pyutilib.enum import Enum
    2323from problem_io import IOptProblemIO
    24 from pyutilib.plugin.core import *
     24from pyutilib.component.core import *
    2525
    2626
  • coopr.colin/trunk/coopr/colin/core/problem_io.py

    r2188 r2201  
    1313"""
    1414
    15 from pyutilib.plugin.core import *
     15from pyutilib.component.core import *
    1616
    1717class IOptProblemIO(Interface):
  • coopr.colin/trunk/coopr/colin/tests/core/test_parallel.py

    r2183 r2201  
    1919from coopr.opt import ResultsFormat, ProblemFormat
    2020import pyutilib.th
    21 import pyutilib.plugin.core
     21import pyutilib.component.core
    2222import pyutilib.services
    2323
     
    202202        Testing methods in the solverwriter factory registration process
    203203        """
    204         ep = pyutilib.plugin.core.ExtensionPoint(coopr.opt.parallel.solver.ISolverManagerRegistration)
     204        ep = pyutilib.component.core.ExtensionPoint(coopr.opt.parallel.solver.ISolverManagerRegistration)
    205205        service = ep.service("smtest")
    206206        self.failUnlessEqual(service.type(), "smtest")
  • coopr.opt/trunk/coopr/opt/__init__.py

    r2182 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
     11import pyutilib.component.core
    1212
    13 pyutilib.plugin.core.PluginGlobals.push_env( 'coopr.opt' )
     13pyutilib.component.core.PluginGlobals.push_env( 'coopr.opt' )
    1414
    1515from base import *
     
    1919from parallel import *
    2020
    21 pyutilib.plugin.core.PluginGlobals.pop_env()
     21pyutilib.component.core.PluginGlobals.pop_env()
    2222
    2323
  • coopr.opt/trunk/coopr/opt/base/convert.py

    r1794 r2201  
    1515from formats import ProblemFormat
    1616from error import *
    17 from pyutilib.plugin.core import *
     17from pyutilib.component.core import *
    1818
    1919
  • coopr.opt/trunk/coopr/opt/base/problem.py

    r1897 r2201  
    1313            'WriterFactory' ]
    1414
    15 from pyutilib.plugin.core import *
    16 from pyutilib.plugin.config import *
     15from pyutilib.component.core import *
     16from pyutilib.component.config import *
    1717
    1818
  • coopr.opt/trunk/coopr/opt/base/results.py

    r1897 r2201  
    1313            'ReaderFactory' ]
    1414
    15 from pyutilib.plugin.core import *
    16 from pyutilib.plugin.config import *
     15from pyutilib.component.core import *
     16from pyutilib.component.config import *
    1717
    1818
  • coopr.opt/trunk/coopr/opt/base/solver.py

    r2167 r2201  
    2020
    2121from pyutilib.enum import Enum
    22 from pyutilib.plugin.core import *
    23 from pyutilib.plugin.config import *
     22from pyutilib.component.core import *
     23from pyutilib.component.config import *
    2424import pyutilib.common
    2525import pyutilib.misc
  • coopr.opt/trunk/coopr/opt/parallel/__init__.py

    r1768 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
     11import pyutilib.component.core
    1212
    13 pyutilib.plugin.core.PluginGlobals.push_env( "coopr.opt" )
     13pyutilib.component.core.PluginGlobals.push_env( "coopr.opt" )
    1414
    1515from solver import *
     
    1717import local
    1818
    19 pyutilib.plugin.core.PluginGlobals.pop_env()
     19pyutilib.component.core.PluginGlobals.pop_env()
  • coopr.opt/trunk/coopr/opt/parallel/solver.py

    r1768 r2201  
    1212__all__ = ['AsynchronousSolverManager', 'SolverManagerRegistration', 'SolverManagerFactory']
    1313
    14 import pyutilib.plugin.core
    15 import pyutilib.plugin.config
     14import pyutilib.component.core
     15import pyutilib.component.config
    1616from manager import *
    1717
     
    2020# An interface for AsynchronousSolverManager objects
    2121#
    22 class ISolverManager(pyutilib.plugin.core.Interface):
     22class ISolverManager(pyutilib.component.core.Interface):
    2323    pass
    2424
    2525
    26 class ISolverManagerRegistration(pyutilib.plugin.core.Interface):
     26class ISolverManagerRegistration(pyutilib.component.core.Interface):
    2727
    2828    def create(self, name=None):
     
    3434
    3535def SolverManagerFactory(name=None, instance_name=None):
    36     ep = pyutilib.plugin.core.ExtensionPoint(ISolverManagerRegistration)
     36    ep = pyutilib.component.core.ExtensionPoint(ISolverManagerRegistration)
    3737    if name is None:
    3838        return map(lambda x:x.name, ep())
     
    4343
    4444
    45 class SolverManagerRegistration(pyutilib.plugin.core.Plugin):
     45class SolverManagerRegistration(pyutilib.component.core.Plugin):
    4646
    47     pyutilib.plugin.core.implements(ISolverManagerRegistration)
     47    pyutilib.component.core.implements(ISolverManagerRegistration)
    4848
    4949    def __init__(self, type, cls):
     
    6262
    6363
    64 class AsynchronousSolverManager(AsynchronousActionManager, pyutilib.plugin.config.ManagedPlugin):
     64class AsynchronousSolverManager(AsynchronousActionManager, pyutilib.component.config.ManagedPlugin):
    6565
    66     pyutilib.plugin.core.implements(ISolverManager)
     66    pyutilib.component.core.implements(ISolverManager)
    6767
    6868    def __init__(self, **kwds):
    6969        AsynchronousActionManager.__init__(self)
    70         pyutilib.plugin.config.ManagedPlugin.__init__(self, **kwds)
     70        pyutilib.component.config.ManagedPlugin.__init__(self, **kwds)
    7171
    7272    def solve(self, *args, **kwds):
  • coopr.opt/trunk/coopr/opt/solver/shellcmd.py

    r2167 r2201  
    2121import pyutilib.services
    2222import pyutilib.subprocess
    23 import pyutilib.plugin.core
     23import pyutilib.component.core
    2424import pyutilib.misc
    2525
     
    115115        # Execute the command
    116116        #
    117         pyutilib.plugin.core.PluginGlobals.env("coopr.opt").log.debug("Running "+self._command.cmd)
     117        pyutilib.component.core.PluginGlobals.env("coopr.opt").log.debug("Running "+self._command.cmd)
    118118
    119119        # display the log/solver file names prior to execution. this is useful
  • coopr.opt/trunk/coopr/opt/tests/base/test_config.py

    r1768 r2201  
    1515import coopr.opt
    1616import pyutilib.services
    17 import pyutilib.plugin.app
     17import pyutilib.component.app
    1818import pyutilib.misc
    1919
     
    3232        Read in config file opt1.cfg
    3333        """
    34         app = pyutilib.plugin.app.SimpleApplication("testapp")
    35         #pyutilib.plugin.PluginGlobals.pprint()
     34        app = pyutilib.component.app.SimpleApplication("testapp")
     35        #pyutilib.component.PluginGlobals.pprint()
    3636        #app.config.summarize()
    3737        app.save_configuration(currdir+"opt1-out.cfg")
  • coopr.opt/trunk/coopr/opt/tests/base/test_convert.py

    r1768 r2201  
    1919import pyutilib.th
    2020import pyutilib.services
    21 import pyutilib.plugin.config
    22 import pyutilib.plugin.core
     21import pyutilib.component.config
     22import pyutilib.component.core
    2323import pyutilib.common
    2424import xml
     
    7979        # Reset all options
    8080        #
    81         for ep in pyutilib.plugin.core.ExtensionPoint(pyutilib.plugin.config.IOption):
     81        for ep in pyutilib.component.core.ExtensionPoint(pyutilib.component.config.IOption):
    8282            ep.reset()
    8383
  • coopr.opt/trunk/coopr/opt/tests/base/test_factory.py

    r1938 r2201  
    1616import coopr
    1717import pyutilib.services
    18 import pyutilib.plugin.core
     18import pyutilib.component.core
    1919
    2020
     
    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("stest")
    9090        self.failUnlessEqual(service.type(), "stest")
     
    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")
  • 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")
  • coopr.pyomo/trunk/coopr/pyomo/__init__.py

    r2054 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
     11import pyutilib.component.core
    1212
    1313
    14 pyutilib.plugin.core.PluginGlobals.push_env( 'coopr.pyomo' )
     14pyutilib.component.core.PluginGlobals.push_env( 'coopr.pyomo' )
    1515
    1616from base import *
     
    2323import transform
    2424
    25 pyutilib.plugin.core.PluginGlobals.pop_env()
     25pyutilib.component.core.PluginGlobals.pop_env()
    2626
    2727
  • coopr.pyomo/trunk/coopr/pyomo/base/PyomoModel.py

    r2166 r2201  
    1616from numvalue import *
    1717
    18 import pyutilib.plugin.core
     18import pyutilib.component.core
    1919from pyutilib.math import *
    2020from pyutilib.misc import quote_split, tuplize, Container
     
    3939    """
    4040
    41     presolver_ep = pyutilib.plugin.core.ExtensionPoint(IPyomoPresolver)
     41    presolver_ep = pyutilib.component.core.ExtensionPoint(IPyomoPresolver)
    4242
    4343
     
    4949        #
    5050        self._component={}
    51         for item in pyutilib.plugin.core.ExtensionPoint(IModelComponent):
     51        for item in pyutilib.component.core.ExtensionPoint(IModelComponent):
    5252            self._component[ item.cls() ] = {}
    5353        #
     
    469469        #
    470470        items = [Set, RangeSet, Param, Var, Objective, Constraint]
    471         for item in pyutilib.plugin.core.ExtensionPoint(IModelComponent):
     471        for item in pyutilib.component.core.ExtensionPoint(IModelComponent):
    472472            if not item in items:
    473473                items.append(item)
  • coopr.pyomo/trunk/coopr/pyomo/base/expr.py

    r1975 r2201  
    1414
    1515from plugin import *
    16 from pyutilib.plugin.core import *
     16from pyutilib.component.core import *
    1717from numvalue import *
    1818from param import _ParamBase
  • coopr.pyomo/trunk/coopr/pyomo/base/numvalue.py

    r2052 r2201  
    1212
    1313import plugin
    14 #import pyutilib.plugin.core
     14#import pyutilib.component.core
    1515import pyutilib.math
    1616import sys
  • coopr.pyomo/trunk/coopr/pyomo/base/plugin.py

    r2002 r2201  
    1616        'apply_transformation']
    1717
    18 from pyutilib.plugin.core import *
     18from pyutilib.component.core import *
    1919
    2020
  • coopr.pyomo/trunk/coopr/pyomo/base/pyomo.py

    r2147 r2201  
    1010
    1111from pyutilib.enum import Enum
    12 import pyutilib.plugin.core
     12import pyutilib.component.core
    1313from plugin import *
    1414
     
    5656
    5757def model_components():
    58     ep = pyutilib.plugin.core.ExtensionPoint(IModelComponent)
     58    ep = pyutilib.component.core.ExtensionPoint(IModelComponent)
    5959    ans = []
    6060    for item in ep:
  • coopr.pyomo/trunk/coopr/pyomo/base/set_types.py

    r2005 r2201  
    1111__all__ = ['_VirtualSet', '_AnySet', 'RealSet', 'IntegerSet', 'BooleanSet', 'Any', 'Reals', 'PositiveReals', 'NonPositiveReals', 'NegativeReals', 'NonNegativeReals', 'PercentFraction', 'Integers', 'PositiveIntegers', 'NonPositiveIntegers', 'NegativeIntegers', 'NonNegativeIntegers', 'Boolean', 'Binary']
    1212
    13 import pyutilib.plugin.core
     13import pyutilib.component.core
    1414import sets
    1515from coopr.pyomo.base.plugin import *
     
    1818_virtual_sets = []
    1919
    20 class _VirtualSet(sets._SetContainer, pyutilib.plugin.core.Plugin):
     20class _VirtualSet(sets._SetContainer, pyutilib.component.core.Plugin):
    2121    """
    2222    A set that does not contain elements, but instead overrides the
     
    2424    """
    2525
    26     pyutilib.plugin.core.implements(IPyomoSet)
     26    pyutilib.component.core.implements(IPyomoSet)
    2727
    2828    def __init__(self,*args,**kwds):
    2929        if "name" in kwds:
    30             pyutilib.plugin.core.Plugin.__init__(self,name=kwds["name"])
     30            pyutilib.component.core.Plugin.__init__(self,name=kwds["name"])
    3131        else:
    32             pyutilib.plugin.core.Plugin.__init__(self)
     32            pyutilib.component.core.Plugin.__init__(self)
    3333        self._class_override=False
    3434        sets._SetContainer.__init__(self,*args,**kwds)
  • coopr.pyomo/trunk/coopr/pyomo/base/sets.py

    r2128 r2201  
    1111__all__ = ['Set', '_BaseSet', '_SetContainer', '_SetArray', '_ProductSet', 'set_options']
    1212
    13 import pyutilib.plugin.core
     13import pyutilib.component.core
    1414from coopr.pyomo.base.plugin import ComponentRegistration
    1515from component import Component
     
    1919import copy
    2020
    21 log = pyutilib.plugin.core.PluginGlobals.env().log
     21log = pyutilib.component.core.PluginGlobals.env().log
    2222
    2323#
  • coopr.pyomo/trunk/coopr/pyomo/expr/canonical_repn.py

    r2170 r2201  
    1111__all__ = ['generate_canonical_repn', 'as_expr', 'is_constant', 'is_linear', 'is_quadratic', 'is_nonlinear']
    1212
    13 import pyutilib.plugin.core
     13#import pyutilib.component.core
    1414from coopr.pyomo.base import IPyomoPresolver, IPyomoPresolveAction, Model
    1515from coopr.pyomo.base import expr
  • coopr.pyomo/trunk/coopr/pyomo/presolve/collect_linear_terms.py

    r2163 r2201  
    1010
    1111
    12 import pyutilib.plugin.core
     12import pyutilib.component.core
    1313from coopr.pyomo.base import expr, Var, Constraint, Objective
    1414from coopr.pyomo.base.numvalue import NumericConstant
     
    2020
    2121
    22 class CollectLinearTerms(pyutilib.plugin.core.SingletonPlugin):
     22class CollectLinearTerms(pyutilib.component.core.SingletonPlugin):
    2323    """
    2424    This plugin processes a Pyomo Model instance to collect
     
    2626    """
    2727
    28     pyutilib.plugin.core.implements(IPyomoPresolveAction)
     28    pyutilib.component.core.implements(IPyomoPresolveAction)
    2929
    3030    def __init__(self, **kwds):
    3131        kwds['name'] = "collect_linear_terms"
    32         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
     32        pyutilib.component.core.Plugin.__init__(self, **kwds)
    3333
    3434    def rank(self):
  • coopr.pyomo/trunk/coopr/pyomo/presolve/compute_canonical_repn.py

    r2170 r2201  
    1313#
    1414
    15 import pyutilib.plugin.core
     15import pyutilib.component.core
    1616from coopr.pyomo.base import Constraint, Objective
    1717from coopr.pyomo.base import IPyomoPresolver, IPyomoPresolveAction
     
    1919
    2020
    21 class ComputeCanonicalRepn(pyutilib.plugin.core.SingletonPlugin):
     21class ComputeCanonicalRepn(pyutilib.component.core.SingletonPlugin):
    2222    """
    2323    This plugin computes the canonical representation for
     
    2626    """
    2727
    28     pyutilib.plugin.core.implements(IPyomoPresolveAction)
     28    pyutilib.component.core.implements(IPyomoPresolveAction)
    2929
    3030    def __init__(self, **kwds):
    3131        kwds['name'] = "compute_canonical_repn"
    32         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
     32        pyutilib.component.core.Plugin.__init__(self, **kwds)
    3333
    3434    def rank(self):
  • coopr.pyomo/trunk/coopr/pyomo/presolve/generic_varlabels.py

    r2096 r2201  
    1010
    1111from coopr.pyomo.base import IPyomoPresolver, IPyomoPresolveAction, Var, Constraint, Objective
    12 import pyutilib.plugin.core
     12import pyutilib.component.core
    1313
    1414ignore = set(['"', "'", '`'])
     
    4444remap['~']='_Q126_'
    4545
    46 class GenericVarLabelsPresolver(pyutilib.plugin.core.SingletonPlugin):
     46class GenericVarLabelsPresolver(pyutilib.component.core.SingletonPlugin):
    4747    """
    4848    This plugin changes variables names to generate a label that
     
    5050    """
    5151
    52     pyutilib.plugin.core.implements(IPyomoPresolveAction)
     52    pyutilib.component.core.implements(IPyomoPresolveAction)
    5353
    5454    def __init__(self, **kwds):
    5555        kwds['name'] = "generic_varlabels"
    56         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
     56        pyutilib.component.core.Plugin.__init__(self, **kwds)
    5757
    5858    def rank(self):
  • coopr.pyomo/trunk/coopr/pyomo/presolve/identify_vars.py

    r2064 r2201  
    1010
    1111
    12 import pyutilib.plugin.core
     12import pyutilib.component.core
    1313from coopr.pyomo.base import expr, _VarBase, Var, Constraint, Objective
    1414from coopr.pyomo.base.var import _VarValue, VarStatus
     
    1717
    1818
    19 class IdentifyVariablesPresolver(pyutilib.plugin.core.SingletonPlugin):
     19class IdentifyVariablesPresolver(pyutilib.component.core.SingletonPlugin):
    2020    """
    2121    This plugin processes a Pyomo Model instance to define
     
    2323    """
    2424
    25     pyutilib.plugin.core.implements(IPyomoPresolveAction)
     25    pyutilib.component.core.implements(IPyomoPresolveAction)
    2626
    2727    def __init__(self, **kwds):
    2828        kwds['name'] = "identify_variables"
    29         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
     29        pyutilib.component.core.Plugin.__init__(self, **kwds)
    3030
    3131    def rank(self):
  • coopr.pyomo/trunk/coopr/pyomo/presolve/numeric_varlabels.py

    r1768 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
     11import pyutilib.component.core
    1212from coopr.pyomo.base import IPyomoPresolver, IPyomoPresolveAction
    1313
    1414
    15 class NumericVarLabelsPresolver(pyutilib.plugin.core.SingletonPlugin):
     15class NumericVarLabelsPresolver(pyutilib.component.core.SingletonPlugin):
    1616    """
    1717    This plugin changes variables names to use a simple name that
     
    1919    """
    2020
    21     pyutilib.plugin.core.implements(IPyomoPresolveAction)
     21    pyutilib.component.core.implements(IPyomoPresolveAction)
    2222
    2323    def __init__(self, **kwds):
    2424        kwds['name'] = "numeric_varlabels"
    25         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
     25        pyutilib.component.core.Plugin.__init__(self, **kwds)
    2626
    2727    def rank(self):
  • coopr.pyomo/trunk/coopr/pyomo/presolve/simple_presolver.py

    r2170 r2201  
    1010
    1111import pyutilib.misc
    12 import pyutilib.plugin.core
     12import pyutilib.component.core
    1313from coopr.pyomo.base import IPyomoPresolver, IPyomoPresolveAction
    1414
    1515
    16 class SimplePresolver(pyutilib.plugin.core.SingletonPlugin):
     16class SimplePresolver(pyutilib.component.core.SingletonPlugin):
    1717    """
    1818    This plugin simply applies presolve actions in a fixed order
     
    2020    """
    2121
    22     pyutilib.plugin.core.implements(IPyomoPresolver)
     22    pyutilib.component.core.implements(IPyomoPresolver)
    2323
    2424    def __init__(self, **kwds):
    2525        kwds['name'] = "simple_presolver"
    26         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
    27         self.actions = pyutilib.plugin.core.ExtensionPoint(IPyomoPresolveAction)
     26        pyutilib.component.core.Plugin.__init__(self, **kwds)
     27        self.actions = pyutilib.component.core.ExtensionPoint(IPyomoPresolveAction)
    2828        self.active_actions = set()
    2929        self.action_rank = {}
  • coopr.pyomo/trunk/coopr/pyomo/tests/expr/test_canonical.py

    r2170 r2201  
    1616import pyutilib.services
    1717from coopr.pyomo.presolve.simple_presolver import SimplePresolver
    18 from pyutilib.plugin.core import PluginGlobals
     18from pyutilib.component.core import PluginGlobals
    1919
    2020class frozendict(dict):
  • coopr.pyomo/trunk/coopr/pyomo/tests/unit/test_transform.py

    r2002 r2201  
    1414import pyutilib.th
    1515import pyutilib.services
    16 from pyutilib.plugin.core import Plugin
     16from pyutilib.component.core import Plugin
    1717
    1818class Test(pyutilib.th.TestCase):
  • coopr.pyomo/trunk/coopr/pyomo/transform/eliminate_fixed_vars.py

    r2108 r2201  
    88#  _________________________________________________________________________
    99
    10 import pyutilib.plugin.core
     10import pyutilib.component.core
    1111from coopr.pyomo.base import IModelTransformation
    1212from coopr.pyomo import Constraint, Objective, NumericConstant, Expression
     
    1515
    1616
    17 class EliminateFixedVars(pyutilib.plugin.core.SingletonPlugin):
     17class EliminateFixedVars(pyutilib.component.core.SingletonPlugin):
    1818    """
    1919    This plugin relaxes integrality in a Pyomo model.
    2020    """
    2121
    22     pyutilib.plugin.core.implements(IModelTransformation)
     22    pyutilib.component.core.implements(IModelTransformation)
    2323
    2424    def __init__(self, **kwds):
    2525        kwds['name'] = "eliminate_fixed_vars"
    26         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
     26        pyutilib.component.core.Plugin.__init__(self, **kwds)
    2727
    2828    def apply(self, model, **kwds):
  • coopr.pyomo/trunk/coopr/pyomo/transform/relax_integrality.py

    r2097 r2201  
    88#  _________________________________________________________________________
    99
    10 import pyutilib.plugin.core
     10import pyutilib.component.core
    1111from coopr.pyomo.base import IModelTransformation
    1212from coopr.pyomo.base import Var
     
    1414
    1515
    16 class RelaxIntegrality(pyutilib.plugin.core.SingletonPlugin):
     16class RelaxIntegrality(pyutilib.component.core.SingletonPlugin):
    1717    """
    1818    This plugin relaxes integrality in a Pyomo model.
    1919    """
    2020
    21     pyutilib.plugin.core.implements(IModelTransformation)
     21    pyutilib.component.core.implements(IModelTransformation)
    2222
    2323    def __init__(self, **kwds):
    2424        kwds['name'] = "relax_integrality"
    25         pyutilib.plugin.core.Plugin.__init__(self, **kwds)
     25        pyutilib.component.core.Plugin.__init__(self, **kwds)
    2626
    2727    def apply(self, model, **kwds):
  • coopr.pyomo/trunk/examples/pyomo/p-median/solver1.py

    r2107 r2201  
    11# Imports from Coopr and PyUtilib
    22from coopr.pyomo import *
    3 from pyutilib.plugin.core import *
     3from pyutilib.component.core import *
    44from coopr.opt import *
    55
  • coopr.pyomo/trunk/examples/pyomo/p-median/solver2.py

    r2107 r2201  
    11# Imports from Coopr and PyUtilib
    22from coopr.pyomo import *
    3 from pyutilib.plugin.core import *
     3from pyutilib.component.core import *
    44from coopr.opt import *
    55import random
  • coopr.pysp/trunk/coopr/pysp/__init__.py

    r1768 r2201  
    99#  _________________________________________________________________________
    1010
    11 import pyutilib.plugin.core
     11import pyutilib.component.core
    1212
    13 pyutilib.plugin.core.PluginGlobals.push_env( "coopr.pysp" )
     13pyutilib.component.core.PluginGlobals.push_env( "coopr.pysp" )
    1414
    1515from scenariotree import *
     
    2222from ph_script import *
    2323
    24 pyutilib.plugin.core.PluginGlobals.pop_env()
     24pyutilib.component.core.PluginGlobals.pop_env()
    2525
    2626
  • coopr.pysp/trunk/coopr/pysp/asynchph.py

    r1998 r2201  
    1010
    1111import sys
    12 import pyutilib.plugin.core
     12import pyutilib.component.core
    1313import types
    1414from coopr.pyomo import *
     
    2626from phutils import *
    2727
    28 from pyutilib.plugin.core import ExtensionPoint
     28from pyutilib.component.core import ExtensionPoint
    2929
    3030from coopr.pysp.phextension import IPHExtension
  • coopr.pysp/trunk/coopr/pysp/ph.py

    r2200 r2201  
    2828from phutils import *
    2929
    30 from pyutilib.plugin.core import ExtensionPoint
     30from pyutilib.component.core import ExtensionPoint
    3131
    3232from coopr.pysp.phextension import IPHExtension
  • coopr.pysp/trunk/coopr/pysp/phextension.py

    r1768 r2201  
    1111__all__ = ['IPHExtension']
    1212
    13 from pyutilib.plugin.core import *
     13from pyutilib.component.core import *
    1414
    1515class IPHExtension(Interface):
  • coopr.pysp/trunk/coopr/pysp/testphextension.py

    r2131 r2201  
    99#  _________________________________________________________________________
    1010
    11 from pyutilib.plugin.core import *
     11from pyutilib.component.core import *
    1212from coopr.pysp import phextension
    1313
  • coopr.pysp/trunk/coopr/pysp/wwphextension.py

    r2158 r2201  
    1010
    1111import types
    12 from pyutilib.plugin.core import *
     12from pyutilib.component.core import *
    1313from coopr.pysp import phextension
    1414from coopr.pysp.phutils import *
  • vpy/all.ini

    r2185 r2201  
    7575dev=True
    7676
    77 [pyutilib.plugin.core]
    78 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.core
     77[pyutilib.component.core]
     78root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.core
    7979dev=True
    8080
    81 [pyutilib.plugin.config]
    82 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.config
     81[pyutilib.component.config]
     82root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.config
    8383dev=True
    8484
    85 [pyutilib.plugin.executables]
    86 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.executables
     85[pyutilib.component.executables]
     86root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.executables
    8787dev=True
    8888
    89 [pyutilib.plugin.app]
    90 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.app
     89[pyutilib.component.app]
     90root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.app
    9191dev=True
    9292
    93 [pyutilib.plugin.loader]
    94 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.loader
     93[pyutilib.component.loader]
     94root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.loader
    9595dev=True
    9696
  • vpy/dev.ini

    r2185 r2201  
    7878dev=True
    7979
    80 [pyutilib.plugin.core]
    81 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.core
     80[pyutilib.component.core]
     81root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.core
    8282dev=True
    8383
    84 [pyutilib.plugin.config]
    85 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.config
     84[pyutilib.component.config]
     85root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.config
    8686dev=True
    8787
    88 [pyutilib.plugin.executables]
    89 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.executables
     88[pyutilib.component.executables]
     89root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.executables
    9090dev=True
    9191
    92 [pyutilib.plugin.app]
    93 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.app
     92[pyutilib.component.app]
     93root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.app
    9494dev=True
    9595
    96 [pyutilib.plugin.loader]
    97 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.loader
     96[pyutilib.component.loader]
     97root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.loader
    9898dev=True
    9999
  • vpy/installer.ini

    r2185 r2201  
    7979dev=True
    8080
    81 [pyutilib.plugin.core]
    82 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.core
     81[pyutilib.component.core]
     82root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.core
    8383dev=True
    8484
    85 [pyutilib.plugin.config]
    86 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.config
     85[pyutilib.component.config]
     86root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.config
    8787dev=True
    8888
    89 [pyutilib.plugin.executables]
    90 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.executables
     89[pyutilib.component.executables]
     90root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.executables
    9191dev=True
    9292
    93 [pyutilib.plugin.app]
    94 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.app
     93[pyutilib.component.app]
     94root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.app
    9595dev=True
    9696
    97 [pyutilib.plugin.loader]
    98 root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.plugin.loader
     97[pyutilib.component.loader]
     98root=https://software.sandia.gov/svn/public/pyutilib/pyutilib.component.loader
    9999dev=True
    100100
Note: See TracChangeset for help on using the changeset viewer.