Changeset 2390


Ignore:
Timestamp:
Feb 22, 2010 2:00:08 AM (10 years ago)
Author:
wehart
Message:

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

........

r2380 | wehart | 2010-02-19 15:45:40 -0700 (Fri, 19 Feb 2010) | 2 lines


Augmenting parser to collect statistics for # of branch/bound nodes.

........

Location:
coopr.plugins/stable/2.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coopr.plugins/stable/2.3

  • coopr.plugins/stable/2.3/coopr/plugins/mip/GLPK.py

    r2356 r2390  
    164164          elif len(tokens) > 2 and tokens[0] == "INTEGER" and tokens[1] == "OPTIMAL":
    165165             soln.status = SolutionStatus.optimal
     166             results.solver.statistics.branch_and_bound.number_of_created_subproblems = 0
     167             results.solver.statistics.branch_and_bound.number_of_bounded_subproblems = 0
    166168          elif len(tokens) > 2 and tokens[0] == "TIME" and tokens[2] == "EXCEEDED;":
    167169             soln.status = SolutionStatus.stoppedByLimit
  • coopr.plugins/stable/2.3/coopr/plugins/tests/mip/test_glpk.py

    r2356 r2390  
    102102            results.write(filename=currdir+"test_solve4.txt",times=False)
    103103            self.failUnlessFileEqualsBaseline(currdir+"test_solve4.txt", currdir+"test4_glpk.txt")
    104             os.remove(currdir+"test4.soln")
     104            #os.remove(currdir+"test4.soln")
    105105            os.remove(currdir+"test_solve4.log")
    106106        else:
Note: See TracChangeset for help on using the changeset viewer.