Skip to content
Snippets Groups Projects
  1. Feb 02, 2024
    • Florian Schröder's avatar
      Refactor progress bar position calculation · 9fc975d5
      Florian Schröder authored
      The code for calculating the progress bar's position within the grid in gui_2d_vis/drawing.py has been clarified. Instead of directly manipulating the `pos` variable, a new `bar_pos` variable has been introduced. This revision enhances readability and maintains the integrity of the `pos` value.
      9fc975d5
    • Florian Schröder's avatar
      Remove dummy callbacks from overcooked_environment · ebdbdcf4
      Florian Schröder authored
      The dummy callbacks previously used for testing in the file 'overcooked_environment.py' have been removed. This has been done to avoid redundancy and ensure cleaner code. The comments referencing these callbacks have been updated accordingly.
      ebdbdcf4
    • Florian Schröder's avatar
      Refactor callback registration in OvercookedEnvironment · 6f16f87c
      Florian Schröder authored
      The refactoring moves the redundant callback registrations from `overcooked_environment.py` to a dedicated function, `add_dummy_callbacks`, in `hooks.py`. This restructure streamlines the code and improves readability by reducing clutter in the Overcooked Environment initialization method.
      6f16f87c
    • Florian Schröder's avatar
      Add callback hooks for game events in overcooked simulator · c8c7a773
      Florian Schröder authored
      This commit introduces specific event hooks for key game moments within the overcooked simulator. These include events like serving a non-ordered meal, starting to use the sink, completing an order, and using the trashcan. Callbacks were registered for these hooks to provide real-time feedback such as messages. Also, a typo in POST_PERFORM_ACTION parameter was corrected.
      c8c7a773
    • 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
    • Florian Schröder's avatar
      Refactor and centralize configuration classes · 0aaf03dc
      Florian Schröder authored
      The EnvironmentConfig and OrderConfig classes, previously defined in the utils.py file, were moved to their respective modules overcooked_environment.py and order.py. This change creates a central location for configuration and reduces unnecessary dependencies in the utils.py file.
      0aaf03dc
  2. Jan 31, 2024
    • Florian Schröder's avatar
      Update 2 files · 410e40fd
      Florian Schröder authored
      - /README.md
      - /overcooked_simulator/__init__.py
      410e40fd
    • Florian Schröder's avatar
      Improve `overcooked_simulator` comments and readability · c5bc8943
      Florian Schröder authored
      The changes made are focused on improving the readability of code comments and clarifying the purpose of sections within the 'overcooked_simulator'. Formatting changes were made to separate headers for better readability and the meaning of certain terms, like 'extra_repr' in 'game_items.py', was clarified further.
      c5bc8943
    • Florian Schröder's avatar
      Improve readability of `__init__.py` documentation · f7f578b8
      Florian Schröder authored
      This commit improves the readability of project documentation in `overcooked_simulator/__init__.py` file. Specifically, it separates the text about direct integration into separate lines for clarity and tidies up the example YAML configuration, consistently indenting the different sections of the content.
      f7f578b8
    • Florian Schröder's avatar
      Refactor code for better readability and clarity · fa5595ea
      Florian Schröder authored
      The changes include improving the wording in readme files, from 'Python 3.10 or higher' to 'Python 3
      fa5595ea
    • Florian Schröder's avatar
      Update documentation for layout and equipment configuration · 29223014
      Florian Schröder authored
      Documentation has been updated to provide better clarity on the layout and equipment configuration. The README file now includes information on defining counter mappings in the Environment config. The code examples in comments within the counters.py file have also been reformatted and updated, specifically those related to defining equipment types and dispenser characters. The additional change includes an expanded section in the __init__.py file on environment and item configuration.
      29223014
    • 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
    • Florian Schröder's avatar
      Add argparse for CLI in simulator script · 274592dd
      Florian Schröder authored
      An argparse has been added to the overcooked simulator script for better configuration of the command line interface. This allows the user to input the state file, visualization configuration and output filename when executing the script. As a result, the need to manually update these parameters in the script has been mitigated.
      274592dd
  3. Jan 30, 2024
  4. Jan 29, 2024
  5. Jan 28, 2024
    • Florian Schröder's avatar
      Update command line instructions for game server and GUI · 610e930e
      Florian Schröder authored
      The instructions for starting the Overcooked game server and GUI have been updated. They now include manager_ids as extra arguments, which are necessary for proper setup. This changelog is reflected in the __init__.py file of the overcooked_simulator directory.
      610e930e
    • Florian Schröder's avatar
      Update command instructions and enhance error handling · 239e7093
      Florian Schröder authored
      The README.md file has been updated with revised instructions on initiating game server and GUI, specifically the inclusion of manager_ids as arguments. The argument type for manager_ids in utils.py is also altered from list to string. Exception handling in overcooked_gui.py has been improved to explicitly throw a value error when encountering forbidden requests.
      239e7093
    • Florian Schröder's avatar
      Add manager ID argument to Overcooked simulator · 8d82c086
      Florian Schröder authored
      An optional argument for the list of manager IDs was added across the Overcooked simulator. These IDs are now used for authorization purposes when creating environments. Unauthorized attempts now return HTTP error 403. This helps enhance security and control over environment management in the simulation.
      8d82c086
  6. Jan 27, 2024
    • Florian Schröder's avatar
      Add OrderConfig and EnvironmentConfig classes in utils.py · d8ca40de
      Florian Schröder authored
      The OrderConfig and EnvironmentConfig classes were added to the utils.py file in the Overcooked simulator. These classes help define the structure and type of orders and environments used in the simulation, contributing to the manageability and modularity of the codebase.
      d8ca40de
    • 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 2D visualization and GUI components · fe277e48
      Florian Schröder authored
      This commit provides a significant overhaul of various aspects within the overcooked_simulator's 2D visualization and GUI components. The changes include adjusting the game window and grid size, simplifying the drawing methods by removing redundancy, and enhancing the theme configuration for the GUI. This makes the code cleaner and easier to maintain, besides improving the visual style of the GUI.
      fe277e48
    • 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
Loading