removed old code and fixed some comments, for clarification

This commit is contained in:
Joshua Burman
2022-02-09 11:16:11 -05:00
parent 14a07ff9b2
commit 52615ab663
2 changed files with 2 additions and 18 deletions

View File

@ -77,25 +77,8 @@ class LoftService(Base):
# initiate problem
problem = None
count = 0
if bundle_constraint:
# # generate valid bundle combinations
# bundle_combinations = solver_helper.valid_bundle_combinations(
# self.solver_run.total_form_items,
# int(bundle_constraint.maximum),
# int(bundle_constraint.minimum),
# self.solver_run.bundles)
# # scramble bundle_combinations to ensure distinctiveness for each form generated
# random.shuffle(bundle_combinations)
# for bundles in bundle_combinations:
# problem = self.solve(items, bundles)
# # if optimal solution found, break loop
# if LpStatus[problem.status] == 'Optimal':
# break
bundles_amount = random.randint(int(bundle_constraint.minimum), int(bundle_constraint.maximum))
problem = self.recursive_solve(items, bundles_amount)
else: # no bundles
@ -120,7 +103,7 @@ class LoftService(Base):
problem = self.solve(items, selected_bundles)
# if optimal solution found, break loop
# if optimal solution found, end recursion
if LpStatus[problem.status] == 'Optimal' or attempts == 0:
return problem
else: