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

@ -1,4 +1,5 @@
from pulp import lpSum
from random import randint, sample
def build_constraints(solver_run, problem, items):
total_form_items = solver_run.total_form_items
@ -19,5 +20,14 @@ def build_constraints(solver_run, problem, items):
problem += lpSum([con[item.id]
* items[item.id]
for item in solver_run.items]) <= round(total_form_items * (max / 100)), f'{attribute.id} - {attribute.value} - max'
elif attribute.type == 'bundle':
# currently only using passage bundles, but will eventually make more dynamic for many bundle types
bundles = solver_run.bundles('passage')
total_bundles = randint(constraint.minimum, constraint.maximum)
selected_bundles = sample(bundles, total_bundles)
for bundle in selected_bundles:
problem += lpSum([items[item.id] for item in solver_run.items if item.passage == bundle['id']]) == bundle['count'], f'Bundle constrain for {bundle["type"]} ({bundle["id"]})'
return problem