remove some remaining print

g-poveda · Nov 27, 2024 · 0160054 · 0160054
1 parent 394926e
commit 0160054
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/discrete_optimization/fjsp/solvers/dp.py b/discrete_optimization/fjsp/solvers/dp.py
@@ -205,16 +205,6 @@ def extract_ints(word):
                 end = start + self.duration[t_number][choice]
                 schedule_per_machine[m].append((start, end))
                 schedules[j] = (start, end, m)
-                # Debug
-                #    print("machine", m, state[self.cur_time_per_machine[m]])
-                #    print("job", j, state[self.cur_time_per_job[j[0]]])
-                #    print()
-                #    print(schedule_per_machine[m])
-                #    print(schedules[j])
-                #    for i in range(len(self.cur_time_per_machine)):
-                #        print("machine", i, state[self.cur_time_per_machine[i]])
-                #    for j in range(len(self.cur_time_per_job)):
-                #        print("job", j, state[self.cur_time_per_job[j]])
         sol = FJobShopSolution(
             problem=self.problem,
             schedule=[

diff --git a/discrete_optimization/generic_tools/qiskit_tools.py b/discrete_optimization/generic_tools/qiskit_tools.py
@@ -122,7 +122,7 @@ def cost_func(params, ansatz, hamiltonian, estimator, callback_dict):
     callback_dict["iters"] += 1
     callback_dict["prev_vector"] = params
     callback_dict["cost_history"].append(cost)
-    print(f"Iters. done: {callback_dict['iters']} [Current cost: {cost}]")
+    logger.info(f"Iters. done: {callback_dict['iters']} [Current cost: {cost}]")
 
     return cost
 
@@ -188,7 +188,7 @@ def fun(x):
             callback_dict["iters"] += 1
             callback_dict["prev_vector"] = x
             callback_dict["cost_history"].append(cost)
-            print(f"Iters. done: {callback_dict['iters']} [Current cost: {cost}]")
+            logger.info(f"Iters. done: {callback_dict['iters']} [Current cost: {cost}]")
             return cost
 
         optimizer = kwargs["optimizer"]

diff --git a/discrete_optimization/jsp/solvers/dp.py b/discrete_optimization/jsp/solvers/dp.py
@@ -146,11 +146,6 @@ def extract_ints(word):
 
         for transition in sol.transitions:
             state = transition.apply(state, self.model)
-            # for i in range(len(self.cur_time_per_machine)):
-            #     print("machine", i, state[self.cur_time_per_machine[i]])
-            # for j in range(len(self.cur_time_per_job)):
-            #     print("job", j, state[self.cur_time_per_job[j]])
-            # print(transition.name)
             if "finish" not in transition.name:
                 t_number = extract_ints(transition.name)[0]
                 m = self.machines[t_number]
@@ -170,7 +165,6 @@ def extract_ints(word):
                 for i in range(self.problem.n_jobs)
             ],
         )
-        print(self.problem.evaluate(sol))
         return sol
 
     def set_warm_start(self, solution: JobShopSolution) -> None:

diff --git a/discrete_optimization/rcpsp/utils.py b/discrete_optimization/rcpsp/utils.py
@@ -637,7 +637,7 @@ def get_start_bounds_from_additional_constraint(
                     )
                     ub = min(ub, ubs - min_duration)
     if ub < 0:
-        print(ub)
+        logger.debug(f"ub<0, {ub}")
     return int(lb), int(ub)
 
 

diff --git a/discrete_optimization/vrp/solvers/lp_iterative.py b/discrete_optimization/vrp/solvers/lp_iterative.py
@@ -987,7 +987,7 @@ def retrieve_solutions(
                 x_solution.copy(),
             )
         ]
-        print(f"quality of {s}-th solution", model.getAttr("PoolObjVal"))
+        logger.info(f"quality of {s}-th solution : {model.getAttr('PoolObjVal')}")
     return solutions