Changeset 2363

Timestamp:

Feb 17, 2010 1:00:34 PM (11 years ago)

Author:

wehart

Message:

Updating baselines, which now used sorted output.

Added sorting option to the sorted() function.

Location:

coopr.pysp/trunk/coopr/pysp

Files:

• ph.py (modified) (3 diffs)
• scenariotree.py (modified) (2 diffs)
• tests/unit/farmer_linearized.baseline (modified) (2 diffs)
• tests/unit/farmer_quadratic.baseline (modified) (2 diffs)

coopr.pysp/trunk/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/trunk/coopr/pysp/scenariotree.py

@@ -517 +517 @@
          print "\tChildren:"
          if len(tree_node._children) > 0:
-            for child_node in sorted(tree_node._children):
+            #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:
@@ -596 +597 @@
          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:

coopr.pysp/trunk/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/trunk/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
+