Changeset 2229


Ignore:
Timestamp:
Feb 1, 2010 4:57:41 PM (10 years ago)
Author:
wehart
Message:

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

........

r2216 | wehart | 2010-01-31 21:03:26 -0700 (Sun, 31 Jan 2010) | 2 lines


Bug fix: missing import

........

r2219 | wehart | 2010-01-31 22:13:03 -0700 (Sun, 31 Jan 2010) | 2 lines


Bug fix: verify that soln_file is not None before using it.

........

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

Legend:

Unmodified
Added
Removed
  • coopr.opt/stable/2.2

  • coopr.opt/stable/2.2/coopr/opt/solver/shellcmd.py

    r2205 r2229  
    1515from coopr.opt.base import *
    1616from coopr.opt.base.solver import *
    17 from coopr.opt.results import SolverStatus
     17from coopr.opt.results import SolverStatus, SolverResults
    1818import tempfile
    1919
     
    157157              # instead being automatically derived from the input lp/nl filename. so, we may
    158158              # have to clean it up manually.
    159               if os.path.exists(self.soln_file):
    160                  os.remove(self.soln_file)
     159              if not self.soln_file is None and os.path.exists(self.soln_file):
     160                os.remove(self.soln_file)
    161161
    162162        return results
Note: See TracChangeset for help on using the changeset viewer.