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

modified for new base

Browse Source
This commit is contained in:
Josh Burman 2021-12-18 07:27:16 +00:00
commit b3bf662c2f
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/helpers/service_helper.py
View File

@ -13,24 +13,26 @@ def items_csv_to_dict(items_csv_reader):
else: else:
item = { 'attributes': [] } item = { 'attributes': [] }
for key, col in enumerate(headers): # ensure that the b param is formatted correctly
if key == 0: if len(re.findall(".", row[len(headers) - 1])) >= 3:
item[col] = row[key] for key, col in enumerate(headers):
if key == 2: if key == 0:
# make sure id exists item[col] = row[key]
if row[key]: if key == 2:
item['passage_id'] = row[key] # make sure passage id exists
# b param - temp fix! use irt model b param for proper reference if row[key]:
elif key == (1 - len(headers)): item['passage_id'] = row[key]
item['b_param'] = row[key] # b param - tmep fix! use irt model b param for proper reference
elif key > 2: elif key == len(headers) - 1:
item['attributes'].append({ item['b_param'] = row[key]
'id': col, elif key > 2 and key < len(headers) - 1:
'value': row[key], item['attributes'].append({
'type': 'metadata' 'id': col,
}) 'value': row[key],
'type': 'metadata'
})
items.append(item) items.append(item)
return items return items

14
app/services/loft_service.py
View File

@ -67,7 +67,11 @@ class LoftService(Base):
# create problem # create problem
problem = LpProblem("ata-form-generate", LpMinimize) problem = LpProblem("ata-form-generate", LpMinimize)
# form item count constraint # dummy objective function, because it just makes things easier™
problem += lpSum([items[item.id]
for item in self.solver_run.items])
# constraints
problem += lpSum([items[item.id] problem += lpSum([items[item.id]
for item in self.solver_run.items]) == self.solver_run.total_form_items, 'Total form items' for item in self.solver_run.items]) == self.solver_run.total_form_items, 'Total form items'
@ -76,21 +80,15 @@ class LoftService(Base):
# multi-objective functions and constraints # multi-objective functions and constraints
for target in self.solver_run.objective_function.tif_targets: for target in self.solver_run.objective_function.tif_targets:
tif = lpSum([item.iif(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items])
problem += lpSum([item.iif(self.solver_run, target.theta)*items[item.id] problem += lpSum([item.iif(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value, f'min tif theta ({target.theta}) target value {target.value}' for item in self.solver_run.items]) <= target.value, f'min tif theta ({target.theta}) target value {target.value}'
problem_objection_functions.append(tif)
for target in self.solver_run.objective_function.tcc_targets: for target in self.solver_run.objective_function.tcc_targets:
tcc = lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items])
problem += lpSum([item.irf(self.solver_run, target.theta)*items[item.id] problem += lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value, f'min tcc theta ({target.theta}) target value {target.value}' for item in self.solver_run.items]) <= target.value, f'min tcc theta ({target.theta}) target value {target.value}'
problem_objection_functions.append(tcc)
# solve problem # solve problem
problem.sequentialSolve(problem_objection_functions) problem.solve()
# add return items and create as a form # add return items and create as a form
form_items = service_helper.solution_items(problem.variables(), self.solver_run) form_items = service_helper.solution_items(problem.variables(), self.solver_run)