Skip to content

Commit

Permalink
Remove deprecated code related to lns
Browse files Browse the repository at this point in the history
- remove old lns solvers and constraint handlers for rcpsp and rcpsp_multiskill,
  replaced by generic_rcpsp_tools ones
- remove get_solution() in facility cp solver, previously used by lns
  solvers.
  • Loading branch information
nhuet committed May 7, 2024
1 parent a9955d2 commit a7409f6
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 3,975 deletions.
25 changes: 0 additions & 25 deletions discrete_optimization/facility/solvers/facility_cp_solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,28 +152,3 @@ def retrieve_solution(
"""
facility = kwargs["facility_for_customer"]
return FacilitySolution(self.problem, [f - 1 for f in facility])

@deprecated(
deprecated_in="0.1", details="Use rather initial solution provider utilities"
)
def get_solution(self, **kwargs: Any) -> FacilitySolution:
greedy_start = kwargs.get("greedy_start", True)
if greedy_start:
logger.info("Computing greedy solution")
greedy_solver = GreedySolverDistanceBased(self.problem)
result = greedy_solver.solve()
solution = result.get_best_solution()
if solution is None:
raise RuntimeError(
"greedy_solver.solve().get_best_solution() " "should not be None."
)
if not isinstance(solution, FacilitySolution):
raise RuntimeError(
"greedy_solver.solve().get_best_solution() "
"should be a FacilitySolution."
)
else:
logger.info("Get dummy solution")
solution = self.problem.get_dummy_solution()
logger.info("Greedy Done")
return solution
35 changes: 0 additions & 35 deletions discrete_optimization/rcpsp/rcpsp_solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
)
from discrete_optimization.rcpsp.rcpsp_model import RCPSPModel
from discrete_optimization.rcpsp.rcpsp_model_preemptive import RCPSPModelPreemptive
from discrete_optimization.rcpsp.solver.cp_lns_solver import (
LargeNeighborhoodSearchRCPSP,
)
from discrete_optimization.rcpsp.solver.cp_solvers import (
CP_MRCPSP_MZN,
CP_MRCPSP_MZN_PREEMPTIVE,
Expand All @@ -38,7 +35,6 @@
)
from discrete_optimization.rcpsp.solver.cpm import CPM
from discrete_optimization.rcpsp.solver.cpsat_solver import CPSatRCPSPSolver
from discrete_optimization.rcpsp.solver.rcpsp_cp_lns_solver import LNS_CP_RCPSP_SOLVER
from discrete_optimization.rcpsp.solver.rcpsp_ga_solver import (
GA_MRCPSP_Solver,
GA_RCPSP_Solver,
Expand Down Expand Up @@ -115,36 +111,13 @@
LNS_LP_RCPSP_SOLVER,
{"nb_iteration_lns": 100, "lp_solver": MilpSolverName.CBC},
),
(
LNS_CP_RCPSP_SOLVER,
{"nb_iteration_lns": 100, "nb_iteration_no_improvement": 100},
),
],
"lns-lp": [
(
LNS_LP_RCPSP_SOLVER,
{"nb_iteration_lns": 100, "lp_solver": MilpSolverName.CBC},
)
],
"lns-cp": [
(
LNS_CP_RCPSP_SOLVER,
{"nb_iteration_lns": 100, "nb_iteration_no_improvement": 100},
)
],
"lns-cp-rcpsp": [
(
LargeNeighborhoodSearchRCPSP,
{
"nb_iteration_lns": 100,
"nb_iteration_no_improvement": 100,
"parameters_cp": ParametersCP.default(),
"cut_part": 1,
"add_objective_makespan": False,
"fraction_subproblem": 0.6,
},
)
],
"lns-scheduling": [
(
LargeNeighborhoodSearchScheduling,
Expand Down Expand Up @@ -189,9 +162,6 @@
LNS_LP_RCPSP_SOLVER: [
RCPSPModel,
],
LNS_CP_RCPSP_SOLVER: [
RCPSPModel,
],
LS_RCPSP_Solver: [
RCPSPModelPreemptive,
RCPSPModelSpecialConstraintsPreemptive,
Expand All @@ -207,11 +177,6 @@
RCPSPModelSpecialConstraintsPreemptive,
RCPSPModel,
],
LargeNeighborhoodSearchRCPSP: [
RCPSPModelPreemptive,
RCPSPModelSpecialConstraintsPreemptive,
RCPSPModel,
],
LargeNeighborhoodSearchScheduling: [
RCPSPModelPreemptive,
RCPSPModelSpecialConstraintsPreemptive,
Expand Down
167 changes: 0 additions & 167 deletions discrete_optimization/rcpsp/solver/cp_lns_methods_clean.py

This file was deleted.

Loading

0 comments on commit a7409f6

Please sign in to comment.