[Erp5-report] r31492 kazuhiko - /erp5/trunk/products/ERP5/Document/SolverProcess.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Dec 28 16:31:48 2009
New Revision: 31492

URL: http://svn.erp5.org?rev=31492&view=rev
Log:
* ignore exactly same solver before calling SolverTypeInformation.conflictsWithSolver().
* call SolverTypeInformation.conflictsWithSolver() with solver type information instead of its id string.

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=31492&r1=31491&r2=31492&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] Mon Dec 28 16:31:48 2009
@@ -106,8 +106,10 @@
     for movement_url, movement_solver_dict in movement_dict.items():
       for solver_type, movement_solver_configuration_dict in movement_solver_dict.items():
         solver = types_tool[solver_type]
-        for other_solver in movement_solver_dict.keys():
-          if solver.conflictsWithSolver(other_solver):
+        for other_solver_type in movement_solver_dict.keys():
+          if other_solver_type == solver_type:
+            continue
+          if solver.conflictsWithSolver(types_tool[other_solver_type]):
             raise "Solver %s conflicts with solver %s on movement %s" % (solver_type, other_solver, movement_url)
         # Make sure multiple configuration are possible
         try: