Changeset 2073


Ignore:
Timestamp:
Dec 30, 2009 12:47:31 AM (10 years ago)
Author:
wehart
Message:

Merged revisions 1947-2072 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.misc/trunk

........

r1974 | wehart | 2009-12-06 17:20:56 -0700 (Sun, 06 Dec 2009) | 2 lines


Updating PyPI categories

........

r2041 | jwatson | 2009-12-23 16:59:57 -0700 (Wed, 23 Dec 2009) | 3 lines


Grab the mipgap solver option from the pickled configuration data.

........

r2043 | jwatson | 2009-12-23 21:00:57 -0700 (Wed, 23 Dec 2009) | 3 lines


Updated pyro_mip_server to accept warm-start files and transfer them to the solver plugins.

........

Location:
coopr.misc/stable/2.1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coopr.misc/stable/2.1

  • coopr.misc/stable/2.1/scripts/pyro_mip_server

    r1857 r2073  
    3434        if opt is None:
    3535            raise ValueError, "Problem constructing solver `"+data.opt+"'"
     36        opt.mipgap = data.mipgap
    3637
    3738        # here is where we should set any options required by the solver, available
     
    4344            setattr(opt.options,key,value)
    4445
    45         fname = os.path.split(data.filename)[1]
    46         tfile = pyutilib.services.TempfileManager.create_tempfile(suffix=fname)
    47         OUTPUT=open(tfile,'w')
     46        problem_filename_suffix = os.path.split(data.filename)[1]
     47        temp_problem_filename = pyutilib.services.TempfileManager.create_tempfile(suffix="."+problem_filename_suffix)
     48        OUTPUT=open(temp_problem_filename,'w')
    4849        print >>OUTPUT, data.file
    4950        OUTPUT.close()
    50         print "Applying solver="+data.opt+" to solve problem="+tfile
    51         results = opt.solve(tfile, **data.kwds)
     51
     52        if data.warmstart_file is not None:
     53           warmstart_filename_suffix = os.path.split(data.warmstart_filename)[1]
     54           temp_warmstart_filename = pyutilib.services.TempfileManager.create_tempfile(suffix="."+warmstart_filename_suffix)
     55           OUTPUT=open(temp_warmstart_filename,'w')
     56           print >>OUTPUT, data.warmstart_file
     57           OUTPUT.close()
     58           opt.warm_start_solve = True
     59           opt.warm_start_file_name = temp_warmstart_filename
     60       
     61        print "Applying solver="+data.opt+" to solve problem="+temp_problem_filename
     62        results = opt.solve(temp_problem_filename, **data.kwds)
    5263        pyutilib.services.TempfileManager.clear_tempfiles()
    5364        # disabling write of solutions for now - this was getting too verbose,
  • coopr.misc/stable/2.1/setup.py

    r1947 r2073  
    6161            'Programming Language :: Unix Shell',
    6262            'Topic :: Scientific/Engineering :: Mathematics',
    63             'Topic :: Software Development :: Libraries :: Python Modules'
     63            'Topic :: Software Development :: Libraries :: Python Modules',
     64            'Topic :: Scientific/Engineering'
    6465        ],
    6566      packages=packages,
Note: See TracChangeset for help on using the changeset viewer.