Changeset 2410

Timestamp:

Mar 2, 2010 4:53:30 PM (9 years ago)

Author:

jwatson

Message:

Fixed the PH solver server to automatically deregister a delegator object if it already exists in the name server.

Fixed various bugs in the PH solver server relating to quadratic expression output and weight/rho updates. It now replicates CPLEX results across the server network.

Location:

coopr.pysp/trunk/coopr/pysp

Files:

• phobjective.py (modified) (1 diff)
• phserver.py (modified) (14 diffs)

coopr.pysp/trunk/coopr/pysp/phobjective.py

@@ -397 +397 @@
    if quad_expression != 0.0:
      instance.active_components(Objective)[objective_name]._quad_subexpr = quad_expression
+   else:
+     instance.active_components(Objective)[objective_name]._quad_subexpr = None
 
    return new_instance_attributes

coopr.pysp/trunk/coopr/pysp/phserver.py

@@ -29 +29 @@
 import Pyro.core
 import Pyro.naming
+from Pyro.errors import PyroError,NamingError
 
 # garbage collection control.
@@ -53 +54 @@
 
       # the obvious stuff!
-      self._instances = scenario_instances
+      self._instances = scenario_instances # a map from scenario name to pyomo model instance
       self._solver = solver
       self._scenario_tree = scenario_tree
@@ -76 +77 @@
    def enable_standard_objective(self):
 
-      print "RECEIVED REQUEST TO ENABLE STANDARD OBJECTIVE FOR ALL SCENARIOS"
+#      print "RECEIVED REQUEST TO ENABLE STANDARD OBJECTIVE FOR ALL SCENARIOS"
 
       self._solving_standard_objective = True
@@ -82 +83 @@
    def enable_ph_objective(self):
 
-      print "RECEIVED REQUEST TO ENABLE PH OBJECTIVE FOR ALL SCENARIOS"
+#      print "RECEIVED REQUEST TO ENABLE PH OBJECTIVE FOR ALL SCENARIOS"
 
       self._solving_standard_objective = False
@@ -88 +89 @@
    def solve(self, scenario_name):
 
-      print "RECEIVED REQUEST TO SOLVE SCENARIO INSTANCE="+scenario_name
-      if self._solving_standard_objective is True:
-         print "OBJECTIVE=STANDARD"
-      else:
-         print "OBJECTIVE=PH"
+#      print "RECEIVED REQUEST TO SOLVE SCENARIO INSTANCE="+scenario_name
+#      if self._solving_standard_objective is True:
+#         print "OBJECTIVE=STANDARD"
+#      else:
+#         print "OBJECTIVE=PH"
          
       if scenario_name not in self._instances:
@@ -98 +99 @@
          return None
       scenario_instance = self._instances[scenario_name]
-
-      # IMPT: You have to re-presolve, as the simple presolver collects the linear terms together. If you
-      # don't do this, you won't see any chance in the output files as you vary the problem parameters!
-      # ditto for instance fixing!
-      scenario_instance.preprocess()
 
       # form the desired objective, depending on the solve mode.
@@ -112 +108 @@
                            self._original_objective_expression[scenario_name], self._scenario_tree, \
                            False, False, False, 0, 0.00001)
-                            
+
+      # IMPT: You have to re-presolve, as the simple presolver collects the linear terms together. If you
+      # don't do this, you won't see any chance in the output files as you vary the problem parameters!
+      # ditto for instance fixing!
+      scenario_instance.preprocess()
+
       results = self._solver.solve(scenario_instance)
 
@@ -124 +125 @@
    def update_weights_and_averages(self, scenario_name, new_weights, new_averages):
 
-      print "RECEIVED REQUEST TO UPDATE WEIGHTS AND AVERAGES FOR SCENARIO=",scenario_name
+#      print "RECEIVED REQUEST TO UPDATE WEIGHTS AND AVERAGES FOR SCENARIO=",scenario_name
 
       if scenario_name not in self._instances:
@@ -132 +133 @@
       
       for weight_update in new_weights:
-         weight_update.pprint()
          
          weight_index = weight_update._index
@@ -139 +139 @@
 
          for index in weight_index:
-            target_weight_parameter[index] = weight_update[index]
+            target_weight_parameter[index] = weight_update[index]()
 
       for average_update in new_averages:
-         average_update.pprint()
          
          average_index = average_update._index
@@ -149 +148 @@
 
          for index in average_index:
-            target_average_parameter[index] = average_update[index]            
+            target_average_parameter[index] = average_update[index]()
 
    def update_rhos(self, scenario_name, new_rhos):
 
-      print "RECEIVED REQUEST TO UPDATE RHOS FOR SCENARIO=",scenario_name
+#      print "RECEIVED REQUEST TO UPDATE RHOS FOR SCENARIO=",scenario_name
 
       if scenario_name not in self._instances:
@@ -161 +160 @@
 
       for rho_update in new_rhos:
-         rho_update.pprint()
-         
+
          rho_index = rho_update._index
 
          target_rho_parameter = getattr(scenario_instance, rho_update.name)
 
-         for index in rho_index:
-            target_rho_parameter[index] = rho_update[index]
+         for index in rho_index: 
+            target_rho_parameter[index] = rho_update[index]() # the value operator is crucial!
 
    def update_tree_node_statistics(self, scenario_name, new_node_minimums, new_node_maximums):
 
-      print "RECEIVED REQUEST TO UPDATE TREE NODE STATISTICS SCENARIO=",scenario_name
-
-      print "TREE NODE MINS=",new_node_minimums
-      print "TREE NODE MAXS=",new_node_maximums     
+#      print "RECEIVED REQUEST TO UPDATE TREE NODE STATISTICS SCENARIO=",scenario_name
 
       for tree_node_name, tree_node_minimums in new_node_minimums.items():
@@ -385 +380 @@
    # each scenario processed by this daemon.
    for scenario_name, scenario_instance in scenario_instances.items():
+      # first, see if it's already registered - if no, cull the old entry.
+      # NOTE: This is a hack, as the cleanup / disconnect code doesn't
+      #       seem to be invoked when the daemon is killed.
+      try:
+         ns.unregister(scenario_name)
+      except NamingError:
+         pass
+
       try:
          solver_daemon.connect(delegator_object, scenario_name)
@@ -390 +393 @@
          raise RuntimeError, "Entry in name server already exists for scenario="+scenario_name
 
-   while True:
-      solver_daemon.handleRequests()
-
-   solver_daemon.disconnect()
+   try:
+      solver_daemon.requestLoop()
+   except KeyboardInterrupt, SystemExit:
+      pass
+
+   solver_daemon.disconnect(delegator_object)
+   solver_daemon.shutdown()
 
    end_time = time.time()