[log] Improve logging

library/cadbiom/models/clause_constraints/mcl/CLUnfolder.py

@@ -932,23 +932,23 @@ class CLUnfolder(object):
         if LOGGER.getEffectiveLevel() == DEBUG:
             # final
             LOGGER.debug("Load new solver !!")
-            LOGGER.debug(">> final: " + str(len(self.__final_constraints)))
+            LOGGER.debug(">> final constraints: %s", len(self.__final_constraints))
             LOGGER.debug(str(self.__final_constraints))
 
             # trajectory invariant
-            LOGGER.debug(">> trajectory inv: " + str(len(self.__invariant_constraints)))
+            LOGGER.debug(">> trajectory invariant constraints: %s", len(self.__invariant_constraints))
             LOGGER.debug(str(self.__invariant_constraints))
 
             # trajectory variant
-            LOGGER.debug(">> trajectory var: " + str(len(self.__variant_constraints)))
+            LOGGER.debug(">> trajectory variant constraints: %s", len(self.__variant_constraints))
             LOGGER.debug(str(self.__variant_constraints))
 
             # dynamics
-            LOGGER.debug(">> dynamics: " + str(len(self.__dynamic_constraints)))
+            LOGGER.debug(">> dynamic constraints: %s", len(self.__dynamic_constraints))
             LOGGER.debug(str(self.__dynamic_constraints))
 
             # initial
-            LOGGER.debug(">> initial: " + str(len(self.__initial_constraints)))
+            LOGGER.debug(">> initial constraints: %s", len(self.__initial_constraints))
             LOGGER.debug(str(self.__initial_constraints))
 
 
@@ -989,10 +989,10 @@ class CLUnfolder(object):
             #    self.__nb_clauses = solver.nb_clauses()
 
         if LOGGER.getEffectiveLevel() == DEBUG:
-            LOGGER.debug("__msolve_constraints :: vvars : " + str(vvars))
-            LOGGER.debug("__msolve_constraints :: max_sol : " + str(max_sol))
+            LOGGER.debug("__msolve_constraints :: vvars : %s", vvars)
+            LOGGER.debug("__msolve_constraints :: max_sol : %s", max_sol)
             lintsol = solver.msolve_selected(max_sol, vvars)
-            LOGGER.debug("__msolve_constraints :: lintsol : " + str(lintsol))
+            LOGGER.debug("__msolve_constraints :: lintsol : %s", lintsol)
             return [RawSolution(solint, self) for solint in lintsol]
 
         return tuple(RawSolution(solint, self)
@@ -1033,7 +1033,7 @@ class CLUnfolder(object):
         @return: list of RawSolution objects
         """
         if LOGGER.getEffectiveLevel() == DEBUG:
-            LOGGER.debug("squery_solve :: vvars : " + str(vvars))
+            LOGGER.debug("squery_solve :: vvars : %s", vvars)
         # initialization
         self.init_forward_unfolding()
         # horizon adjustment