Changeset 1971

Timestamp:

Dec 6, 2009 6:24:10 PM (11 years ago)

Author:

wehart

Message:

Merged revisions 1950-1970 via svnmerge from
​https://software.sandia.gov/svn/public/coopr/coopr.plugins/trunk

........

r1954 | jwatson | 2009-12-01 20:20:15 -0700 (Tue, 01 Dec 2009) | 3 lines

Extracting solver runtime for CPLEX solver plugin, at the request of Steven from UC Davis. Extracting solver status is a major issue across-the-board for all solvers, as we are only populating a limited number of the fields (although the full set of statistics is available).

........

r1965 | jwatson | 2009-12-06 12:26:40 -0700 (Sun, 06 Dec 2009) | 3 lines

Migrating reduced-cost reads for CPLEX SOL file format into svn.

........

r1969 | wehart | 2009-12-06 15:53:36 -0700 (Sun, 06 Dec 2009) | 2 lines

Bug fix for mock tests.

........

r1970 | wehart | 2009-12-06 16:16:50 -0700 (Sun, 06 Dec 2009) | 3 lines

Bug fix: don't print None values for reduced cost
Updated cplex baselines.

........

Location:

coopr.plugins/stable/2.1

Files:

• . (modified) (1 prop)
• coopr/plugins/mip/CPLEX.py (modified) (5 diffs)
• coopr/plugins/tests/mip/test1_cplex.txt (modified) (1 diff)
• coopr/plugins/tests/mip/test4_cplex.txt (modified) (1 diff)
• coopr/plugins/tests/mip/test_pico.py (modified) (1 diff)

coopr.plugins/stable/2.1/coopr/plugins/mip/CPLEX.py

@@ -247 +247 @@
         #
         for line in output.split("\n"):
-#            print "LINE",line
             tokens = re.split('[ \t]+',line.strip())
             if len(tokens) > 3 and tokens[0] == "CPLEX" and tokens[1] == "Error":
@@ -272 +271 @@
             elif len(tokens) >= 5 and tokens[4] == "MAXIMIZE":
                 results.problem.sense = ProblemSense.maximize
+            elif len(tokens) >= 4 and tokens[0] == "Solution" and tokens[1] == "time" and tokens[2] == "=":
+               # technically, I'm not sure if this is CPLEX user time or user+system - CPLEX doesn't appear
+               # to differentiate, and I'm not sure we can always provide a break-down.
+               results.solver.user_time = eval(tokens[3])
         return results
 
@@ -296 +299 @@
                 variable_name = None
                 variable_value = None
+                variable_reduced_cost = None
                 for i in range(1,len(tokens)):
                    field_name =  string.strip(tokens[i].split('=')[0])
@@ -303 +307 @@
                    elif field_name == "value":
                       variable_value = field_value
+                   elif field_name == "reducedCost":
+                      variable_reduced_cost = field_value
+
                 # skip the "constant-one" variable, used to capture/retain objective offsets in the CPLEX LP format.
                 if variable_name != "ONE_VAR_CONSTANT":
@@ -310 +317 @@
                    except:
                        soln.variable[variable_name].value = variable_value
+                   if not variable_reduced_cost is None:
+                        try:
+                            soln.variable[variable_name].rc = eval(variable_reduced_cost)
+                        except:
+                            soln.variable[variable_name].rc = variable_reduced_cost
             elif tokens[0] == "constraint":
                 constraint_name = None

coopr.plugins/stable/2.1/coopr/plugins/tests/mip/test1_cplex.txt

@@ -44 +44 @@
       Id: 0
       Value: 1
+    X12: 
+      Id: 1
+      Rc: 1
+    X13: 
+      Id: 2
+      Rc: 2
+    X21: 
+      Id: 3
+      Rc: 1
+    X22: 
+      Id: 4
+      Rc: 2
     X23: 
       Id: 5
       Value: 1
+    X31: 
+      Id: 6
+      Rc: 2
     X32: 
       Id: 7
       Value: 1
+    X33: 
+      Id: 8
+      Rc: 1
   Constraint: 
     NODEA1: 

coopr.plugins/stable/2.1/coopr/plugins/tests/mip/test4_cplex.txt

@@ -41 +41 @@
       Value: 88.578
   Variable: 
+    x0: 
+      Id: 0
+      Rc: 1.3
+    x1: 
+      Id: 1
+      Rc: 0.07
+    x2: 
+      Id: 2
+      Rc: 1.03
+    x3: 
+      Id: 3
+      Rc: 1.63
     x4: 
       Id: 4
       Value: 46.8666666667
+    x5: 
+      Id: 5
+      Rc: 0.1
+    x6: 
+      Id: 6
+      Rc: 0.1
+    x7: 
+      Id: 7
+      Rc: 1.23
   Constraint: 
     cons0: 

coopr.plugins/stable/2.1/coopr/plugins/tests/mip/test_pico.py

@@ -102 +102 @@
         else:
             try:
-                results = self.pico.solve(currdir+"test4.nl", logfile=currdir+"test_solve4.log")
+                results = self.pico.solve(currdir+"test4.nl", rformat=ResultsFormat.sol, logfile=currdir+"test_solve4.log")
             except coopr.opt.ConverterError:
                 pass