modified for new base
This commit is contained in:
commit
b3bf662c2f
@ -13,17 +13,19 @@ def items_csv_to_dict(items_csv_reader):
|
|||||||
else:
|
else:
|
||||||
item = { 'attributes': [] }
|
item = { 'attributes': [] }
|
||||||
|
|
||||||
|
# ensure that the b param is formatted correctly
|
||||||
|
if len(re.findall(".", row[len(headers) - 1])) >= 3:
|
||||||
for key, col in enumerate(headers):
|
for key, col in enumerate(headers):
|
||||||
if key == 0:
|
if key == 0:
|
||||||
item[col] = row[key]
|
item[col] = row[key]
|
||||||
if key == 2:
|
if key == 2:
|
||||||
# make sure id exists
|
# make sure passage id exists
|
||||||
if row[key]:
|
if row[key]:
|
||||||
item['passage_id'] = row[key]
|
item['passage_id'] = row[key]
|
||||||
# b param - temp fix! use irt model b param for proper reference
|
# b param - tmep fix! use irt model b param for proper reference
|
||||||
elif key == (1 - len(headers)):
|
elif key == len(headers) - 1:
|
||||||
item['b_param'] = row[key]
|
item['b_param'] = row[key]
|
||||||
elif key > 2:
|
elif key > 2 and key < len(headers) - 1:
|
||||||
item['attributes'].append({
|
item['attributes'].append({
|
||||||
'id': col,
|
'id': col,
|
||||||
'value': row[key],
|
'value': row[key],
|
||||||
|
@ -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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user