Skip to content
Snippets Groups Projects
  1. 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
  2. Mar 26, 2024
    • Florian Schröder's avatar
      Extract argument parser creation into separate file · 27389f93
      Florian Schröder authored
      Moved the creation of argparse.ArgumentParser objects used to parse command line arguments into a separate module, `argument_parser.py`. This includes organizing all the add_argument calls into specific functions within this new module, in order to increase code readability, reusability and organization within the argument parsing codebase. All existing usages have been updated accordingly.
      27389f93
  3. Mar 20, 2024
  4. Mar 13, 2024
  5. Mar 10, 2024
    • Florian Schröder's avatar
      Remove level specific config and item info files · 080bf359
      Florian Schröder authored
      This commit removes the level specific configuration and item information files for 'level1' and 'level2' under the cooperative_cuisine project. Changes have been made to consolidate the configurations into a single file, which improves the maintainability and organization of the application.
      080bf359
  6. Mar 09, 2024
    • 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
  7. Mar 08, 2024
    • Florian Schröder's avatar
      Refactor game and study server scripts, update tests, improve error handling · cd3e27da
      Florian Schröder authored
      The refactoring involved creating a new function to handle game server requests for cleaner and more concise code. Changes were also made to the formatting of commit messages for better readability. Invalid game environment configurations are now dealt with accordingly to prevent game errors. Several updates were made to the tests to ensure they accurately measure the performance and functionality of the game.
      cd3e27da
  8. Mar 07, 2024
  9. Mar 05, 2024
    • Florian Schröder's avatar
      Refactor comments and organize default server settings · e8585344
      Florian Schröder authored
      The comments in various class definitions and methods across the code were reorganized to provide better clarity and readability. The handling of server default values has been centralized in utils.py for cleaner code and easier modifications in the future.
      e8585344
  10. Mar 04, 2024
    • Florian Schröder's avatar
      Refactor argument naming and method signatures · eccd9c34
      Florian Schröder authored
      Modified url_and_port_arguments to follow cli args standards in cooperative_cuisine/utils.py, changing '-study' to '-s' and '-game' to '-g'. Adjusted the placement of 'player' argument in the methods in cooperative_cuisine/counters.py. Also, refactored the method _do_single_tool_interaction to be a static method.
      eccd9c34
  11. Feb 29, 2024
    • 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
  12. Feb 28, 2024
  13. Feb 14, 2024
    • Florian Schröder's avatar
      Implement study server · 37c127e1
      Florian Schröder authored
      Several GUI instances are managed by a study server for matchmaking.
      Needs code adjustments to work (change static var)
      37c127e1
  14. Feb 12, 2024
  15. 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
  16. Feb 08, 2024
    • Florian Schröder's avatar
      Implement vector state representation in game environment · 47cc026f
      Florian Schröder authored
      The game environment now supports vectorized states for reinforcement learning agents. This includes updates on various classes such as OrderManager, Counter, and Player. Several new utility functions are added to facilitate the conversion of the game state to vector form. The new vector state includes players, counters, orders, and game status.
      47cc026f
  17. Feb 06, 2024
    • Florian Schröder's avatar
      Refactor player movement and remove collision detection · 0a8e0367
      Florian Schröder authored
      The Overcooked environment module has been refactored to better handle player movements. The previously existing detect_collision function and its helper functions have been removed as they were no longer needed. Similarly, all the player speed values have been updated to reference a singular player_movement_speed attribute. The changes aimed to improve code readability, enforce unified player speeds, and remove redundant collision detection.
      0a8e0367
  18. Feb 04, 2024
    • Florian Schröder's avatar
      Implement additional logging and recording features · 4636abf5
      Florian Schröder authored
      This update introduces comprehensive hook management, improved environment setup functions, and a new class for logging and recording simulations. The enhanced hook management ensures better callback registration and tracing of specific simulation events. Extra setup functions allow more flexibility in setting parameters from the environment config. The new logging and recording class makes it easier to capture simulation data in a structured format for analysis. Various minor fixes and code refactoring are also included.
      4636abf5
  19. 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
  20. Feb 02, 2024
    • 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
  21. Feb 01, 2024
  22. 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
    • Florian Schröder's avatar
      Add player position to view restriction and implement angle calculation · de52447e
      Florian Schröder authored
      Player's position has been added to the view restriction in order to provide a more precise representation of the environment. A function for calculating the angle between two points has been implemented in the utils module. Changes have also been made to accommodate these new updates in the 2D visualization module.
      de52447e
  23. Jan 28, 2024
    • 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
  24. 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
      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
  25. Jan 26, 2024
    • Florian Schröder's avatar
      Update Overcooked Simulator with dynamic URLs and ports · dd723f17
      Florian Schröder authored
      The Overcooked Simulator has been updated to allow dynamic URLs and ports. This change includes modifications to the README file, and refactoring of main.py, utils.py and overcooked_gui.py to allow these variables to be passed in at runtime. This modification enhances the flexibility of the simulator when integrating with different systems or environments.
      dd723f17
    • Florian Schröder's avatar
      Refactor logging setup and remove obsolete files · f4db8bd5
      Florian Schröder authored
      The logging setup has been moved from the now-deleted main.py to utils.py. In this refactor, the files main.py and simulation_runner.py were removed as they were no longer needed. Unnecessary print statements in overcooked_gui.py and the import of setup_logging in game_server.py were also removed.
      f4db8bd5
    • 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
  26. Jan 19, 2024
Loading