[Erp5-report] r33504 kazuhiko - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Mar  8 16:27:56 2010
New Revision: 33504

URL: http://svn.erp5.org?rev=33504&view=rev
Log:
no need to pass solved_property_list, because it is apparent from value_dict.

Modified:
    erp5/trunk/products/ERP5/Document/AcceptSolver.py
    erp5/trunk/products/ERP5/Document/UnifySolver.py

Modified: erp5/trunk/products/ERP5/Document/AcceptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AcceptSolver.py?rev=33504&r1=33503&r2=33504&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] Mon Mar  8 16:27:56 2010
@@ -84,14 +84,12 @@
             value_dict.update({'quantity':new_quantity})
           else:
             value_dict.update({solved_property:new_value})
-        self._solveRecursively(simulation_movement, value_dict,
-                               solved_property_list)
+        self._solveRecursively(simulation_movement, value_dict)
         simulation_movement.expand()
     # Finish solving
     self.succeed()
 
-  def _solveRecursively(self, simulation_movement, value_dict=None,
-                        property_id_list=None):
+  def _solveRecursively(self, simulation_movement, value_dict=None):
     """
       Update value of the current simulation movement, and update
       his parent movement.
@@ -101,10 +99,9 @@
     if parent_movement.getPortalType() == 'Simulation Movement' and \
            not parent_movement.isFrozen():
       # backtrack to the parent movement while it is not frozen
-      self._solveRecursively(parent_movement, value_dict=value_dict,
-                             property_id_list=property_id_list)
+      self._solveRecursively(parent_movement, value_dict=value_dict)
     else:
-      for property_id in property_id_list:
+      for property_id in value_dict.iterkeys():
         if not simulation_movement.isPropertyRecorded(property_id):
           simulation_movement.recordProperty(property_id)
     for property_id, value in value_dict.iteritems():

Modified: erp5/trunk/products/ERP5/Document/UnifySolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/UnifySolver.py?rev=33504&r1=33503&r2=33504&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] Mon Mar  8 16:27:56 2010
@@ -77,8 +77,7 @@
            for x in self.getDeliveryValue().getMovementList()], [])
       for simulation_movement in simulation_movement_list:
         value_dict = {solved_property:new_value}
-        self._solveRecursively(simulation_movement, value_dict,
-                               [solved_property])
+        self._solveRecursively(simulation_movement, value_dict)
         simulation_movement.expand()
     # Finish solving
     self.succeed()