Changeset 2366

Timestamp:

Feb 17, 2010 1:44:23 PM (11 years ago)

Author:

wehart

Message:

Merged revisions 2361-2365 via svnmerge from
​https://software.sandia.gov/svn/public/coopr/coopr.pysp/trunk

........

r2362 | wehart | 2010-02-17 10:19:40 -0700 (Wed, 17 Feb 2010) | 2 lines

Fix to run with glpk but not cplex.

........

r2363 | wehart | 2010-02-17 11:00:34 -0700 (Wed, 17 Feb 2010) | 4 lines

Updating baselines, which now used sorted output.

Added sorting option to the sorted() function.

........

r2364 | wehart | 2010-02-17 11:27:18 -0700 (Wed, 17 Feb 2010) | 2 lines

Bug fix when using glpk but not cplex.

........

r2365 | jwatson | 2010-02-17 11:38:59 -0700 (Wed, 17 Feb 2010) | 3 lines

More output sorting to ensure that tests pass!

........

Location:

coopr.pysp/stable/2.3

Files:

• . (modified) (1 prop)
• coopr/pysp/ph.py (modified) (3 diffs)
• coopr/pysp/scenariotree.py (modified) (7 diffs)
• coopr/pysp/tests/unit/farmer_linearized.baseline (modified) (2 diffs)
• coopr/pysp/tests/unit/farmer_quadratic.baseline (modified) (2 diffs)
• coopr/pysp/tests/unit/test_ph.py (modified) (3 diffs)

coopr.pysp/stable/2.3/coopr/pysp/ph.py

@@ -409 +409 @@
 
          # if you don't pre-solve, the name collections won't be updated.
-         instance.presolve()
+         instance.preprocess()
 
    # create PH weight and xbar vectors, on a per-scenario basis, for each variable that is not in the 
@@ -1001 +1001 @@
          # IMPT: I decided to presolve unconditionally, as PH extensions can add arbitrary components
          #       to the base scenario instances - and the variable values/etc. need to be collectged.
-         instance.presolve()
+         instance.preprocess()
             
          # there's nothing to warm-start from in iteration 0, so don't include the keyword in the solve call.
@@ -1367 +1367 @@
          # don't do this, you won't see any chance in the output files as you vary the problem parameters!
          # ditto for instance fixing!
-         instance.presolve()
+         instance.preprocess()
 
          # once past iteration 0, there is always a feasible solution from which to warm-start.

coopr.pysp/stable/2.3/coopr/pysp/scenariotree.py

@@ -501 +501 @@
       print "Tree Nodes:"
       print ""
-      for tree_node_name, tree_node in sorted(self._tree_node_map.iteritems()):
+      for tree_node_name in sorted(self._tree_node_map.keys()):
+         tree_node = self._tree_node_map[tree_node_name]
          print "\tName=" + tree_node_name
          if tree_node._stage is not None:
@@ -517 +518 @@
          print "\tChildren:"
          if len(tree_node._children) > 0:
-            for child_node in sorted(tree_node._children):
+            for child_node in sorted(tree_node._children, cmp=lambda x,y: cmp(x._name, y._name)):
                print "\t\t" + child_node._name
          else:
@@ -525 +526 @@
             print "\t\tNone"
          else:
-            for scenario in tree_node._scenarios:
+            for scenario in sorted(tree_node._scenarios, cmp=lambda x,y: cmp(x._name, y._name)):
                print "\t\t" + scenario._name
          print ""
       print "----------------------------------------------------"
       print "Stages:"
-      for stage_name, stage in sorted(self._stage_map.iteritems()):
+      for stage_name in sorted(self._stage_map.keys()):
+         stage = self._stage_map[stage_name]
          print "\tName=" + stage_name
          print "\tTree Nodes: "
-         for tree_node in stage._tree_nodes:
+         for tree_node in sorted(stage._tree_nodes, cmp=lambda x,y: cmp(x._name, y._name)):
             print "\t\t" + tree_node._name
          print "\tVariables: "
@@ -549 +551 @@
       print "----------------------------------------------------"
       print "Scenarios:"
-      for scenario_name, scenario in sorted(self._scenario_map.iteritems()):
+      for scenario_name in sorted(self._scenario_map.keys()):
+         scenario = self._scenario_map[scenario_name]
          print "\tName=" + scenario_name
          print "\tProbability=%4.4f" % scenario._probability
@@ -580 +583 @@
       print "Tree Nodes:"
       print ""
-      for tree_node_name, tree_node in sorted(self._tree_node_map.iteritems()):
+      for tree_node_name in sorted(self._tree_node_map.keys()):
+         tree_node = self._tree_node_map[tree_node_name]
          print "\tName=" + tree_node_name
          if tree_node._stage is not None:
@@ -596 +600 @@
          print "\tChildren:"
          if len(tree_node._children) > 0:
-            for child_node in sorted(tree_node._children):
+            for child_node in sorted(tree_node._children, cmp=lambda x,y: cmp(x._name, y._name)):
                print "\t\t" + child_node._name
          else:
@@ -604 +608 @@
             print "\t\tNone"
          else:
-            for scenario in tree_node._scenarios:
+            for scenario in sorted(tree_node._scenarios, cmp=lambda x,y: cmp(x._name, y._name)):
                print "\t\t" + scenario._name
          print "\tExpected node cost=%10.4f" % tree_node.computeExpectedNodeCost(scenario_instance_map)

coopr.pysp/stable/2.3/coopr/pysp/tests/unit/farmer_linearized.baseline

@@ -97 +97 @@
         Children:
                 AboveAverageNode
+                AverageNode
                 BelowAverageNode
-                AverageNode
         Scenarios:
                 BelowAverageScenario
@@ -140 +140 @@
 ----------------------------------------------------
 
-Total PH execution time=    1.10 seconds
+Total PH execution time=    2.69 seconds
 

coopr.pysp/stable/2.3/coopr/pysp/tests/unit/farmer_quadratic.baseline

@@ -213 +213 @@
         Conditional probability=1.0000
         Children:
-                BelowAverageNode
                 AboveAverageNode
                 AverageNode
+                BelowAverageNode
         Scenarios:
                 BelowAverageScenario
@@ -257 +257 @@
 ----------------------------------------------------
 
-Total PH execution time=    6.31 seconds
-
+Total PH execution time=    8.38 seconds
+

coopr.pysp/stable/2.3/coopr/pysp/tests/unit/test_ph.py

@@ -79 +79 @@
     def test_linearized_farmer(self):
 
-        if cplex_available is False:
-           return        
+        if cplex_available:
+            solver='cplex'
+        elif glpk_available:
+            solver='glpk'
+        else:
+           return
 
         pyutilib.misc.setup_redirect(current_directory+"farmer_linearized.out")
@@ -86 +90 @@
         model_dir = farmer_examples_dir + os.sep + "models"
         instance_dir = farmer_examples_dir + os.sep + "scenariodata"        
-        argstring = "runph --solver=cplex --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10"
+        argstring = "runph --solver="+solver+" --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10"
         args = string.split(argstring)
         coopr.pysp.phinit.run(args=args)        
@@ -116 +120 @@
         self.cleanup()        
 
-    def run(self, result=None):
-       global cplex_available
-       if not cplex_available:
-          return
-       pyutilib.th.TestCase.run(self,result)
+    #def run(self, result=None):
+       #global cplex_available
+       #if not cplex_available:
+          #return
+       #pyutilib.th.TestCase.run(self,result)
 
 if __name__ == "__main__":