[Erp5-report] r15615 - /erp5/trunk/products/ERP5/TargetSolver/ResourceBackpropagation.py

[nobody at svn.erp5.org]

Author: yo
Date: Sat Aug 11 15:58:34 2007
New Revision: 15615

URL: http://svn.erp5.org?rev=15615&view=rev
Log:
Copy dates rather than patching deltas, because floating points are not so reliable for milliseconds. This should be probably applied to CopyToTarget as well.

Modified:
    erp5/trunk/products/ERP5/TargetSolver/ResourceBackpropagation.py

Modified: erp5/trunk/products/ERP5/TargetSolver/ResourceBackpropagation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/TargetSolver/ResourceBackpropagation.py?rev=15615&r1=15614&r2=15615&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/TargetSolver/ResourceBackpropagation.py (original)
+++ erp5/trunk/products/ERP5/TargetSolver/ResourceBackpropagation.py Sat Aug 11 15:58:34 2007
@@ -51,16 +51,16 @@
     quantity_ratio = 0
     if old_quantity not in (None,0.0): # XXX: What if quantity happens to be an integer ?
       quantity_ratio = new_quantity / old_quantity
-    start_date_delta = 0
-    stop_date_delta = 0
+    start_date = None
+    stop_date = None
     if new_start_date is not None and old_start_date is not None:
-      start_date_delta = new_start_date - old_start_date
+      start_date = new_start_date
     if new_stop_date is not None and old_stop_date is not None:
-      stop_date_delta = new_stop_date - old_stop_date
+      stop_date = new_stop_date
     return {
       'quantity_ratio': quantity_ratio,
-      'start_date_delta': start_date_delta,
-      'stop_date_delta': stop_date_delta,
+      'start_date': start_date,
+      'stop_date': stop_date,
       'resource_list' :
           simulation_movement.getDeliveryValue().getResourceList(),
       'variation_category_list':
@@ -70,7 +70,7 @@
     }
 
   def _generateValueDict(self, simulation_movement, quantity_ratio=1, 
-                         start_date_delta=0, stop_date_delta=0,
+                         start_date=None, stop_date=None,
                          resource_list=[],
                          variation_category_list=[],
                          variation_property_dict={},
@@ -80,12 +80,10 @@
     """
     value_dict = {}
     # Modify quantity, start_date, stop_date
-    start_date = simulation_movement.getStartDate()
     if start_date is not None:
-      value_dict['start_date'] = start_date + start_date_delta
-    stop_date = simulation_movement.getStopDate()
+      value_dict['start_date'] = start_date
     if stop_date is not None:
-      value_dict['stop_date'] = stop_date + stop_date_delta
+      value_dict['stop_date'] = stop_date
     value_dict['quantity'] = simulation_movement.getQuantity() * quantity_ratio
     if resource_list:
       value_dict['resource_list'] = resource_list