Changeset 2365

Timestamp:

Feb 17, 2010 1:38:59 PM (11 years ago)

Author:

jwatson

Message:

More output sorting to ensure that tests pass!

File:

• coopr.pysp/trunk/coopr/pysp/scenariotree.py (modified) (7 diffs)

coopr.pysp/trunk/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)):
+            for child_node in sorted(tree_node._children, cmp=lambda x,y: cmp(x._name, y._name)):
                print "\t\t" + child_node._name
          else:
@@ -526 +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: "
@@ -550 +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
@@ -581 +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:
@@ -597 +600 @@
          print "\tChildren:"
          if len(tree_node._children) > 0:
-            for child_node in sorted(tree_node._children, cmp=lambda x,y: cmp(x._name,y._name)):
+            for child_node in sorted(tree_node._children, cmp=lambda x,y: cmp(x._name, y._name)):
                print "\t\t" + child_node._name
          else:
@@ -605 +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)