Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
preetwinder
erp5
Commits
28698f35
Commit
28698f35
authored
May 15, 2014
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Amount Generator: make sorting by dependency resolution really stable
parent
3923fe22
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
33 deletions
+57
-33
product/ERP5/mixin/amount_generator.py
product/ERP5/mixin/amount_generator.py
+25
-14
product/ERP5/tests/testTradeModelLine.py
product/ERP5/tests/testTradeModelLine.py
+32
-19
No files found.
product/ERP5/mixin/amount_generator.py
View file @
28698f35
...
@@ -168,7 +168,25 @@ class BaseAmountDict(Implicit):
...
@@ -168,7 +168,25 @@ class BaseAmountDict(Implicit):
class
BaseAmountResolver
(
BaseAmountDict
):
class
BaseAmountResolver
(
BaseAmountDict
):
_dummy_property_dict
=
{
'_index'
:
0
},
class
_node
(
set
):
contribution_dict
=
None
def
__init__
(
self
,
property_dict
,
contribution_dict
):
self
.
property_dict
=
property_dict
self
.
contribution_dict
=
contribution_dict
def
__call__
(
self
):
if
self
.
contribution_dict
:
contribution_dict_get
=
self
.
contribution_dict
.
get
del
self
.
contribution_dict
for
application
in
list
(
self
):
for
node
in
contribution_dict_get
(
application
,
()):
self
|=
node
()
return
self
def
__lt__
(
self
,
other
):
return
not
other
().
isdisjoint
(
self
.
property_dict
[
'_contribution'
])
def
__init__
(
self
,
cache
,
method_kw
):
def
__init__
(
self
,
cache
,
method_kw
):
self
.
_dict
=
cache
.
setdefault
(
None
,
{})
self
.
_dict
=
cache
.
setdefault
(
None
,
{})
...
@@ -180,25 +198,18 @@ class BaseAmountResolver(BaseAmountDict):
...
@@ -180,25 +198,18 @@ class BaseAmountResolver(BaseAmountDict):
recurseApplicationDependencies
=
\
recurseApplicationDependencies
=
\
self
.
__of__
(
delivery_amount
).
getGeneratedAmountQuantity
self
.
__of__
(
delivery_amount
).
getGeneratedAmountQuantity
contribution_dict
=
defaultdict
(
list
)
contribution_dict
=
defaultdict
(
list
)
node_list
=
[]
for
property_dict
in
property_dict_list
:
for
property_dict
in
property_dict_list
:
node
=
self
.
_resolving
=
self
.
_node
(
property_dict
,
contribution_dict
)
node_list
.
append
(
node
)
self
.
_amount_generator_line
=
property_dict
[
None
]
self
.
_amount_generator_line
=
property_dict
[
None
]
self
.
_resolving
=
property_dict
[
'_index'
]
=
set
()
for
variated_base_amount
in
property_dict
[
'_application'
]:
for
variated_base_amount
in
property_dict
[
'_application'
]:
recurseApplicationDependencies
(
*
variated_base_amount
)
recurseApplicationDependencies
(
*
variated_base_amount
)
for
variated_base_amount
in
property_dict
[
'_contribution'
]:
for
variated_base_amount
in
property_dict
[
'_contribution'
]:
contribution_dict
[
variated_base_amount
].
append
(
property_dict
)
contribution_dict
[
variated_base_amount
].
append
(
node
)
del
self
.
_resolving
del
self
.
_resolving
contribution_dict
.
default_factory
=
lambda
:
self
.
_dummy_property_dict
node_list
.
sort
()
def
sort_key
(
property_dict
):
property_dict_list
[:]
=
(
node
.
property_dict
for
node
in
node_list
)
score
=
property_dict
[
'_index'
]
if
type
(
score
)
is
set
:
score
=
property_dict
[
'_index'
]
=
1
+
max
(
sort_key
(
x
)
for
x
in
score
for
x
in
contribution_dict
[
x
])
return
score
property_dict_list
.
sort
(
key
=
sort_key
)
for
property_dict
in
property_dict_list
:
del
property_dict
[
'_index'
]
def
getBaseAmountList
(
self
):
def
getBaseAmountList
(
self
):
return
()
return
()
...
...
product/ERP5/tests/testTradeModelLine.py
View file @
28698f35
...
@@ -884,33 +884,46 @@ return context""" % (base_amount, base_amount))
...
@@ -884,33 +884,46 @@ return context""" % (base_amount, base_amount))
def
test_05_dependencyResolution
(
self
):
def
test_05_dependencyResolution
(
self
):
from
Products.ERP5Type.Document
import
newTempAmount
,
newTempTradeModelLine
from
Products.ERP5Type.Document
import
newTempAmount
,
newTempTradeModelLine
from
Products.ERP5.mixin.amount_generator
import
BaseAmountResolver
from
Products.ERP5.mixin.amount_generator
import
BaseAmountResolver
resolver
=
BaseAmountResolver
({},
{}
)
delivery_amount
=
newTempAmount
(
self
.
portal
,
''
)
trade_model_line
=
newTempTradeModelLine
(
self
.
portal
,
''
)
trade_model_line
=
newTempTradeModelLine
(
self
.
portal
,
''
)
def
case
(
*
lines
):
return
BaseAmountResolver
({},
{}),
[{
None
:
trade_model_line
,
'index'
:
index
,
'_application'
:
[(
x
,
())
for
x
in
application
],
'_contribution'
:
[(
x
,
())
for
x
in
contribution
],
}
for
index
,
application
,
contribution
in
lines
]
def
check
():
resolver
(
delivery_amount
,
property_dict_list
)
self
.
assertEqual
(
range
(
len
(
property_dict_list
)),
[
x
[
'index'
]
for
x
in
property_dict_list
])
# Case 1: calculation of some base_amount depends on others.
trade_model_line
.
getBaseAmountQuantity
=
\
trade_model_line
.
getBaseAmountQuantity
=
\
lambda
delivery_amount
,
base_amount
:
sum
(
map
(
lambda
delivery_amount
,
base_amount
:
sum
(
map
(
delivery_amount
.
getGeneratedAmountQuantity
,
delivery_amount
.
getGeneratedAmountQuantity
,
application_dict
.
get
(
base_amount
,
base_amount
)))
application_dict
.
get
(
base_amount
,
base_amount
)))
application_dict
=
dict
(
B
=
'bf'
,
C
=
'c'
,
E
=
'Bef'
)
application_dict
=
dict
(
B
=
'bf'
,
C
=
'c'
,
E
=
'Bef'
)
property_dict_list
=
[{
resolver
,
property_dict_list
=
case
((
2
,
'C'
,
'e'
),
None
:
trade_model_line
,
(
3
,
'dE'
,
''
),
'index'
:
index
,
(
0
,
'a'
,
'b'
),
'_application'
:
[(
x
,
())
for
x
in
application
],
(
1
,
'B'
,
'cd'
))
'_contribution'
:
[(
x
,
())
for
x
in
contribution
],
check
()
}
for
index
,
application
,
contribution
in
(
(
2
,
'C'
,
'e'
),
(
3
,
'dE'
,
''
),
(
0
,
'a'
,
'b'
),
(
1
,
'B'
,
'cd'
),
)]
delivery_amount
=
newTempAmount
(
self
.
portal
,
''
)
resolver
(
delivery_amount
,
property_dict_list
)
self
.
assertEqual
(
range
(
len
(
property_dict_list
)),
[
x
[
'index'
]
for
x
in
property_dict_list
])
# Retry with cache already filled.
# Retry with cache already filled.
property_dict_list
.
reverse
()
property_dict_list
.
reverse
()
resolver
(
delivery_amount
,
property_dict_list
)
check
()
self
.
assertEqual
(
range
(
len
(
property_dict_list
)),
del
trade_model_line
.
getBaseAmountQuantity
[
x
[
'index'
]
for
x
in
property_dict_list
])
# Case 2: sorting by dependency resolution must be stable.
# This is important for compatibility in case that calculation of D
# applies d conditionally, whereas the user took care of ordering 3 after 2
# with indices: 3 must remain after 2.
resolver
,
property_dict_list
=
case
((
0
,
'a'
,
'b'
),
(
1
,
'b'
,
'c'
),
(
2
,
'c'
,
'd'
),
(
3
,
'bD'
,
''
))
check
()
def
test_tradeModelLineWithFixedPrice
(
self
):
def
test_tradeModelLineWithFixedPrice
(
self
):
"""
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment