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

enforce bundle first ordering if bundles ordering is true

Browse Source
This commit is contained in:
Josh Burman 2022-04-27 15:54:59 +00:00
parent 86d6d2fcec
commit a3ca233953
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/service_helper.py
View File

@ -125,7 +125,8 @@ def solution_items(variables: list, solver_run: SolverRun) -> Tuple[list]:
if bundle: form_bundles.append(bundle) if bundle: form_bundles.append(bundle)
for bundle in form_bundles: for bundle in form_bundles:
for item in bundle.ordered_items: items = bundle.ordered_items if solver_run.bundle_first_ordering else bundle.items
for item in items:
final_items.append(item) final_items.append(item)
for item in form_items: for item in form_items:

1
app/models/solver_run.py
View File

@ -15,6 +15,7 @@ from models.advanced_options import AdvancedOptions
class SolverRun(BaseModel): class SolverRun(BaseModel):
items: List[Item] = [] items: List[Item] = []
bundles: List[Bundle] = [] bundles: List[Bundle] = []
bundle_first_ordering: bool = True
constraints: List[Constraint] constraints: List[Constraint]
irt_model: IRTModel irt_model: IRTModel
objective_function: ObjectiveFunction objective_function: ObjectiveFunction