add constructed bundles to constraints, minor refatoring

This commit is contained in:
Josh Burman
2021-12-15 19:37:16 +00:00
parent 4afe81e15b
commit bfeb3c4207
3 changed files with 17 additions and 4 deletions

View File

@ -63,11 +63,11 @@ class LoftService(Base):
# create problem
problem = LpProblem("ata-form-generate", LpMinimize)
# constraints
# form item count constraint
problem += lpSum([items[item.id]
for item in self.solver_run.items]) == self.solver_run.total_form_items, 'Total form items'
# generic constraints
# dynamic constraints
problem = solver_helper.build_constraints(self.solver_run, problem, items)
# multi-objective functions and constraints
@ -90,8 +90,7 @@ class LoftService(Base):
# add return items and create as a form
form_items = service_helper.solution_items(problem.variables(), self.solver_run)
# remove items
self.solver_run.remove_items(form_items)
# add form to solution
solution.forms.append(Form.create(form_items, self.solver_run, LpStatus[problem.status]))