jshbrmn/irt-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing tif and tcc limits

Browse Source
This commit is contained in:
Joshua Burman 2022-02-10 20:45:46 -05:00
parent deb6b9014e
commit 4b08ad253c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/loft_service.py
View File

@ -173,14 +173,14 @@ class LoftService(Base):
] + [ ] + [
item.iif(self.solver_run, target.theta) * items[item.id] item.iif(self.solver_run, target.theta) * items[item.id]
for item in self.solver_run.items 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([ problem += lpSum([
bundle.tif(self.solver_run.irt_model, target.theta) * bundle.tif(self.solver_run.irt_model, target.theta) *
bundles[bundle.id] for bundle in self.solver_run.bundles bundles[bundle.id] for bundle in self.solver_run.bundles
] + [ ] + [
item.iif(self.solver_run, target.theta) * items[item.id] item.iif(self.solver_run, target.theta) * items[item.id]
for item in self.solver_run.items 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: for target in self.solver_run.objective_function.tcc_targets:
# tcc = lpSum([item.irf(self.solver_run, target.theta)*items[item.id] # 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] item.irf(self.solver_run, target.theta) * items[item.id]
for item in self.solver_run.items 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([ problem += lpSum([
bundle.trf(self.solver_run.irt_model, target.theta) * bundle.trf(self.solver_run.irt_model, target.theta) *
bundles[bundle.id] for bundle in self.solver_run.bundles bundles[bundle.id] for bundle in self.solver_run.bundles
] + [ ] + [
item.irf(self.solver_run, target.theta) * items[item.id] item.irf(self.solver_run, target.theta) * items[item.id]
for item in self.solver_run.items 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 # solve problem
logging.info('Solving...') logging.info('Solving...')