From 07af0ac0ac7a8530fd888574c9f9c6933342ccc7 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Fri, 10 Nov 2023 19:12:25 -0500 Subject: [PATCH] cleanup --- app/models/problem.py | 2 +- app/models/tcc_target.py | 2 +- app/models/tif_target.py | 2 +- app/services/form_generation_service.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/problem.py b/app/models/problem.py index 13f5ee0..e9171cc 100644 --- a/app/models/problem.py +++ b/app/models/problem.py @@ -90,7 +90,7 @@ class Problem(BaseModel): except ValueError as error: logging.error(error) raise ItemGenerationError( - "Bundle min and/or max larger than bundle amount provided", + error.msg, error.args[0]) diff --git a/app/models/tcc_target.py b/app/models/tcc_target.py index 6c29181..8e78e91 100644 --- a/app/models/tcc_target.py +++ b/app/models/tcc_target.py @@ -28,4 +28,4 @@ class TccTarget(Target): problem_handler.solver_items_var[item.id] for item in problem_handler.items ]) <= self.maximum( - ), f'Max TCC theta({self.theta}) at target {self.value} with a drift % of {self.drift}' \ No newline at end of file + ), f'Max TCC theta({self.theta}) at target {self.value} with a drift % of {self.drift}' diff --git a/app/models/tif_target.py b/app/models/tif_target.py index fac10c2..04ed1c6 100644 --- a/app/models/tif_target.py +++ b/app/models/tif_target.py @@ -28,4 +28,4 @@ class TifTarget(Target): problem_handler.solver_items_var[item.id] for item in problem_handler.items ]) <= self.maximum( - ), f'Max TIF theta({self.theta}) at target {self.value} with a drift % of {self.drift}' \ No newline at end of file + ), f'Max TIF theta({self.theta}) at target {self.value} with a drift % of {self.drift}' diff --git a/app/services/form_generation_service.py b/app/services/form_generation_service.py index a5bcaf8..6f63b20 100644 --- a/app/services/form_generation_service.py +++ b/app/services/form_generation_service.py @@ -85,7 +85,6 @@ class FormGenerationService(Base): problem_handler.generate_constraints(self.solver_run, current_drift) problem = problem_handler.solve() - logging.info(problem) if LpStatus[problem.status] == 'Infeasible': logging.info( @@ -99,6 +98,7 @@ class FormGenerationService(Base): logging.info( f'No feasible solution found for Form {form_number}!' ) + logging.error(problem) self.add_form_to_solution(problem, solution)