Changeset 2631

Timestamp:

May 24, 2010 11:25:03 AM (11 years ago)

Author:

jwatson

Message:

Fixing parser bug in CBC plugin - testing failed to catch a change a while back, as this has been broken for some time...

File:

• coopr.plugins/trunk/coopr/plugins/mip/CBCplugin.py (modified) (5 diffs)

coopr.plugins/trunk/coopr/plugins/mip/CBCplugin.py

@@ -312 +312 @@
         results.problem.number_of_objectives=1
 
-        processing_constraints=None # None means header, True means constraints, False means variables.
+        processing_constraints = None # None means header, True means constraints, False means variables.
+        header_processed = False
         INPUT = open(self.soln_file,"r")
         for line in INPUT:
           tokens = re.split('[ \t]+',line.strip())
-          #print "LINE",line,len(tokens)
-          if tokens[0] in ("Optimal", "Status"):
-             # TBD - this logic isn't correct/complete. flush out as necessary.              
-             continue
-          if tokens[0] == "0": # indicates section start.
+          # these are the only header entries CBC will generate (identified via browsing CbcSolver.cpp)
+          if tokens[0] in ("Optimal", "Infeasible", "Unbounded", "Stopped", "Integer", "Status"):
+             if tokens[0] == "Optimal":
+                solution.status = SolutionStatus.optimal
+                solution.gap = 0.0
+                solution.objective['f'].value = eval(tokens[-1])
+             elif tokens[0] == "Infeasible":
+                solution.status = SolutionStatus.infeasible
+                solution.gap = None
+                return
+             else:
+                print "***WARNING: CBC plugin currently not processing solution status="+tokens[0]+" correctly. Full status line is: "+string.strip(line)
+             header_processed = True
+
+          elif tokens[0] == "0": # indicates section start.
              if processing_constraints is None:
                 processing_constraints = True
@@ -326 +337 @@
                 processing_constraints = False
              else:
-                raise RuntimeError, "CBC encountered unexpected line=("+line.strip()+") in solution file="+self.soln_file+"; constraint and variable sections already processed!"
+                raise RuntimeError, "CBC plugin encountered unexpected line=("+line.strip()+") in solution file="+self.soln_file+"; constraint and variable sections already processed!"
 
           if (processing_constraints is True) and (extract_duals is True):
@@ -332 +343 @@
              constraint_ax = eval(tokens[2]) # CBC reports the constraint row times the solution vector - not the slack.
              constraint_dual = eval(tokens[3])
-
              solution.constraint[constraint].dual = constraint_dual
 
@@ -339 +349 @@
              variable_value = eval(tokens[2])
              solution.variable[variable_name].value = variable_value
-
              if extract_reduced_costs is True:
                 variable_reduced_cost = eval(tokens[3]) # currently ignored.
                 solution.variable[variable_name].rc = variable_reduced_cost
+                
+          elif header_processed is True:
+             pass
+         
           else:
-             raise RuntimeError, "CBC encountered unexpected line=("+line.strip()+") in solution file="+self.soln_file+"; expecting header, but found data!"
+             raise RuntimeError, "CBC plugin encountered unexpected line=("+line.strip()+") in solution file="+self.soln_file+"; expecting header, but found data!"
          
         INPUT.close()
@@ -384 +397 @@
 
 pyutilib.services.register_executable(name="cbc")
-