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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec  4 11:38:17 2009
New Revision: 31071

URL: http://svn.erp5.org?rev=31071&view=rev
Log:
* we need to care recorded properties for decision_movement, not prevision_movement in compare().
* no need to care recorded properties in getUpdatablePropertyDict().

Modified:
    erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py
    erp5/trunk/products/ERP5/Document/FloatDivergenceTester.py
    erp5/trunk/products/ERP5/Document/StringDivergenceTester.py

Modified: erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py?rev=31071&r1=31070&r2=31071&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py [utf8] Fri Dec  4 11:38:17 2009
@@ -65,11 +65,11 @@
     list : (prevision_value, decision_value, message, mapping)
     """
     tested_property = self.getTestedProperty()
-    decision_value = decision_movement.getPropertyList(tested_property)
-    if prevision_movement.isPropertyRecorded(tested_property):
-      prevision_value = prevision_movement.getRecordedProperty(tested_property)
+    if getattr(decision_movement, 'isPropertyRecorded', lambda:False)():
+      decision_value = decision_movement.getRecordedProperty(tested_property)
     else:
-      prevision_value = prevision_movement.getPropertyList(tested_property)
+      decision_value = decision_movement.getPropertyList(tested_property)
+    prevision_value = prevision_movement.getPropertyList(tested_property)
 
     # XXX do we have configurable parameter for this divergence tester ?
     # like ambiguity...
@@ -90,10 +90,7 @@
     decision_movement -- a delivery movement (decision)
     """
     tested_property = self.getTestedProperty()
-    if prevision_movement.isPropertyRecorded(tested_property):
-      prevision_value = prevision_movement.getRecordedProperty(tested_property)
-    else:
-      prevision_value = prevision_movement.getPropertyList(tested_property)
+    prevision_value = prevision_movement.getPropertyList(tested_property)
     return {tested_property:prevision_value}
 
   def accept(self, simulation_movement):

Modified: erp5/trunk/products/ERP5/Document/FloatDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/FloatDivergenceTester.py?rev=31071&r1=31070&r2=31071&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/FloatDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/FloatDivergenceTester.py [utf8] Fri Dec  4 11:38:17 2009
@@ -67,13 +67,11 @@
     list : (prevision_value, decision_value, message, mapping)
     """
     tested_property = self.getTestedProperty()
-    decision_value = decision_movement.getProperty(tested_property)
-    if self.getProperty('delivery_ratio_enabled'):
-      decision_value *= prevision_movement.getDeliveryRatio()
-    if prevision_movement.isPropertyRecorded(tested_property):
-      prevision_value = prevision_movement.getRecordedProperty(tested_property)
+    if getattr(decision_movement, 'isPropertyRecorded', lambda:False)():
+      decision_value = decision_movement.getRecordedProperty(tested_property)
     else:
-      prevision_value = prevision_movement.getProperty(tested_property)
+      decision_value = decision_movement.getProperty(tested_property)
+    prevision_value = prevision_movement.getProperty(tested_property)
 
     delta = decision_value - prevision_value
     # XXX we should use appropriate property sheets and getter methods
@@ -156,10 +154,7 @@
     decision_movement -- a delivery movement (decision)
     """
     tested_property = self.getTestedProperty()
-    if prevision_movement.isPropertyRecorded(tested_property):
-      prevision_value = prevision_movement.getRecordedProperty(tested_property)
-    else:
-      prevision_value = prevision_movement.getProperty(tested_property)
+    prevision_value = prevision_movement.getProperty(tested_property)
     return {tested_property:prevision_value}
 
   def accept(self, simulation_movement):

Modified: erp5/trunk/products/ERP5/Document/StringDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/StringDivergenceTester.py?rev=31071&r1=31070&r2=31071&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/StringDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/StringDivergenceTester.py [utf8] Fri Dec  4 11:38:17 2009
@@ -68,11 +68,11 @@
     list : (prevision_value, decision_value, message, mapping)
     """
     tested_property = self.getTestedProperty()
-    decision_value = decision_movement.getProperty(tested_property)
-    if prevision_movement.isPropertyRecorded(tested_property):
-      prevision_value = prevision_movement.getRecordedProperty(tested_property)
+    if getattr(decision_movement, 'isPropertyRecorded', lambda:False)():
+      decision_value = decision_movement.getRecordedProperty(tested_property)
     else:
-      prevision_value = prevision_movement.getProperty(tested_property)
+      decision_value = decision_movement.getProperty(tested_property)
+    prevision_value = prevision_movement.getProperty(tested_property)
 
     # XXX do we have configurable parameter for this divergence tester ?
     # like ambiguity...
@@ -93,10 +93,7 @@
     decision_movement -- a delivery movement (decision)
     """
     tested_property = self.getTestedProperty()
-    if prevision_movement.isPropertyRecorded(tested_property):
-      prevision_value = prevision_movement.getRecordedProperty(tested_property)
-    else:
-      prevision_value = prevision_movement.getProperty(tested_property)
+    prevision_value = prevision_movement.getProperty(tested_property)
     return {tested_property:prevision_value}
 
   def accept(self, simulation_movement):