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

more better well factoredness

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

31
app/services/loft_service.py
View File

@ -2,7 +2,7 @@ import os, json, random, io, logging
from pulp import *
from helpers import aws_helper, tar_helper, csv_helper, service_helper, irt_helper
from helpers import aws_helper, tar_helper, csv_helper, service_helper, solver_helper
from models.solver_run import SolverRun
from models.solution import Solution
@ -54,8 +54,6 @@ class LoftService(Base):
# setup vars
items = LpVariable.dicts(
"Item", [item.id for item in self.solver_run.items], lowBound=1, upBound=1, cat='Binary')
used = dict(zip([item.id for item in self.solver_run.items],
[1 for item in self.solver_run.items]))
problem_objection_functions = []
# create problem
@ -65,16 +63,8 @@ class LoftService(Base):
problem += lpSum([items[item.id]
for item in self.solver_run.items]) == self.solver_run.total_form_items, 'Total form items'
for constraint in self.solver_run.constraints:
con = dict(zip([item.id for item in self.solver_run.items],
[item.attribute_exists(constraint.reference_attribute.id, constraint.reference_attribute.value)
for item in self.solver_run.items]))
problem += lpSum([con[item.id]
* items[item.id]
for item in self.solver_run.items]) >= round(self.solver_run.total_form_items * (constraint.minimum / 100)), f'{constraint.reference_attribute.id} - {constraint.reference_attribute.value} - min'
problem += lpSum([con[item.id]
* items[item.id]
for item in self.solver_run.items]) <= round(self.solver_run.total_form_items * (constraint.maximum / 100)), f'{constraint.reference_attribute.id} - {constraint.reference_attribute.value} - max'
# generic constraints
problem = solver_helper.build_constraints(self.solver_run, problem, items)
# multi-objective functions and constraints
for target in self.solver_run.objective_function.tif_targets:
@ -96,18 +86,9 @@ class LoftService(Base):
if LpStatus[problem.status] == 'Optimized':
# add return items and create as a form
form_items = []
for v in problem.variables():
count = 0
if v.varValue > 0:
item_id = v.name.replace('Item_', '')
for item in self.solver_run.items:
if str(item.id) == item_id:
# add item to list
form_items.append(item)
# remove ids from master items list
self.solver_run.items.remove(item)
form_items = service_helper.solution_items(problem.variables(), self.solver_run)
# remove items
self.solver_run.remove_items(form_items)
# add form to solution
solution.forms.append(Form.create(form_items, self.solver_run))