Fix callback for DOSolver

pyproject.toml

@@ -60,7 +60,7 @@ matplotlib = { version = ">=3.3.4", optional = true }
 joblib = { version = ">=1.0.1", optional = true }
 stable-baselines3 = { version = ">=2.0.0", optional = true }
 ray = { extras = ["rllib"], version = ">=2.7.0", optional = true }
-discrete-optimization = { version = ">=0.2.3", optional = true }
+discrete-optimization = { version = ">=0.3.0", optional = true }
 openap = { git = "https://github.com/nhuet/openap.git", tag = "v1.3.1", optional = true }
 pygeodesy = { version = ">=23.6.12", optional = true }
 unified-planning = { version = ">=1.1.0", python = ">=3.10", optional = true }

skdecide/hub/solver/do_solver/do_solver_scheduling.py

@@ -166,7 +166,7 @@ def __init__(
         policy_method_params: PolicyMethodParams,
         method: SolvingMethod = SolvingMethod.PILE,
         dict_params: Optional[Dict[Any, Any]] = None,
-        callback: Optional[Callable[[Domain, DOSolver], bool]] = None,
+        callback: Optional[Callable[[DOSolver], bool]] = None,
     ):
         self.callback = callback
         self.method = method
@@ -209,9 +209,7 @@ def _solve(self, domain_factory: Callable[[], D]) -> None:
         if self.callback is None:
             callbacks = []
         else:
-            callbacks = [
-                _DOCallback(callback=self.callback, domain=self.domain, solver=self)
-            ]
+            callbacks = [_DOCallback(callback=self.callback, solver=self)]
         copy_dict_params = deepcopy(self.dict_params)
         if "callbacks" in copy_dict_params:
             callbacks = callbacks + copy_dict_params.pop("callbacks")
@@ -258,11 +256,9 @@ def _is_policy_defined_for(self, observation: D.T_agent[D.T_observation]) -> boo
 class _DOCallback(Callback):
     def __init__(
         self,
-        callback: Callable[[Domain, DOSolver], bool],
-        domain: Domain,
-        solver: Solver,
+        callback: Callable[[DOSolver], bool],
+        solver: DOSolver,
     ):
-        self.domain = domain
         self.solver = solver
         self.callback = callback
 
@@ -280,5 +276,5 @@ def on_step_end(
             If `True`, the optimization process is stopped, else it goes on.
 
         """
-        stopping = self.callback(self.domain, self.solver)
+        stopping = self.callback(self.solver)
         return stopping

tests/scheduling/test_scheduling.py

@@ -955,10 +955,9 @@ def __init__(self, max_iter=2):
         self.max_iter = max_iter
         self.iter = 0
 
-    def __call__(self, domain, solver):
+    def __call__(self, solver):
         self.iter += 1
         logger.warning(f"End of iteration #{self.iter}.")
-        assert isinstance(domain, ToyRCPSPDomain)
         assert isinstance(solver, DOSolver)
         stopping = self.iter >= self.max_iter
         return stopping