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

Merge pull request #21 from yardstick/feature/QUANT-1308-tif-discrepancy

Browse Source 
QUANT-1308: TIF Discrepancy
This commit is contained in:
brmnjsh 2021-12-20 14:06:47 -05:00 committed by GitHub
commit 4c30b50c36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/service_helper.py
View File

@ -13,11 +13,13 @@ def items_csv_to_dict(items_csv_reader, irt_model):
else:
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):
if key == 0:
item[col] = row[key]
# 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]
elif key > 1:
item['attributes'].append({

4
app/main.py
View File

@ -19,9 +19,9 @@ class ServiceListener(SqsListener):
logging.info('Process complete for %s', service.file_name)
def main():
logging.info('Starting Solver Service (v1.0.1)...')
logging.info('Starting Solver Service (v1.0.9)...')
listener = ServiceListener(
'measure-development-solver-ingest',
os.environ['SQS_QUEUE'],
region_name=os.environ['AWS_REGION'],
aws_access_key=os.environ['AWS_ACCESS_KEY_ID'],
aws_secret_key=os.environ['AWS_SECRET_ACCESS_KEY'],

12
app/services/loft_service.py
View File

@ -63,6 +63,10 @@ class LoftService(Base):
# create problem
problem = LpProblem("ata-form-generate", LpMinimize)
# 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]
for item in self.solver_run.items]) == self.solver_run.total_form_items, 'Total form items'
@ -72,21 +76,15 @@ class LoftService(Base):
# multi-objective functions and constraints
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]
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:
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]
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
problem.sequentialSolve(problem_objection_functions)
problem.solve()
# add return items and create as a form
form_items = service_helper.solution_items(problem.variables(), self.solver_run)