diff --git a/python/src/ffcraft_solver/__main__.py b/python/src/ffcraft_solver/__main__.py index effa028..20c1966 100644 --- a/python/src/ffcraft_solver/__main__.py +++ b/python/src/ffcraft_solver/__main__.py @@ -203,7 +203,7 @@ class Solution: def request_solve() -> True: loggers.add_log('Solver initialised. Please stand by.') - all_results = solver.Solver(user, recipe) + all_results = solver.Solver(user, recipe, loggers) best_quality.result = all_results.best_quality least_steps.result = all_results.least_steps safe_50.result = all_results.safe_50 diff --git a/python/src/ffcraft_solver/modules/solver.py b/python/src/ffcraft_solver/modules/solver.py index 015d501..5c2ae15 100644 --- a/python/src/ffcraft_solver/modules/solver.py +++ b/python/src/ffcraft_solver/modules/solver.py @@ -68,7 +68,7 @@ Remaining CP: {self.remaining_cp}""" if self.steps != 15 and self.steps != 29 and self.steps != 44: saved_lines.append('/echo Craft complete ! ') else: - loggers.log(f'No completion message in macro because rotation is exactly {self.steps} steps.') + self.loggers.log(f'No completion message in macro because rotation is exactly {self.steps} steps.') if self.steps > 15: saved_lines.insert(14, '/echo Macro 1 complete ') @@ -94,7 +94,7 @@ Remaining CP: {self.remaining_cp}""" class Solver: - def __init__(self, user: User, recipe: Recipe): + def __init__(self, user: User, recipe: Recipe, loggers: log.Loggers): self.durability = recipe.durability self.progress = recipe.progress self.quality = recipe.quality @@ -113,6 +113,8 @@ class Solver: self.threads = 8 self.verbose = 0 + self.loggers = loggers + self.solutions = [] self.best_quality = None self.least_steps = None @@ -149,8 +151,8 @@ class Solver: done = True if not done: - loggers.add_log('Could not find a rotation for 150% quality.\n' - ' Defaulting to Best Quality.') + self.loggers.add_log('Could not find a rotation for 150% quality.\n' + ' Defaulting to Best Quality.') self.safe_50 = self.best_quality # self.safe_50 = Result(self.solutions[round(len(self.solutions)/2)+1], 'Safe 50') # old version