Skip to content

erp5
erp5
Commit 5ef82cd8 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

absolute tolerance and absolute quantity are not needed, the same result can be 

obtained by setting the same values in range_min and range_max


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37567 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1803a530
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 208 deletions
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration.xml
View file @ 5ef82cd8
......@@ -102,7 +102,6 @@
<list>
<string>my_tested_property</string>
<string>my_tested_property_title</string>
<string>my_quantity</string>
<string>my_quantity_range_min</string>
<string>my_quantity_range_max</string>
</list>
......@@ -113,7 +112,6 @@
<value>
<list>
<string>my_tolerance_base</string>
<string>my_tolerance</string>
<string>my_tolerance_range_min</string>
<string>my_tolerance_range_max</string>
</list>
......
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity.xml deleted 100644 → 0
View file @ 1803a530
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_quantity</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Absolute Tolerance</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance.xml deleted 100644 → 0
View file @ 1803a530
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_tolerance</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_percent</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Relative Tolerance</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/Document/FloatEquivalenceTester.py
View file @ 5ef82cd8
......@@ -85,8 +85,7 @@ class FloatEquivalenceTester(Predicate, EquivalenceTesterMixin):
# XXX we should use appropriate property sheets and getter methods
# for these properties.
# Maybe, but beware of default values of quantity when doing so
absolute_tolerance_min = self.getProperty('quantity_range_min') or \
self.getProperty('quantity')
absolute_tolerance_min = self.getProperty('quantity_range_min')
if absolute_tolerance_min is not None and \
delta < absolute_tolerance_min:
return (
......@@ -94,8 +93,7 @@ class FloatEquivalenceTester(Predicate, EquivalenceTesterMixin):
'The difference of ${property_name} between decision and prevision is less than ${value}.',
dict(property_name=tested_property,
value=absolute_tolerance_min))
absolute_tolerance_max = self.getProperty('quantity_range_max') or \
self.getProperty('quantity')
absolute_tolerance_max = self.getProperty('quantity_range_max')
if absolute_tolerance_max is not None and \
delta > absolute_tolerance_max:
return (
......@@ -142,8 +140,7 @@ class FloatEquivalenceTester(Predicate, EquivalenceTesterMixin):
base = prevision_value
if base is not None:
relative_tolerance_min = self.getProperty('tolerance_range_min') or \
self.getProperty('tolerance')
relative_tolerance_min = self.getProperty('tolerance_range_min')
if relative_tolerance_min is not None and \
delta < relative_tolerance_min * base:
return (
......@@ -151,8 +148,7 @@ class FloatEquivalenceTester(Predicate, EquivalenceTesterMixin):
'The difference of ${property_name} between decision and prevision is less than ${value} times of the prevision value.',
dict(property_name=tested_property,
value=relative_tolerance_min))
relative_tolerance_max = self.getProperty('tolerance_range_max') or \
self.getProperty('tolerance')
relative_tolerance_max = self.getProperty('tolerance_range_max')
if relative_tolerance_max is not None and \
delta < relative_tolerance_max * base:
return (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7