From 4b08ad253c174eb38191a90d235d70dcc0457687 Mon Sep 17 00:00:00 2001 From: Joshua Burman Date: Thu, 10 Feb 2022 20:45:46 -0500 Subject: [PATCH] testing tif and tcc limits --- app/services/loft_service.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/loft_service.py b/app/services/loft_service.py index 64914f9..f932361 100644 --- a/app/services/loft_service.py +++ b/app/services/loft_service.py @@ -173,14 +173,14 @@ class LoftService(Base): ] + [ item.iif(self.solver_run, target.theta) * items[item.id] for item in self.solver_run.items - ]) >= target.value - 8, f'max tif theta ({target.theta}) target value {target.value}' + ]) >= target.value - 5, f'max tif theta ({target.theta}) target value {target.value}' problem += lpSum([ bundle.tif(self.solver_run.irt_model, target.theta) * bundles[bundle.id] for bundle in self.solver_run.bundles ] + [ item.iif(self.solver_run, target.theta) * items[item.id] for item in self.solver_run.items - ]) <= target.value + 8, f'min tif theta ({target.theta}) target value {target.value}' + ]) <= target.value + 5, f'min tif theta ({target.theta}) target value {target.value}' for target in self.solver_run.objective_function.tcc_targets: # tcc = lpSum([item.irf(self.solver_run, target.theta)*items[item.id] @@ -192,14 +192,14 @@ class LoftService(Base): ] + [ item.irf(self.solver_run, target.theta) * items[item.id] for item in self.solver_run.items - ]) >= target.value - 20, f'max tcc theta ({target.theta}) target value {target.value}' + ]) >= target.value - 15, f'max tcc theta ({target.theta}) target value {target.value}' problem += lpSum([ bundle.trf(self.solver_run.irt_model, target.theta) * bundles[bundle.id] for bundle in self.solver_run.bundles ] + [ item.irf(self.solver_run, target.theta) * items[item.id] for item in self.solver_run.items - ]) <= target.value + 20, f'min tcc theta ({target.theta}) target value {target.value}' + ]) <= target.value + 15, f'min tcc theta ({target.theta}) target value {target.value}' # solve problem logging.info('Solving...')