Ignore:
Timestamp:
Nov 3, 2009 12:09:49 PM (10 years ago)
Author:
wehart
Message:

Misc bug fixes that were introduced by the introduction of variable_map
data, which is now called symbol_map.

Note: some tests still fail, due to the fact that pico_convert does not
generate symbol mapping information. This is being resolved.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coopr/opt/base/solver.py

    r1772 r1794  
    116116            for key in kwds['options']:
    117117                setattr(self.options,key,kwds['options'][key])
    118         self._variable_map=None
     118        self._symbol_map=None
    119119        self._problem_format=None
    120120        self._results_format=None
     
    139139        self._apply_solver()
    140140        result = self._postsolve()
    141         result.variable_map = self._variable_map
     141        result.symbol_map = self._symbol_map
    142142        return result
    143143
     
    166166             raise ValueError, "Unknown option="+key+" for solver="+self.type
    167167
    168         (self._problem_files,self._problem_format,self._variable_map) = self._convert_problem(args, self._problem_format, self._valid_problem_formats)
     168        (self._problem_files,self._problem_format,self._symbol_map) = self._convert_problem(args, self._problem_format, self._valid_problem_formats)
    169169        if self._results_format is None:
    170170           self._results_format= self._default_results_format(self._problem_format)
     
    192192        #
    193193        if self.problem is not None:
    194            return (self.problem,ProblemFormat.colin_optproblem)
     194           return (self.problem,ProblemFormat.colin_optproblem,None)
    195195        #
    196196        # Otherwise, we try to convert the object explicitly.
Note: See TracChangeset for help on using the changeset viewer.