Changeset 2205


Ignore:
Timestamp:
Jan 30, 2010 12:38:52 AM (10 years ago)
Author:
wehart
Message:

Merged revisions 2196-2204 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.opt/trunk

........

r2201 | wehart | 2010-01-29 17:38:14 -0700 (Fri, 29 Jan 2010) | 2 lines


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

........

Location:
coopr.opt/stable/2.2
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • coopr.opt/stable/2.2

  • coopr.opt/stable/2.2/coopr/opt/__init__.py

    r2196 r2205  
    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/stable/2.2/coopr/opt/base/convert.py

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

    r1897 r2205  
    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/stable/2.2/coopr/opt/base/results.py

    r1897 r2205  
    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/stable/2.2/coopr/opt/base/solver.py

    r2196 r2205  
    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/stable/2.2/coopr/opt/parallel/__init__.py

    r1768 r2205  
    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/stable/2.2/coopr/opt/parallel/solver.py

    r1768 r2205  
    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/stable/2.2/coopr/opt/solver/shellcmd.py

    r2196 r2205  
    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/stable/2.2/coopr/opt/tests/base/test_config.py

    r1768 r2205  
    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/stable/2.2/coopr/opt/tests/base/test_convert.py

    r1768 r2205  
    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/stable/2.2/coopr/opt/tests/base/test_factory.py

    r1938 r2205  
    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")
Note: See TracChangeset for help on using the changeset viewer.