From 67b67712cff8d8ce7464fe7ac908c635737466e8 Mon Sep 17 00:00:00 2001 From: vicky Date: Wed, 22 Feb 2023 21:42:23 +0100 Subject: [PATCH] resolved module loading problems, started work on getting solutions out of rust --- python/src/ffcraft_solver/__main__.py | 151 ++++++++++---------- python/src/ffcraft_solver/modules/loader.py | 6 +- python/src/ffcraft_solver/modules/solver.py | 26 +++- 3 files changed, 102 insertions(+), 81 deletions(-) diff --git a/python/src/ffcraft_solver/__main__.py b/python/src/ffcraft_solver/__main__.py index 5b686a5..eae79d3 100644 --- a/python/src/ffcraft_solver/__main__.py +++ b/python/src/ffcraft_solver/__main__.py @@ -3,10 +3,6 @@ import xiv_craft_solver as xcs from ffcraft_solver.modules import loader, log, solver import rich -dpg.create_context() -dpg.configure_app(manual_callback_management=True) -dpg.create_viewport(title='XIV Solver', width=500, height=700) - class User: name = ' ' @@ -173,85 +169,90 @@ class Recipe: return self.name -def request_solve(self): - solve = solver.Solver(user, recipe) - solve.solve() +def request_solve() -> True: + solver.Solver(user, recipe) + return True -with dpg.window(label="Settings", width=500, height=700, no_resize=True, no_title_bar=True, no_move=True): - # Initialization of all our classes - user = User() - recipe = Recipe() +if __name__ == '__main__': + dpg.create_context() + dpg.configure_app(manual_callback_management=True) + dpg.create_viewport(title='XIV Solver', width=500, height=700) - full_config = loader.Loader() - characters_names = full_config.get_users_names() - foods_names = full_config.get_foods_names() - pots_names = full_config.get_pots_names() - recipe_names = full_config.get_recipes_names() + with dpg.window(label="Settings", width=500, height=700, no_resize=True, no_title_bar=True, no_move=True): + # Initialization of all our classes + user = User() + recipe = Recipe() - loggers = log.Loggers() + full_config = loader.Loader() + characters_names = full_config.get_users_names() + foods_names = full_config.get_foods_names() + pots_names = full_config.get_pots_names() + recipe_names = full_config.get_recipes_names() - # Start of GUI drawing - # CHARACTER - dpg.add_text("Character") - user_combo = dpg.add_combo(items=characters_names, label="Your character", callback=user.set_name_combo) - dpg.set_value(user_combo, " ") - # TODO: Load 1rst user in users.yaml by default - user_stats = dpg.add_input_intx(size=3, label="Stats", tag="stats_tooltip", callback=user.set_initial_stats) - with dpg.tooltip("stats_tooltip"): - dpg.add_text("Craftsmanship / Control / CP") - with dpg.group(horizontal=True): - save_user_as = dpg.add_input_text(hint='Save as...') - dpg.add_button(label="Save!") - # TODO: Can't save if value == ' ' + loggers = log.Loggers() - # EFFECTIVE STATS - dpg.add_separator() - user_effective_stats = dpg.add_input_intx(size=3, label="Effective stats", tag="effective_stats_tooltip", readonly=True) - with dpg.tooltip("effective_stats_tooltip"): - dpg.add_text("Craftsmanship / Control / CP") - dpg.add_separator() + # Start of GUI drawing + # CHARACTER + dpg.add_text("Character") + user_combo = dpg.add_combo(items=characters_names, label="Your character", callback=user.set_name_combo) + dpg.set_value(user_combo, " ") + # TODO: Load 1rst user in users.yaml by default + user_stats = dpg.add_input_intx(size=3, label="Stats", tag="stats_tooltip", callback=user.set_initial_stats) + with dpg.tooltip("stats_tooltip"): + dpg.add_text("Craftsmanship / Control / CP") + with dpg.group(horizontal=True): + save_user_as = dpg.add_input_text(hint='Save as...') + dpg.add_button(label="Save!") + # TODO: Can't save if value == ' ' - # MODIFIERS - dpg.add_text("Modifiers") - food_combo = dpg.add_combo(items=foods_names, label="Food", callback=user.set_food) - pot_combo = dpg.add_combo(items=pots_names, label="Pot", callback=user.set_pot) - specialist_checkbox = dpg.add_checkbox(label="Specialist", tag="specialist", callback=user.set_specialist) + # EFFECTIVE STATS + dpg.add_separator() + user_effective_stats = dpg.add_input_intx(size=3, label="Effective stats", tag="effective_stats_tooltip", readonly=True) + with dpg.tooltip("effective_stats_tooltip"): + dpg.add_text("Craftsmanship / Control / CP") + dpg.add_separator() - # RECIPE - dpg.add_separator() - dpg.add_text("Recipe") - recipe_combo = dpg.add_combo(items=recipe_names, label="Recipe", callback=recipe.set_recipe_name) - dpg.set_value(recipe_combo, " ") - recipe_stats = dpg.add_input_intx(size=3, label="Stats", tag="recipe_tooltip", callback=recipe.set_recipe_stats) - with dpg.tooltip("recipe_tooltip"): - dpg.add_text("Progress / Quality / Durability") - advanced_recipe_stats = dpg.add_input_intx( - size=4, label="Advanced stats", tag="advanced_recipe_tooltip", callback=recipe.set_recipe_stats - ) - with dpg.tooltip("advanced_recipe_tooltip"): - dpg.add_text("Progress / Quality difficulty // Progress / Quality extra difficulty") - # TODO: add a log if recipe matches a known recipe - with dpg.group(horizontal=True): - save_recipe_as = dpg.add_input_text(hint='Save as...') - dpg.add_button(label="Save!", callback=request_solve) - # TODO: Can't save if value == ' ' + # MODIFIERS + dpg.add_text("Modifiers") + food_combo = dpg.add_combo(items=foods_names, label="Food", callback=user.set_food) + pot_combo = dpg.add_combo(items=pots_names, label="Pot", callback=user.set_pot) + specialist_checkbox = dpg.add_checkbox(label="Specialist", tag="specialist", callback=user.set_specialist) - # SOLVE - dpg.add_separator() - dpg.add_button(label="Solve!") - dpg.add_text() - dpg.add_collapsing_header(label="Result") + # RECIPE + dpg.add_separator() + dpg.add_text("Recipe") + recipe_combo = dpg.add_combo(items=recipe_names, label="Recipe", callback=recipe.set_recipe_name) + dpg.set_value(recipe_combo, " ") + recipe_stats = dpg.add_input_intx(size=3, label="Stats", tag="recipe_tooltip", callback=recipe.set_recipe_stats) + with dpg.tooltip("recipe_tooltip"): + dpg.add_text("Progress / Quality / Durability") + advanced_recipe_stats = dpg.add_input_intx( + size=4, label="Advanced stats", tag="advanced_recipe_tooltip", callback=recipe.set_recipe_stats + ) + with dpg.tooltip("advanced_recipe_tooltip"): + dpg.add_text("Progress / Quality difficulty // Progress / Quality extra difficulty") + # TODO: add a log if recipe matches a known recipe + with dpg.group(horizontal=True): + save_recipe_as = dpg.add_input_text(hint='Save as...') + dpg.add_button(label="Save!", callback=request_solve) + # TODO: Can't save if value == ' ' - # LOG - log_window = dpg.add_input_text(multiline=True, default_value=loggers.log, height=50, width=500, - tab_input=True, pos=[0, 642], tracked=True) + # SOLVE + dpg.add_separator() + dpg.add_button(label="Solve!", callback=request_solve) + dpg.add_text() + dpg.add_collapsing_header(label="Result") -dpg.setup_dearpygui() -dpg.show_viewport() -while dpg.is_dearpygui_running(): - jobs = dpg.get_callback_queue() # retrieves and clears queue - dpg.run_callbacks(jobs) - dpg.render_dearpygui_frame() -dpg.start_dearpygui() -dpg.destroy_context() + # LOG + log_window = dpg.add_input_text(multiline=True, default_value=loggers.log, height=50, width=500, + tab_input=True, pos=[0, 642], tracked=True) + + dpg.setup_dearpygui() + dpg.show_viewport() + while dpg.is_dearpygui_running(): + jobs = dpg.get_callback_queue() # retrieves and clears queue + dpg.run_callbacks(jobs) + dpg.render_dearpygui_frame() + dpg.start_dearpygui() + dpg.destroy_context() diff --git a/python/src/ffcraft_solver/modules/loader.py b/python/src/ffcraft_solver/modules/loader.py index f527184..04a7764 100644 --- a/python/src/ffcraft_solver/modules/loader.py +++ b/python/src/ffcraft_solver/modules/loader.py @@ -1,10 +1,10 @@ import rich import yaml import os -# from xiv_craft_solver.modules import log +from ffcraft_solver.modules import log -# loggers = log.Loggers() +loggers = log.Loggers() class DefaultConfig: @@ -48,7 +48,7 @@ class Loader: return os.path.normpath(os.path.join(__file__, "../..", path)) def get_users_dict(self) -> dict: - # loggers + 'Loaded user dictionary from users.yaml' + loggers + 'Loaded user dictionary from users.yaml' return self.user_list def get_users_names(self) -> list: diff --git a/python/src/ffcraft_solver/modules/solver.py b/python/src/ffcraft_solver/modules/solver.py index 2ff5fad..56d835f 100644 --- a/python/src/ffcraft_solver/modules/solver.py +++ b/python/src/ffcraft_solver/modules/solver.py @@ -1,5 +1,6 @@ +import rich import xiv_craft_solver -from __main__ import User, Recipe +from ffcraft_solver.__main__ import User, Recipe class Solver: @@ -9,8 +10,8 @@ class Solver: self.quality = recipe.quality self.progress_divider = recipe.progress_difficulty self.quality_divider = recipe.quality_difficulty - self.progress_modifier = recipe.extra_progress_difficulty - self.quality_modifier = recipe.extra_quality_difficulty + self.progress_modifier = recipe.progress_extra_difficulty + self.quality_modifier = recipe.quality_extra_difficulty self.craftsmanship = user.craftsmanship self.control = user.control @@ -22,5 +23,24 @@ class Solver: self.threads = 8 self.verbose = 0 + self.solutions = [] + self.best_quality = None + + self.solve() + self.return_best_quality() + rich.inspect(self.best_quality) + def solve(self) -> str: + self.solutions = xiv_craft_solver.solve_from_python(self) return xiv_craft_solver.solve_from_python(self) + + def return_best_quality(self) -> str: + best_quality = 0 + output = 0 + for e in self.solutions: + if e.quality > best_quality: + best_quality = e.quality + output = e + self.best_quality = output + return self.best_quality +