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

bundle models have arrived

Browse Source
This commit is contained in:
Josh Burman
2021-12-17 00:55:27 +00:00
parent dc696b47ac
commit 95aad63db6
5 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/service_helper.py
View File

@ -2,7 +2,7 @@ import csv
import io
import re
def items_csv_to_dict(items_csv_reader, irt_model):
def items_csv_to_dict(items_csv_reader):
items = []
headers = []

6
app/helpers/solver_helper.py
View File

@ -25,12 +25,12 @@ def build_constraints(solver_run, problem, items):
* 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':
bundles = solver_run.bundles(attribute.id)
# TODO: account for many different bundle types, since the id condition in L33 could yield duplicates
total_bundles = randint(constraint.minimum, constraint.maximum)
selected_bundles = sample(bundles, total_bundles)
selected_bundles = sample(solver_run.bundles, total_bundles)
for bundle in selected_bundles:
problem += lpSum([items[item.id] for item in solver_run.items if getattr(item, bundle["type"], None) == bundle['id']]) == bundle['count'], f'Bundle constraint for {bundle["type"]} ({bundle["id"]})'
problem += lpSum([items[item.id] for item in solver_run.items if getattr(item, bundle.type, None) == bundle.id]) == bundle.count, f'Bundle constraint for {bundle.type} ({bundle.id})'
return problem