more better well factoredness

This commit is contained in:
Jared Numrab
2021-11-22 04:10:53 -05:00
parent f1a6b53265
commit c2d1ccb2bd
5 changed files with 55 additions and 29 deletions

View File

@ -64,3 +64,15 @@ def solution_to_file(buffer, total_form_items, forms):
def key_to_uuid(key):
return re.split("_", key)[0]
def solution_items(variables, solver_run):
form_items = []
for v in variables:
if v.varValue > 0:
item_id = v.name.replace('Item_', '')
item = solver_run.get_item(item_id)
# add item to list and then remove from master item list
form_items.append(item)
return form_items

View File

@ -0,0 +1,23 @@
from pulp import lpSum
def build_constraints(solver_run, problem, items):
total_form_items = solver_run.total_form_items
constraints = solver_run.constraints
for constraint in constraints:
attribute = constraint.reference_attribute
min = constraint.minimum
max = constraint.maximum
con = dict(zip([item.id for item in solver_run.items],
[item.attribute_exists(attribute)
for item in solver_run.items]))
# print([con[item.id] * items[item.id] for item in solver_items])
problem += lpSum([con[item.id]
* items[item.id]
for item in solver_run.items]) >= round(total_form_items * (min / 100)), f'{attribute.id} - {attribute.value} - min'
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'
return problem