Changeset 2251


Ignore:
Timestamp:
Feb 3, 2010 3:56:43 PM (9 years ago)
Author:
wehart
Message:

Changes due to refinement of termination condition management
Bug fix and update to baseline data.

Location:
coopr.opt/trunk/coopr/opt
Files:
3 edited

Legend:

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

    r2250 r2251  
    3030    'globallyOptimal',      # Found a globally optimal solution
    3131    'locallyOptimal',       # Found a locally optimal solution
     32    'optimal',              # Found an optimal solution
    3233    # WARNING
    3334    'unbounded',            # Demonstrated that problem is unbounded
     
    8384        self.declare('user_time', type=ScalarType.time)
    8485        self.declare('system_time', type=ScalarType.time)
    85         self.declare('termination_condition', value=TerminationCondition.unsure)
     86        self.declare('termination_condition', value=TerminationCondition.unknown)
    8687        self.declare('termination_message')
    8788        self.declare('statistics', value=SolverStatistics(), active=False)
  • coopr.opt/trunk/coopr/opt/tests/base/test1.txt

    r1918 r2251  
    2121- Status: ok
    2222  Message:
    23   Termination condition: unsure
     23  Termination condition: unknown
    2424  ServiceURI:
    2525  ServiceName:
  • coopr.opt/trunk/coopr/opt/tests/base/test4_sol.txt

    r1918 r2251  
    2020- Status: ok
    2121  Message: PICO Solver\x3a final f = 88.200000
    22   Termination condition: unsure
     22  Termination condition: unknown
    2323  Id: 0
    2424
Note: See TracChangeset for help on using the changeset viewer.