Ignore:
Timestamp:
Feb 11, 2010 11:26:54 AM (10 years ago)
Author:
wehart
Message:

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

........

r2234 | wehart | 2010-02-01 19:34:02 -0700 (Mon, 01 Feb 2010) | 2 lines


Updating changelog.

........

r2236 | wehart | 2010-02-01 19:38:27 -0700 (Mon, 01 Feb 2010) | 2 lines


Tagging coopr.opt 2.3 release

........

r2250 | wehart | 2010-02-03 13:42:06 -0700 (Wed, 03 Feb 2010) | 3 lines


Update to descriptions of solver status and associted termination
conditions.

........

r2251 | wehart | 2010-02-03 13:56:43 -0700 (Wed, 03 Feb 2010) | 3 lines


Changes due to refinement of termination condition management
Bug fix and update to baseline data.

........

r2257 | wehart | 2010-02-03 22:45:40 -0700 (Wed, 03 Feb 2010) | 6 lines


Augmenting the SolverResults? logic to support default values. This
capability is currently disabled, but I'm leaving it in in case we
want to use this in the future.


Misc fix to the activation logic.

........

r2258 | wehart | 2010-02-03 23:33:12 -0700 (Wed, 03 Feb 2010) | 4 lines


Adding a subpackage for optimization-specific testing tools.
Currently, this contains a customized PyUnit? testing class
that contains new testing functions.

........

r2259 | wehart | 2010-02-04 08:58:44 -0700 (Thu, 04 Feb 2010) | 4 lines


Adding new termination conditions.


Fixing problem setting up testing utilities when YAML is not installed.

........

r2263 | wehart | 2010-02-05 08:18:57 -0700 (Fri, 05 Feb 2010) | 6 lines


Misc rework of the converter utility to recognize that *.py files have
Pyomo models.


NOTE: If we start working with PuLP, then we might have an issue
distinguishing PuLP vs Pyomo Python files.

........

r2280 | jwatson | 2010-02-08 11:26:49 -0700 (Mon, 08 Feb 2010) | 1 line


Adding a suffixes attribute to the base solver class. This is a list of suffixes that the solver will - assuming it can - load into a solution. Examples are rc, dual, slack, etc. I modified the derived solver plugin classes to throw an exception if provided a suffix that it can't handle. I have little doubt that this change will cause some tests to fail - I'll look at this in a bit. The change was motivated by the expense of querying a solution, loading a solution, and shipping a lot of unnecessary information across the network.

........

Location:
coopr.opt/stable/2.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • coopr.opt/stable/2.3

  • coopr.opt/stable/2.3/coopr/opt/base/convert.py

    r2201 r2313  
    1313import copy
    1414import os
    15 from formats import ProblemFormat
     15from formats import ProblemFormat, guess_format
    1616from error import *
    1717from pyutilib.component.core import *
     
    4848       if os.sep in fname:   #pragma:nocover
    4949          fname = tmp.split(os.sep)[-1]
    50        suffix = fname.split('.')[-1]
    51        try:
    52           if suffix == "lp":
    53              source_ptype = [ProblemFormat.cpxlp]
    54           else:
    55              source_ptype = [getattr(ProblemFormat,suffix)]
    56        except AttributeError:
    57           raise ConverterError, "Unknown suffix type: "+suffix
     50       source_ptype = [guess_format(fname)]
     51       if source_ptype is [None]:
     52            raise ConverterError, "Unknown suffix type: "+suffix
    5853    else:
    5954       source_ptype = args[0].valid_problem_types()
Note: See TracChangeset for help on using the changeset viewer.