Skip to content
Snippets Groups Projects
  1. Mar 13, 2024
  2. 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
  3. Mar 08, 2024
  4. Mar 07, 2024
    • Florian Schröder's avatar
      Refactor code and add comprehensive docstrings · a9bda66c
      Florian Schröder authored
      Implemented multiple code adjustments across various Python modules, including renaming variables for clarity and improving data type definition. Added comprehensive docstrings to all functions and classes to enhance code readability and maintainability. Corrected a bug in debug parameter where it incorrectly employed args.debug, replacing it with args.do_study for correct implementation.
      a9bda66c
  5. Mar 05, 2024
    • 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
  6. 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
      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
  7. Feb 28, 2024
    • 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
    • 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
  8. Feb 21, 2024
  9. Feb 10, 2024
    • Florian Schröder's avatar
      Add Overcooked 1 layout files and minor code adjustments · fb060696
      Florian Schröder authored
      Several Overcooked 1 layout files have been added along with changes in the counter mappings for the game simulator. This includes serving window character changes and addition of clean plate character mappings. Additionally, `overcooked_simulator/utils.py` has been modified to include a method that creates a basic layout grid. These changes help in enhancing and expanding the game simulator.
      fb060696
  10. Feb 08, 2024
    • Florian Schröder's avatar
      Refactor scoring system and order management · 3c1fda71
      Florian Schröder authored
      The scoring system and order management have been significantly updated. The score calculation has been moved out from 'OrderManager' to external 'ScoreViaHooks' class which works via hooks. The order management updates include separating scoring from orders and removing unused functions. Changes in the configuration file and other related files updated to accommodate these modifications.
      3c1fda71
  11. Feb 06, 2024
  12. Feb 03, 2024
    • Florian Schröder's avatar
      Implement game effects and tools framework · c7899968
      Florian Schröder authored
      Added the definition and interactions for game effects and tools. The effect type was introduced to influence the player's interactive abilities or alter item's attributes. The tool type extends the player's interactive abilities. It also includes the part related to fire and fire extinguisher for more realistic simulation.
      c7899968
    • Florian Schröder's avatar
      Add random instance to make randomness controllable · 9fae6bad
      Florian Schröder authored
      The random module is replaced with random instance across multiple classes within 'overcooked_simulator' to make the randomness in the Overcooked simulator controllable. The 'random' instance is initialised with a seed in 'overcooked_environment' and then passed to the classes that require randomness. This improves reproducibility of experiments, as the randomness can be controlled by the seed value.
      9fae6bad
  13. Feb 02, 2024
    • Florian Schröder's avatar
      Implement hooks for tracking game events · 6b2b8c76
      Florian Schröder authored
      Added a Hooks class to monitor events related to player actions, item interactions, and state changes in the game environment. A hook triggers a corresponding event when a specific action takes place, such as a player picking up an item or a game state changing. This feature will make debugging easier and provide valuable insights during gameplay.
      6b2b8c76
  14. Jan 31, 2024
    • Florian Schröder's avatar
      Refactor code and update documentation · 31497c68
      Florian Schröder authored
      The code changes include renaming the 'category' field from "Cooking Equipment" to "ItemCookingEquipment" in sample_state.json. The documentation has also been updated with more detailed explanations on how the system works, including how to install and use it. A few function signatures were changed and additional explanation comments were included in the counters.py and utils.py files for better code clarity.
      31497c68
    • Florian Schröder's avatar
      Add docstrings and type hinting · ff409005
      Florian Schröder authored
      The updates include adding docstrings and type hinting to several classes and methods in multiple Python files. This commit also includes fixes for inconsistent code formatting and minor bugs. The docstrings provide essential details about the classes and methods, improving readability and understanding for other developers. Furthermore, the added type hinting will enable better IDE assistance, static analysis, and clarity on expected input and output types. Lastly, the code formatting fixes and bug fixes enhance the overall code quality and maintainability.
      ff409005
  15. Jan 29, 2024
  16. Jan 27, 2024
    • Florian Schröder's avatar
      Add penalty for trashing items in Overcooked simulator · b600b39e
      Florian Schröder authored
      This update introduces a penalty computation for items that the player puts into the trash in the Overcooked simulator. A new function has been added onto the Order class to calculate this penalty, and the Trashcan class has been updated to use this new function whenever an item is dropped off. This change helps to further emulate real gameplay mechanics.
      b600b39e
    • Florian Schröder's avatar
      Refactor counter setup and update various classes · d9ddc417
      Florian Schröder authored
      The `overcooked_environment.py` file has been significantly refactored to streamline handling of counter setup. Post counter setup responsibilities have been shifted to the `CounterFactory` class. A utility function, `get_closest`, has been introduced in `utils.py` to determine the closest counter and is used in multiple classes. Minor updates are also made across several other classes for optimization and clarity. The 'other' score in `environment_config.yaml` has been changed from 0 to 20.
      d9ddc417
  17. Jan 26, 2024
    • Florian Schröder's avatar
      Refactor progress counter handling in overcooked simulator · 0a75551a
      Florian Schröder authored
      The commit refines the way the 'progress' method is called on counters in the overcooked simulator. Utilizing Python's introspection functions, the update identifies the relevant counter classes dynamically on setup, and stores them. Simplified calls to these relevant counters are then performed during steps in the simulation. Additionally, the code now checks the superclass with the built-in 'issubclass' function to create counters.
      0a75551a
    • Florian Schröder's avatar
      Remove unnecessary print statements · 4cf989f6
      Florian Schröder authored
      The print statements that are outputting the kitchen height in the overcooked_environment.py file, the command line arguments in the __main__.py file, and a redundant check in the counter_factory.py file have been removed. This is in an effort to declutter the console output and streamline the code.
      4cf989f6
    • Florian Schröder's avatar
      Improve documentation in overcooked_environment and counter_factory modules · 97d33243
      Florian Schröder authored
      The code changes include addition of in-line comments and docstrings, which clarify the purpose and functionality of various elements in the overcooked_environment and counter_factory modules. Several new comments explain the use of certain variables and functions, and additional explanations are offered for existing sections. This is part of an ongoing effort to improve the maintainability and readability of the codebase.
      97d33243
    • Florian Schröder's avatar
      Refactor simulator environment and add counter factory · 3606ecfd
      Florian Schröder authored
      This commit simplifies the overcooked environment by refactoring the way counters are created and managed. A new CounterFactory class is introduced, offloading logic from the environment class. In addition, the symbol to character mapping and other environment-related configurations are moved to a separate YAML file. The .gitignore file is also updated to ignore the 'playground' directory. Making these changes enhances code maintainability and readability.
      3606ecfd
Loading