Changeset 2366
- Timestamp:
- Feb 17, 2010 1:44:23 PM (11 years ago)
- Location:
- coopr.pysp/stable/2.3
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
coopr.pysp/stable/2.3
- Property svnmerge-integrated changed
/coopr.pysp/trunk merged: 2362-2365
- Property svnmerge-integrated changed
-
coopr.pysp/stable/2.3/coopr/pysp/ph.py
r2361 r2366 409 409 410 410 # if you don't pre-solve, the name collections won't be updated. 411 instance.pre solve()411 instance.preprocess() 412 412 413 413 # 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 1002 1002 # to the base scenario instances - and the variable values/etc. need to be collectged. 1003 instance.pre solve()1003 instance.preprocess() 1004 1004 1005 1005 # 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! 1368 1368 # ditto for instance fixing! 1369 instance.pre solve()1369 instance.preprocess() 1370 1370 1371 1371 # once past iteration 0, there is always a feasible solution from which to warm-start. -
coopr.pysp/stable/2.3/coopr/pysp/scenariotree.py
r2361 r2366 501 501 print "Tree Nodes:" 502 502 print "" 503 for tree_node_name, tree_node in sorted(self._tree_node_map.iteritems()): 503 for tree_node_name in sorted(self._tree_node_map.keys()): 504 tree_node = self._tree_node_map[tree_node_name] 504 505 print "\tName=" + tree_node_name 505 506 if tree_node._stage is not None: … … 517 518 print "\tChildren:" 518 519 if len(tree_node._children) > 0: 519 for child_node in sorted(tree_node._children ):520 for child_node in sorted(tree_node._children, cmp=lambda x,y: cmp(x._name, y._name)): 520 521 print "\t\t" + child_node._name 521 522 else: … … 525 526 print "\t\tNone" 526 527 else: 527 for scenario in tree_node._scenarios:528 for scenario in sorted(tree_node._scenarios, cmp=lambda x,y: cmp(x._name, y._name)): 528 529 print "\t\t" + scenario._name 529 530 print "" 530 531 print "----------------------------------------------------" 531 532 print "Stages:" 532 for stage_name, stage in sorted(self._stage_map.iteritems()): 533 for stage_name in sorted(self._stage_map.keys()): 534 stage = self._stage_map[stage_name] 533 535 print "\tName=" + stage_name 534 536 print "\tTree Nodes: " 535 for tree_node in s tage._tree_nodes:537 for tree_node in sorted(stage._tree_nodes, cmp=lambda x,y: cmp(x._name, y._name)): 536 538 print "\t\t" + tree_node._name 537 539 print "\tVariables: " … … 549 551 print "----------------------------------------------------" 550 552 print "Scenarios:" 551 for scenario_name, scenario in sorted(self._scenario_map.iteritems()): 553 for scenario_name in sorted(self._scenario_map.keys()): 554 scenario = self._scenario_map[scenario_name] 552 555 print "\tName=" + scenario_name 553 556 print "\tProbability=%4.4f" % scenario._probability … … 580 583 print "Tree Nodes:" 581 584 print "" 582 for tree_node_name, tree_node in sorted(self._tree_node_map.iteritems()): 585 for tree_node_name in sorted(self._tree_node_map.keys()): 586 tree_node = self._tree_node_map[tree_node_name] 583 587 print "\tName=" + tree_node_name 584 588 if tree_node._stage is not None: … … 596 600 print "\tChildren:" 597 601 if len(tree_node._children) > 0: 598 for child_node in sorted(tree_node._children ):602 for child_node in sorted(tree_node._children, cmp=lambda x,y: cmp(x._name, y._name)): 599 603 print "\t\t" + child_node._name 600 604 else: … … 604 608 print "\t\tNone" 605 609 else: 606 for scenario in tree_node._scenarios:610 for scenario in sorted(tree_node._scenarios, cmp=lambda x,y: cmp(x._name, y._name)): 607 611 print "\t\t" + scenario._name 608 612 print "\tExpected node cost=%10.4f" % tree_node.computeExpectedNodeCost(scenario_instance_map) -
coopr.pysp/stable/2.3/coopr/pysp/tests/unit/farmer_linearized.baseline
r2317 r2366 97 97 Children: 98 98 AboveAverageNode 99 AverageNode 99 100 BelowAverageNode 100 AverageNode101 101 Scenarios: 102 102 BelowAverageScenario … … 140 140 ---------------------------------------------------- 141 141 142 Total PH execution time= 1.10seconds142 Total PH execution time= 2.69 seconds 143 143 -
coopr.pysp/stable/2.3/coopr/pysp/tests/unit/farmer_quadratic.baseline
r2317 r2366 213 213 Conditional probability=1.0000 214 214 Children: 215 BelowAverageNode216 215 AboveAverageNode 217 216 AverageNode 217 BelowAverageNode 218 218 Scenarios: 219 219 BelowAverageScenario … … 257 257 ---------------------------------------------------- 258 258 259 Total PH execution time= 6.31seconds260 259 Total PH execution time= 8.38 seconds 260 -
coopr.pysp/stable/2.3/coopr/pysp/tests/unit/test_ph.py
r2317 r2366 79 79 def test_linearized_farmer(self): 80 80 81 if cplex_available is False: 82 return 81 if cplex_available: 82 solver='cplex' 83 elif glpk_available: 84 solver='glpk' 85 else: 86 return 83 87 84 88 pyutilib.misc.setup_redirect(current_directory+"farmer_linearized.out") … … 86 90 model_dir = farmer_examples_dir + os.sep + "models" 87 91 instance_dir = farmer_examples_dir + os.sep + "scenariodata" 88 argstring = "runph --solver= cplex--solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10"92 argstring = "runph --solver="+solver+" --solver-manager=serial --model-directory="+model_dir+" --instance-directory="+instance_dir+" --linearize-nonbinary-penalty-terms=10" 89 93 args = string.split(argstring) 90 94 coopr.pysp.phinit.run(args=args) … … 116 120 self.cleanup() 117 121 118 def run(self, result=None):119 global cplex_available120 if not cplex_available:121 return122 pyutilib.th.TestCase.run(self,result)122 #def run(self, result=None): 123 #global cplex_available 124 #if not cplex_available: 125 #return 126 #pyutilib.th.TestCase.run(self,result) 123 127 124 128 if __name__ == "__main__":
Note: See TracChangeset
for help on using the changeset viewer.