diff --git a/app/helpers/service_helper.py b/app/helpers/service_helper.py index 66b3fd3..2c9aa2e 100644 --- a/app/helpers/service_helper.py +++ b/app/helpers/service_helper.py @@ -57,7 +57,7 @@ def solution_to_file(buffer, total_form_items, forms): row = [form.status] for result in form.tif_results + form.tcc_results: - row += [f'value - {result.value}\nresult - {round(result.result, 2)}'] + row += [f'target - {result.value}\nresult - {round(result.result, 2)}'] # provide generated items and cut score row += [round(form.cut_score, 2)] + [item.id for item in form.items] diff --git a/app/services/loft_service.py b/app/services/loft_service.py index 32c9274..3afee56 100644 --- a/app/services/loft_service.py +++ b/app/services/loft_service.py @@ -78,7 +78,7 @@ class LoftService(Base): # dynamic constraints problem = solver_helper.build_constraints(self.solver_run, problem, items) - # multi-objective functions and constraints + # multi-objective constraints for target in self.solver_run.objective_function.tif_targets: 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}'