Merge branch 'hotfix/QUANT-3375-obj-relax' into hotfix/1.8.1

This commit is contained in:
Joshua Burman 2023-12-14 12:25:58 -05:00
commit 6ad573dc9d

View File

@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
from pydantic import BaseModel from pydantic import BaseModel
from typing import Any, List from typing import Any, List
from pulp import LpProblem, LpVariable, LpStatus, lpSum from pulp import LpProblem, LpVariable, LpStatus, lpSum, COIN
import logging import logging
@ -46,7 +46,7 @@ class Problem(BaseModel):
# creating problem multi-objective functions # creating problem multi-objective functions
objective_functions = solver_run.objective_function.for_problem(self, solver_run) objective_functions = solver_run.objective_function.for_problem(self, solver_run)
self.problem.sequentialSolve(objective_functions, None, None, pulp.COIN(gapRel=0.2, timeLimit=300)) self.problem.sequentialSolve(objective_functions, None, None, COIN(gapRel=0.2, timeLimit=300))
return self.problem return self.problem