Changeset 2183


Ignore:
Timestamp:
Jan 27, 2010 5:50:18 PM (10 years ago)
Author:
wehart
Message:

Reworking the coopr.colin code so it passes the tests.

Location:
coopr.colin/trunk/coopr/colin
Files:
1 added
5 edited

Legend:

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

    r2180 r2183  
    1313pyutilib.plugin.core.PluginGlobals.push_env( 'coopr.colin' )
    1414
     15from core import *
    1516import solver
    16 from core import *
    1717
    1818pyutilib.plugin.core.PluginGlobals.pop_env()
  • coopr.colin/trunk/coopr/colin/solver/ps.py

    r2180 r2183  
    1010
    1111from coopr.opt import SolverResults, ProblemSense, SolverStatus, SolutionStatus, TerminationCondition
    12 import solver
    13 import problem
     12from coopr.colin.core import solver
     13from coopr.colin.core import problem
    1414
    1515class PatternSearch(solver.COLINSolver):
  • coopr.colin/trunk/coopr/colin/tests/core/test_parallel.py

    r1918 r2183  
    1616import xml
    1717import coopr.opt
     18import coopr.colin
    1819from coopr.opt import ResultsFormat, ProblemFormat
    1920import pyutilib.th
     
    2223
    2324
    24 class TestProblem1(coopr.opt.colin.MixedIntOptProblem):
     25class TestProblem1(coopr.colin.MixedIntOptProblem):
    2526
    2627    def __init__(self):
    27         coopr.opt.colin.MixedIntOptProblem.__init__(self)
     28        coopr.colin.MixedIntOptProblem.__init__(self)
    2829        self.real_lower=[0.0, -1.0, 1.0, None]
    2930        self.real_upper=[None, 0.0, 2.0, -1.0]
     
    119120    def do_setup(self,flag):
    120121        pyutilib.services.TempfileManager.tempdir = currdir
    121         self.ps = coopr.opt.colin.PatternSearch()
     122        self.ps = coopr.colin.solver.PatternSearch()
    122123
    123124    def tearDown(self):
  • coopr.colin/trunk/coopr/colin/tests/core/test_problem.py

    r1768 r2183  
    11#
    2 # Unit Tests for coopr.opt.colin.problem
     2# Unit Tests for coopr.colin.problem
    33#
    44#
     
    1414import unittest
    1515from nose.tools import nottest
    16 import coopr.opt
     16import coopr.colin
    1717import xml
    1818from coopr.opt import ResultsFormat, ProblemFormat
     
    2121
    2222
    23 class TestProblem1(coopr.opt.colin.MixedIntOptProblem):
     23class TestProblem1(coopr.colin.MixedIntOptProblem):
    2424
    2525    def __init__(self):
    26         coopr.opt.colin.MixedIntOptProblem.__init__(self)
     26        coopr.colin.MixedIntOptProblem.__init__(self)
    2727        self.real_lower=[0.0, -1.0, 1.0, None]
    2828        self.real_upper=[None, 0.0, 2.0, -1.0]
     
    4444    def do_setup(self,flag):
    4545        pyutilib.services.TempfileManager.tempdir = currdir
    46         self.ps = coopr.opt.colin.PatternSearch()
     46        self.ps = coopr.colin.solver.PatternSearch()
    4747        self.problem=TestProblem1()
    4848
     
    5151
    5252    def test_error1(self):
    53         point = coopr.opt.colin.MixedIntVars()
     53        point = coopr.colin.MixedIntVars()
    5454        point.reals = [1.0]
    5555        try:
  • coopr.colin/trunk/coopr/colin/tests/core/test_ps.py

    r1918 r2183  
    11#
    2 # Unit Tests for coopr.opt.colin.ps
     2# Unit Tests for coopr.colin.ps
    33#
    44#
     
    1515from nose.tools import nottest
    1616import xml
    17 import coopr.opt
     17import coopr.colin
    1818from coopr.opt import ResultsFormat, ProblemFormat
    1919import pyutilib.services
     
    2121
    2222
    23 class TestProblem1(coopr.opt.colin.MixedIntOptProblem):
     23class TestProblem1(coopr.colin.MixedIntOptProblem):
    2424
    2525    def __init__(self):
    26         coopr.opt.colin.MixedIntOptProblem.__init__(self)
     26        coopr.colin.MixedIntOptProblem.__init__(self)
    2727        self.real_lower=[0.0, -1.0, 1.0, None]
    2828        self.real_upper=[None, 0.0, 2.0, -1.0]
     
    4444    def do_setup(self,flag):
    4545        pyutilib.services.TempfileManager.tempdir = currdir
    46         self.ps = coopr.opt.colin.PatternSearch()
     46        self.ps = coopr.colin.solver.PatternSearch()
    4747
    4848    def tearDown(self):
Note: See TracChangeset for help on using the changeset viewer.