Changeset 2231


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

Merged revisions 2206-2230 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.plugins/trunk

........

r2212 | jwatson | 2010-01-30 20:20:23 -0700 (Sat, 30 Jan 2010) | 3 lines


Supressing warm start file write time output in the CPLEX plugin unless the "_report_timing" attribute is enabled.

........

r2215 | wehart | 2010-01-31 20:48:54 -0700 (Sun, 31 Jan 2010) | 3 lines


Creating an ASL solver interface for
optimizers based on the ASL solver interface.

........

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


Preliminary implementation of the ASL solver interface.

........

r2222 | wehart | 2010-01-31 22:16:23 -0700 (Sun, 31 Jan 2010) | 2 lines


Misc.

........

r2223 | wehart | 2010-01-31 22:17:17 -0700 (Sun, 31 Jan 2010) | 2 lines


Misc updtes.

........

r2224 | wehart | 2010-01-31 22:21:54 -0700 (Sun, 31 Jan 2010) | 2 lines


Updating mock info for ASL.

........

r2225 | wehart | 2010-01-31 22:23:18 -0700 (Sun, 31 Jan 2010) | 2 lines


Bug fix: don't copy files with value None

........

Location:
coopr.plugins/stable/2.2
Files:
1 deleted
6 edited
7 copied

Legend:

Unmodified
Added
Removed
  • coopr.plugins/stable/2.2

  • coopr.plugins/stable/2.2/coopr/plugins/mip/CPLEX.py

    r2206 r2231  
    159159                self.write_warmstart_file(args[0])
    160160                end_time = time.time()
    161                 print "Warm start write time="+str(end_time-start_time)+" seconds"
     161                if self._report_timing is True:
     162                   print "Warm start write time="+str(end_time-start_time)+" seconds"
    162163         
    163164       # let the base class handle any remaining keywords/actions.
  • coopr.plugins/stable/2.2/coopr/plugins/mip/__init__.py

    r2206 r2231  
    1616from GLPK import GLPK, MockGLPK
    1717from CPLEX import CPLEX, MockCPLEX
    18 #from NLOPT import NLOPT, MockNLOPT
     18from ASL import ASL, MockASL
    1919#from NLWRITE import NLWRITE
    2020
  • coopr.plugins/stable/2.2/coopr/plugins/mip/mockmip.py

    r1492 r2231  
    3131    def _execute_command(self,cmd):
    3232        for file in glob.glob(self._mock_dir+os.sep+self.mock_subdir+os.sep+self._mock_problem+"*"):
    33           if file.split(".")[-1] in ["soln","sol"]:
     33          if not self.soln_file is None and file.split(".")[-1] in ["soln","sol"]:
    3434             shutil.copyfile(file,self.soln_file)
    3535          if file.split(".")[-1] != "out":
  • coopr.plugins/stable/2.2/coopr/plugins/tests/mip/test_factory.py

    r2206 r2231  
    6666        ans = coopr.opt.SolverFactory()
    6767        ans.sort()
    68         tmp = ['_mock_cbc', '_mock_cplex', '_mock_glpk', '_mock_pico', 'cbc', 'cplex', 'glpk', 'pico', 'stest']
     68        tmp = ['_mock_asl', '_mock_cbc', '_mock_cplex', '_mock_glpk', '_mock_pico', 'cbc', 'cplex', 'glpk', 'pico', 'stest', 'asl']
    6969        tmp.sort()
    7070        self.failUnless(set(tmp) <= set(ans), msg="Set %s is not a subset of set %s" %(tmp,ans))
  • coopr.plugins/stable/2.2/setup.py

    r2087 r2231  
    7878            'solver.pico = coopr.plugins.mip.PICO',
    7979            'solver.glpk = coopr.plugins.mip.GLPK',
     80            'solver.asl = coopr.plugins.mip.ASL',
    8081        ]
    8182      }
Note: See TracChangeset for help on using the changeset viewer.