modified for new base

This commit is contained in:
Josh Burman
2021-12-18 07:27:16 +00:00
2 changed files with 25 additions and 25 deletions

View File

@ -67,7 +67,11 @@ class LoftService(Base):
# create problem
problem = LpProblem("ata-form-generate", LpMinimize)
# form item count constraint
# dummy objective function, because it just makes things easier™
problem += lpSum([items[item.id]
for item in self.solver_run.items])
# constraints
problem += lpSum([items[item.id]
for item in self.solver_run.items]) == self.solver_run.total_form_items, 'Total form items'
@ -76,21 +80,15 @@ class LoftService(Base):
# multi-objective functions and constraints
for target in self.solver_run.objective_function.tif_targets:
tif = lpSum([item.iif(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items])
problem += lpSum([item.iif(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value, f'min tif theta ({target.theta}) target value {target.value}'
problem_objection_functions.append(tif)
for target in self.solver_run.objective_function.tcc_targets:
tcc = lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items])
problem += lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value, f'min tcc theta ({target.theta}) target value {target.value}'
problem_objection_functions.append(tcc)
# solve problem
problem.sequentialSolve(problem_objection_functions)
problem.solve()
# add return items and create as a form
form_items = service_helper.solution_items(problem.variables(), self.solver_run)