reverting to basic cases

This commit is contained in:
Joshua Burman
2022-02-09 16:33:38 -05:00
parent 2232b3342c
commit ab9b5525a4
4 changed files with 72 additions and 157 deletions

View File

@ -9,7 +9,6 @@ from models.solver_run import SolverRun
from models.solution import Solution
from models.form import Form
from models.item import Item
from models.bundle import Bundle
from services.base import Base
@ -26,7 +25,7 @@ class LoftService(Base):
logging.error(error)
self.result = self.stream_to_s3_bucket(ItemGenerationError("Provided params causing error in calculation results"))
def create_solver_run_from_attributes(self) -> SolverRun:
def create_solver_run_from_attributes(self):
logging.info('Retrieving attributes from message...')
# get s3 object
self.key = aws_helper.get_key_from_message(self.source)
@ -53,38 +52,56 @@ class LoftService(Base):
return solver_run
def generate_solution(self) -> Solution:
logging.info('Generating Solution...')
def generate_solution(self):
# unsolved solution
solution = Solution(
response_id=random.randint(100, 5000),
forms=[]
)
# counter for number of forms
f = 0
# setup vars
items = LpVariable.dicts(
"Item", [item.id for item in self.solver_run.items], lowBound=1, upBound=1, cat='Binary')
# check if problem request has bundles
bundle_constraint = self.solver_run.get_constraint_by_type('bundle')
# iterate for number of forms that require creation
# currently creates distinc forms with no item overlap
while f < self.solver_run.total_forms:
# unsolved solution
solution = Solution(
response_id=random.randint(100, 5000),
forms=[]
)
# setup vars
items = LpVariable.dicts(
"Item", [item.id for item in self.solver_run.items], lowBound=1, upBound=1, cat='Binary')
bundles = LpVariable.dicts(
"Bundle", [bundle.id for bundle in self.solver_run.bundles], lowBound=1, upBound=1, cat='Binary')
# initiate problem
problem = None
problem_objection_functions = []
if bundle_constraint:
problem = self.recursive_solve(items, int(bundle_constraint.minimum), int(bundle_constraint.maximum))
else: # no bundles
problem = self.solve(items)
# create problem
problem = LpProblem("ata-form-generate", LpMinimize)
# successfull form, increment and exit out of loop
f += 1
# 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'
# dynamic constraints
problem = solver_helper.build_constraints(self.solver_run, problem, items, bundles)
# 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 - 8, f'max tif theta ({target.theta}) target value {target.value}'
problem += lpSum([item.iif(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value + 8, f'min tif theta ({target.theta}) target value {target.value}'
for target in self.solver_run.objective_function.tcc_targets:
problem += lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) >= target.value - 20, f'max tcc theta ({target.theta}) target value {target.value}'
problem += lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value + 20, f'min tcc theta ({target.theta}) target value {target.value}'
# solve problem
problem.solve()
# add return items and create as a form
form_items = service_helper.solution_items(problem.variables(), self.solver_run)
@ -92,59 +109,10 @@ class LoftService(Base):
# add form to solution
solution.forms.append(Form.create(form_items, self.solver_run, LpStatus[problem.status]))
return solution
def recursive_solve(self, items, min, max, attempts = 800) -> LpProblem:
bundles_amount = random.randint(min, max)
logging.info(f'min: {min}, max: {max}, bundles amount: {bundles_amount}')
selected_bundles = solver_helper.get_random_bundles(
self.solver_run.total_form_items,
bundles_amount,
self.solver_run.bundles)
problem = self.solve(items, selected_bundles)
# if optimal solution found, end recursion
if LpStatus[problem.status] == 'Optimal' or attempts == 0:
return problem
else:
logging.info('recursing...')
logging.info(attempts)
return self.recursive_solve(items, min, max, attempts - 1)
def solve(self, items: list[Item], bundles: list[Bundle] or None = None) -> LpProblem:
# 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'
# dynamic constraints
problem = solver_helper.build_constraints(self.solver_run, problem, items, bundles)
# 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 - 4, f'max tif theta ({target.theta}) target value {target.value}'
problem += lpSum([item.iif(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value + 4, f'min tif theta ({target.theta}) target value {target.value}'
for target in self.solver_run.objective_function.tcc_targets:
problem += lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) >= target.value - 18, f'max tcc theta ({target.theta}) target value {target.value}'
problem += lpSum([item.irf(self.solver_run, target.theta)*items[item.id]
for item in self.solver_run.items]) <= target.value + 18, f'min tcc theta ({target.theta}) target value {target.value}'
# solve problem
problem.solve()
return problem
# successfull form, increment
f += 1
return solution
def stream_to_s3_bucket(self, error = None):
self.file_name = f'{service_helper.key_to_uuid(self.key)}.csv'