[Erp5-report] r33980 jp - /erp5/trunk/products/ERP5/Document/SolverProcess.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 23 08:56:18 CET 2010
Author: jp
Date: Tue Mar 23 08:56:17 2010
New Revision: 33980
URL: http://svn.erp5.org?rev=33980&view=rev
Log:
Improved comment
Modified:
erp5/trunk/products/ERP5/Document/SolverProcess.py
Modified: erp5/trunk/products/ERP5/Document/SolverProcess.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SolverProcess.py?rev=33980&r1=33979&r2=33980&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] Tue Mar 23 08:56:17 2010
@@ -138,15 +138,16 @@
for movement, movement_solver_dict in movement_dict.items():
for solver, movement_solver_configuration_list in movement_solver_dict.items():
for configuration_mapping in movement_solver_configuration_list:
+ # Detect conflicts. This includes finding out that a solver which
+ # is exclusive per movement, conflicts with another solver on the same
+ # movement
solver_message_list = solver.getSolverConflictMessageList(movement, configuration_mapping, solver_dict)
if solver_message_list:
message_list.extend(solver_message_list)
continue # No need to keep on
- # Make sure multiple configuration are possible
- try:
- # Solver key contains only those properties which differentiate
- # solvers (ex. there should be only Production Reduction Solver)
- solver_key = solver.getSolverProcessGroupingKey(movement, configuration_mapping, solver_dict)
+ # Solver key contains only those properties which differentiate
+ # solvers (ex. there should be only Production Reduction Solver)
+ solver_key = solver.getSolverProcessGroupingKey(movement, configuration_mapping, solver_dict)
except: # Raise the exception generated by the solver in case of failure of grouping
raise
solver_key_dict = grouped_solver_dict.setdefault(solver, {})
More information about the Erp5-report
mailing list