Skip to content

erp5
erp5
Commit 2f472bd5 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

* Calculate and pass default values to automatic solvers. 

* Add fallback scripts for target solvers' default configuration values.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36734 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 451aa813
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 6 deletions
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml
View file @ 2f472bd5
......@@ -75,11 +75,13 @@ if len(solver_movement_list) > 0:\n
for solver, simulation_movement in solver_movement_list:\n
# XXX Do we need grouping here?\n
# XXX Do we need to split activities for each target solver?\n
# XXX We need to calculate and pass default values for some solvers\n
target_solver = solver_process.newContent(\n
portal_type=solver.getId(),\n
delivery=simulation_movement.getRelativeUrl()\n
)\n
# Calculate and pass default values.\n
target_solver.updateConfiguration(\n
**solver.getDefaultConfigurationPropertyDict(target_solver))\n
solver_process.solve()\n
\n
delivery.updateCausalityState(solve_automatically=False)\n
......@@ -147,6 +149,7 @@ delivery.updateCausalityState(solve_automatically=False)\n
<string>solver_process</string>
<string>solver</string>
<string>target_solver</string>
<string>_apply_</string>
<string>False</string>
</tuple>
</value>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyDict.xml 0 → 100644
View file @ 2f472bd5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># This script is just a fall back script returns nothing meaningful.\n
return {}\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Solver_getDefaultConfigurationPropertyDict</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyListDict.xml 0 → 100644
View file @ 2f472bd5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># This script is just a fall back script returns nothing meaningful.\n
return {}\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Solver_getDefaultConfigurationPropertyListDict</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml
View file @ 2f472bd5
......@@ -109,16 +109,15 @@ else:\n
<tuple>
<string>state_change</string>
<string>_getitem_</string>
<string>state_change</string>
<string>delivery</string>
<string>getattr</string>
<string>_getattr_</string>
<string>None</string>
<string>portal</string>
<string>getattr</string>
<string>None</string>
<string>solver_tool</string>
<string>solver_process_tool</string>
<string>activate_kw</string>
<string>False</string>
<string>_apply_</string>
</tuple>
</value>
</item>
......
bt5/erp5_base/bt/change_log
View file @ 2f472bd5
2010-06-30 kazuhiko
* Calculate and pass default values to automatic solvers.
* Add fallback scripts for target solvers' default configuration values.
2010-06-29 kazuhiko
* Move portal_solvers and portal_solver_processes from the experimental erp5_simulation business template to the erp5_base business template.
......
bt5/erp5_base/bt/revision
View file @ 2f472bd5
782
\ No newline at end of file
783
\ No newline at end of file
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