Skip to content
Snippets Groups Projects
  1. Apr 08, 2024
    • Florian Schröder's avatar
      Update random parameter in OrderManager initialization · 182a4708
      Florian Schröder authored
      The random parameter in OrderManager's initialization process under cooperative_cuisine/environment.py has been updated. Instead of using an existing random instance, a new one is now created using a specified seed. This allows for more controlled randomness within the system operation.
      182a4708
  2. Apr 04, 2024
  3. Apr 03, 2024
    • Florian Schröder's avatar
      Add type hints and docstrings across multiple modules · 5c100dd0
      Florian Schröder authored
      Added type hints and docstrings throughout the project, notably in the effects, orders, study server, and game server modules. These additions provide better understanding and ease in navigating through the codebase. Minor code reorganization and syntax optimization were also performed.
      5c100dd0
  4. Mar 27, 2024
  5. Mar 25, 2024
    • Florian Schröder's avatar
      Add additional state update hook and functionality · 9e993a13
      Florian Schröder authored
      The code now contains a new hook named "additional_state_update" and accommodates accepting additional state content. This functionality is used to better manage player readiness states in the game_server module and includes updates to the get_state and get_json_state methods in the environment module. New changes also impact the environment configuration files.
      9e993a13
  6. Mar 13, 2024
    • Florian Schröder's avatar
      Update methods and hooks in cooperative_cuisine · 4aecc23e
      Florian Schröder authored
      The main changes include enhancing methods in cooperative_cuisine/hooks.py, cooperative_cuisine/counters.py, and cooperative_cuisine/environment.py, and updating hooks. These changes greatly improve the handling of hooks and calls, provide explicit arguments for actions, and add more comprehensive documentation. This leads to better logging and debugging, higher code readability, and improved overall code structure in the cooperative_cuisine backend.
      4aecc23e
  7. Mar 10, 2024
    • Florian Schröder's avatar
      Refactor recorder and hooks setup in config files · 6a671b9e
      Florian Schröder authored
      This commit refactors the setup of recorders and hooks in several configuration files. It simplifies the YAML structure, renames "extra_setup_functions" to "hook_callbacks", and replaces "log_path" with "record_path". This makes the configurations cleaner and more intuitive. The update also removes the "func" and "kwargs" in the extra setup functions. Now only hooks are registered. This change should not affect functionality, because until now only hooks were registered as extra setup functions.
      6a671b9e
  8. Mar 09, 2024
    • Florian Schröder's avatar
      Add and optimize type hints, refactor functions, improve readability · 0ddb9e04
      Florian Schröder authored
      Various changes have been made in the codebase to improve readability and maintainability. Type hints have been added to the functions and variables for better understanding of the datatypes. Refactoring of some code segments has also been done to make the code more concise and readable. The 'EffectType', 'ItemType' enumerations have been enriched with docstrings for better understanding of the enums. Certain classes have been updated to better follow the single responsibility principle.
      0ddb9e04
    • Florian Schröder's avatar
      Refactor 'player_config' usage and improve typing in 'cooperative_cuisine' · 95500cc8
      Florian Schröder authored
      The 'player_config' dictionary is replaced with the PlayerConfig class to provide type-checking and improve readability. This change is applied across different files in the 'cooperative_cuisine' module. Additionally, this commit improves type hints for several variables and parameters to assist with code interpretation and potential error prevention.
      95500cc8
    • Florian Schröder's avatar
      Refactor docstrings for consistency and update environment name · 2bd77a93
      Florian Schröder authored
      Docstrings across classes and functions in different modules have been adjusted for consistency, specifically in how Return and Raise explanations are formatted. This makes the code more readable and uniform. Additionally, the environment name in 'environment.py' has been updated from "overcooked_sim" to "cooperative_cuisine_1".
      2bd77a93
  9. Mar 08, 2024
  10. Mar 07, 2024
  11. Mar 06, 2024
  12. Mar 05, 2024
    • Fabian Heinrich's avatar
      More docstrings · 513c5fdb
      Fabian Heinrich authored
      513c5fdb
    • Florian Schröder's avatar
      Remove unused variable and add docstrings in environment.py · 2e5ef1e2
      Florian Schröder authored
      The PAUSED variable, which was unused, has been removed from the codebase to improve readability. Docstrings were added to multiple existing methods and instance variables in the environment.py file for better understanding of their functionalities. This change will make it easier for developers to understand the purpose and usage of the various methods and variables, ultimately smoothing the development process.
      2e5ef1e2
    • Florian Schröder's avatar
      Update PUT action to PICK_UP_DROP · 7c31d0ac
      Florian Schröder authored
      The ActionType.PUT has been replaced with ActionType.PICK_UP_DROP across all instances in the codebase. This change aligns the action name with its actual function, making the action more intuitive and the code easier to understand. This update also includes minor modifications in comments and function arguments to reflect the new action name.
      7c31d0ac
    • Florian Schröder's avatar
      Update code comments and typespecs across modules · bef24476
      Florian Schröder authored
      Enhanced overall code clarity by adding and revising detailed comments, docstrings, and typespecs in various Python modules. Significant changes include refining functionality of effect management in 'effects.py', modifications to use of 'numpy' arrays and functions in 'movement.py', as well as adjustments to handling hooks. Additionally, minor updates in 'configs/study/level1/level1_config.yaml' and 'counter_factory.py' were made.
      bef24476
    • Fabian Heinrich's avatar
      Cleaned up HTTPErrors · f0a7150f
      Fabian Heinrich authored
      f0a7150f
  13. Mar 04, 2024
  14. Mar 03, 2024
    • Florian Schröder's avatar
      Refactor recipe validation and improve graph generation · 8721e435
      Florian Schröder authored
      The 'recipes.py' module is renamed to 'validation.py' and the 'RecipeValidation' class is renamed to 'Validation'. The code is refactored to use f-strings for better readability. Graph generation has also been improved by simplifying the way edges are added and returning information as a dictionary. An unnecessary png file generation has been removed. Changes have been made where these classes are imported and used.
      8721e435
    • Florian Schröder's avatar
      Fix merge · a737c646
      Florian Schröder authored
      a737c646
  15. Mar 01, 2024
  16. Feb 29, 2024
    • Florian Schröder's avatar
      Rename module 'game_items' to 'items' · e65743a5
      Florian Schröder authored
      The module 'game_items' was renamed to 'items'. Every reference to this module across different source code files was consequently updated to reflect this change.
      e65743a5
    • Florian Schröder's avatar
      Refactor EffectManager into effects module · 4d93be01
      Florian Schröder authored
      The EffectManager class along with related effects have been moved to a newly created effects.py module. Also, instead of importing from cooperative_cuisine.effect_manager, the rest of the code now imports from cooperative_cuisine.effects. This is mainly to improve the project structure and to clarify the code organization, and avoid circular import issues.
      4d93be01
    • Florian Schröder's avatar
      Refactor Action classes into separate file · 49231a76
      Florian Schröder authored
      Action, ActionType, and InterActionData classes have been moved from the environment module into a separate file named action.py. All imports have been adjusted to reflect this change. This provides a clearer structure and improves modularity in the code, as all action related classes and enums are now organized in a single module.
      49231a76
    • Florian Schröder's avatar
      Update player readiness and game configuration · 8373a98b
      Florian Schröder authored
      The 'all_players_ready' field was moved from 'state_representation.py' to 'game_server.py'. Instead of being part of the initial state of the game, it's now part of the server environment, making it easier to keep track of the readiness of all players. Additionally, the game configuration in 'study_config.yaml' was updated to accommodate one player instead of two and no bots.
      8373a98b
    • Florian Schröder's avatar
      Update configurations, path handling, and study server logic · 19a9fc30
      Florian Schröder authored
      Made updates across multiple files targeting the usage and setting of configuration files. Several path settings have been altered, and the logic in the study server has been revised. Changes were also made in the file imports and other operations related to configurations and paths. Additionally, a validation check is added to warn if a player with the same name already exists in the environment.
      19a9fc30
    • Florian Schröder's avatar
      Update level configurations and add RecipeValidation class · baa88a0c
      Florian Schröder authored
      The configurations for study level and game layout have been updated to accommodate new requirements. Additionally, a RecipeValidation class has been created to handle recipe graphs, which is now being utilized in both the drawing and game_server files. This is instead of the previous more scattered approach of handling such graphs within other classes or standalone functions. These changes make the code more organized and efficient.
      baa88a0c
    • Florian Schröder's avatar
      Add Movement class for handling player and counter interactions · ef72806c
      Florian Schröder authored
      This commit introduces a new Movement class which handles player movements, collisions, and interactions with counters in the 'cooperative_cuisine' environment. The commit also includes necessary changes to related configurations and adjustments in the 'environment.py' and 'player.py' files to accommodate the introduction of this new class. This encapsulation enhances readability, promotes code organization, and adheres to the principle of Single Responsibility.
      ef72806c
  17. Feb 28, 2024
    • Florian Schröder's avatar
      Update meal configurations and add player context to counters · e60d58b0
      Florian Schröder authored
      Meal configurations in the level 1 configuration file are updated, swapping out the previous meals with new ones. Player name has been added as a parameter to the pick_up and drop_off methods in player.py and counters.py. This allows for better tracking of the actions of individual players, which can be useful in cooperative environments where player accountability is imperative. Additionally, served meals now also log the serving player's name, providing additional context during gameplay and post-game analysis.
      e60d58b0
    • Florian Schröder's avatar
      Rename 'order.py' to 'orders.py' and update references · aaba92f5
      Florian Schröder authored
      The 'order.py' module has been renamed to 'orders.py' for consistency and clarity. All references to this file within the code base, including import statements and comments, have been updated to reflect this change. A safer and more coherent codebase enhances readability and maintainability.
      aaba92f5
    • Florian Schröder's avatar
      Rename project from overcooked_simulator to cooperative_cuisine · 242c9860
      Florian Schröder authored
      All instances of 'overcooked_simulator' have been replaced with 'cooperative_cuisine'. This includes changes in file paths, imports, and script names. The necessary adjustments to reflect this rename have also been made in the documentation, setup files, test scripts, and CI/CD configuration.
      242c9860
    • fheinrich's avatar
      Adjusted graph sizes · c4ba85f7
      fheinrich authored
      c4ba85f7
    • Florian Schröder's avatar
      Add option to undo dispenser pickup in Overcooked simulator · 076a36a5
      Florian Schröder authored
      The commit introduces an option that allows dispensers in the Overcooked simulator to undo pickups of items in case of errors. This new setting, `undo_dispenser_pickup`, is now included in the `game` section of the environment configuration. Both the counter factory and dispenser have been updated to accommodate these changes.
      076a36a5
Loading