Changeset 1900


Ignore:
Timestamp:
Nov 18, 2009 3:17:57 PM (12 years ago)
Author:
wehart
Message:

Bug fixes to account for the reorganization of coopr.opt

Location:
coopr.opt/trunk/coopr/opt
Files:
6 edited

Legend:

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

    r1768 r1900  
    1414
    1515from base import *
     16from results import *
    1617from colin import *
    1718import solver
  • coopr.opt/trunk/coopr/opt/base/__init__.py

    r1217 r1900  
    1515from convert import *
    1616from solver import *
    17 from solution import *
    1817from results import *
    1918from problem import *
  • coopr.opt/trunk/coopr/opt/base/solver.py

    r1897 r1900  
    1717from formats import ResultsFormat, ProblemFormat
    1818import results
    19 from solution import SolverResults, SolverStatus
     19from coopr.opt.results import SolverResults, SolverStatus
    2020
    2121from pyutilib.enum import Enum
  • coopr.opt/trunk/coopr/opt/reader/OS.py

    r1768 r1900  
    2020from pyutilib.enum import Enum
    2121from pyutilib.misc import get_xml_text
    22 from coopr.opt.base import SolutionStatus
     22from coopr.opt import SolutionStatus
    2323
    2424#
     
    316316from coopr.opt.base import results
    317317from coopr.opt.base.formats import *
    318 from coopr.opt.base.solution import SolverResults, Solution
     318from coopr.opt import SolverResults, Solution
    319319
    320320class ResultsReader_osrl(results.AbstractResultsReader):
  • coopr.opt/trunk/coopr/opt/reader/res.py

    r1657 r1900  
    1919from coopr.opt.base import results
    2020from coopr.opt.base.formats import *
    21 from coopr.opt.base.solution import SolverResults, Solution
     21from coopr.opt import SolverResults, Solution
    2222
    2323
  • coopr.opt/trunk/coopr/opt/reader/sol.py

    r1794 r1900  
    1919from coopr.opt.base import results
    2020from coopr.opt.base.formats import *
    21 from coopr.opt.base.solution import SolverResults, Solution
     21from coopr.opt import SolverResults, Solution
    2222
    2323class ResultsReader_sol(results.AbstractResultsReader):
Note: See TracChangeset for help on using the changeset viewer.