Skip to content
Snippets Groups Projects
  1. Feb 05, 2024
  2. Feb 02, 2024
  3. Feb 01, 2024
  4. Jan 30, 2024
  5. Jan 29, 2024
  6. Jan 27, 2024
    • 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
  7. 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
    • Florian Schröder's avatar
      Refactor equipment transition filters and update drawing.py · 05c413f0
      Florian Schröder authored
      Refactored the transition filter code in overcooked_environment.py by replacing redundant code with a call to `filter_item_info` method. The changes lead to easier maintenance and increased code readability. Also, in gui_2d_vis/drawing.py, array conversion was added to 'pos' to ensure operations involving 'pos' and 'd' won't raise errors.
      05c413f0
    • Florian Schröder's avatar
      Add CookingCounter progress and raise exception for undefined counter types · 8ede781a
      Florian Schröder authored
      The CookingCounter is now included in the list of counters for which we calculate progress. Additionally, if a counter type is not defined in the configuration, a ValueError will be raised. Unnecessary imports were also removed from 'overcooked_gui.py', and a 'to_dict' method was added in 'counters.py'. Fixing errors from merge.
      8ede781a
    • Florian Schröder's avatar
      Refactor overcooked simulator and tests, remove GUI lock · 28f70141
      Florian Schröder authored
      This commit removes a temporal lock previously used for the GUI. This leads to refinement and adjustments to the usage of datetime and timedelta in the simulator environment. In the tests, the Simulator class is replaced with directly creating an Environment instance and testing the desired features. Additions include comments for future TODOs relating to further enhancements and checks.
      28f70141
    • Florian Schröder's avatar
      Update player speed attribute and handle Enum serialization · dc8d7e4f
      Florian Schröder authored
      Renamed `move_dist` attribute to `player_speed_units_per_seconds` in player configuration. Also implemented `__post_init__` method in Action class to handle conversion from str to Enum type. Added a utility function `custom_asdict_factory` to handle Enum serialization for actions. Various code updates are made to accommodate these changes. Fixes merge bugs.
      dc8d7e4f
    • Florian Schröder's avatar
      Refactor and add detailed docstrings to Overcooked game server · d754c525
      Florian Schröder authored
      Removed the unused 'get_state_simple_json' method, added missing docstrings providing detailed explanations for functions in 'overcooked_simulator/game_server.py' and 'overcooked_simulator/simulation_runner.py'. Implemented a type hinting dictionary in 'overcooked_simulator/server_results.py'. These changes are aimed at improving code readability and maintenance.
      d754c525
  8. Jan 25, 2024
    • Florian Schröder's avatar
      Refactor player id type and remove global constants in UI · 47edb3ea
      Florian Schröder authored
      The player id type is updated from 'int | str' to 'str' across different files to maintain code uniformity and avoid type-related errors. Removed the global constants (USE_PLAYER_COOK_SPRITES, SHOW_INTERACTION_RANGE, SHOW_COUNTER_CENTERS) from gui files for better code structure. Moreover, function annotations are improved by providing more specific types which helps in understanding the codebase. The diff adds additional details in the form of questions or short descriptions in the comments as well.
      47edb3ea
    • Florian Schröder's avatar
      Update Overcooked simulator to support state export in JSON format · df234b9c
      Florian Schröder authored
      The update introduces a new function `get_json_state()` in overcooked_environment.py that exports the current game state in JSON format. Changes were made to player.py, counters.py, and game_items.py to include an additional `to_dict()` function which represents their current status as a dictionary. This commit also includes minor naming changes, such as renaming `beginning_time` to `start_time`.
      df234b9c
    • Florian Schröder's avatar
  9. Jan 24, 2024
    • Florian Schröder's avatar
      Refactor and enhance Overcooked simulator codebase · 6a57f19a
      Florian Schröder authored
      Codebase for Overcooked simulator has been refactored. File rearrangement includes deletions and renaming to better reflect their functionalities. Within the code, several updates are made like support for using both file paths and direct strings as configurations. These amendments improve the organization, modularity, and overall efficiency of the code.
      6a57f19a
    • Fabian Heinrich's avatar
      Updates · 60debf46
      Fabian Heinrich authored
      60debf46
  10. Jan 22, 2024
    • Florian Schröder's avatar
      Refactor item transition implementation in simulator · bb1339ae
      Florian Schröder authored
      The transition implementation for items in the simulator has been updated. This refactoring introduces the filter_item_info function, replacing the previous verbose, repeating pattern with filter_item_info method calls in the overcooked_environment.py module. This makes the code more efficient and readable. Test adjustments and additional type hints were also included.
      bb1339ae
  11. Jan 20, 2024
  12. Jan 19, 2024
  13. Jan 18, 2024
Loading