Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New attribute in CPSolvers : status_solver #89

Merged
merged 1 commit into from
Dec 2, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions discrete_optimization/generic_tools/cp_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
from abc import abstractmethod
from datetime import timedelta
from enum import Enum
from typing import Any, Optional
from typing import Any, Optional, Union

from minizinc import Instance, Model
from minizinc import Instance, Status

from discrete_optimization.generic_tools.do_solver import SolverDO
from discrete_optimization.generic_tools.result_storage.result_storage import (
Expand Down Expand Up @@ -147,12 +147,28 @@ class SignEnum(Enum):
UP = ">"


class StatusSolver(Enum):
SATISFIED = "SATISFIED"
UNSATISFIABLE = "UNSATISFIABLE"
OPTIMAL = "OPTIMAL"
UNKNOWN = "UNKNOWN"


map_mzn_status_to_do_status = {
Status.SATISFIED: StatusSolver.SATISFIED,
Status.UNSATISFIABLE: StatusSolver.UNSATISFIABLE,
Status.OPTIMAL_SOLUTION: StatusSolver.OPTIMAL,
Status.UNKNOWN: StatusSolver.UNKNOWN,
}


class CPSolver(SolverDO):
"""
Additional function to be implemented by a CP Solver.
"""

instance: Optional[Any]
status_solver: Optional[StatusSolver] = None

@abstractmethod
def init_model(self, **args):
Expand Down Expand Up @@ -180,6 +196,9 @@ def solve(
) -> ResultStorage:
...

def get_status_solver(self) -> Union[StatusSolver, None]:
return self.status_solver


class MinizincCPSolver(CPSolver):
"""CP solver wrapping a minizinc solver."""
Expand Down Expand Up @@ -230,4 +249,5 @@ def solve(
logger.info("Solving finished")
logger.debug(result.status)
logger.debug(result.statistics)
self.status_solver = map_mzn_status_to_do_status[result.status]
return self.retrieve_solutions(result=result, parameters_cp=parameters_cp)