Skip to content
Snippets Groups Projects
  1. Mar 05, 2024
    • Florian Schröder's avatar
      Add docstrings and minor adjustments to cooperative_cuisine · 5a9b4874
      Florian Schröder authored
      This commit adds detailed docstrings for various methods and classes in the 'cooperative_cuisine' module for enhanced code understanding. Also includes minor changes to the .gitlab-ci.yml and pygame_2d_vis/__init__.py files and adds an image in the docs markdown file. Code readability and maintainability improved with these changes.
      5a9b4874
    • Florian Schröder's avatar
      Update .gitignore, .gitlab-ci.yml, player.py · a96a9cbb
      Florian Schröder authored
      Added 'generated' to .gitignore, updated pdoc footer text in .gitlab-ci.yml, and included interaction state for player in player.py. The player interaction with the counter is now being tracked and a new comment was added for the progress method. This will enhance player's tracking and usage in the game environment.
      a96a9cbb
    • 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
    • Florian Schröder's avatar
      Update CI script and game configurations · f536d40e
      Florian Schröder authored
      Changed the pdoc execution command in the .gitlab-ci.yml to fix the link in the footer text. Adjustments were also made to the layout of the game in the basic.layout and __init__.py files, along with the game, player, and effect configurations. The player speed was reduced, the ability to undo dispenser pickup was added, and the effect
      f536d40e
    • Florian Schröder's avatar
      Update documentation and improve changelog · eb4ae7eb
      Florian Schröder authored
      The provided modifications involve an update to the .gitlab-ci.yml file to include a footer text in the project documentation. There's also an additional point added to the CHANGELOG.md file under the 'study participants' section for clarity. Furthermore, the README.md has been slightly restructured to explicitly mention the availability of extensive project details in the documentation.
      eb4ae7eb
    • Florian Schröder's avatar
      Update .gitlab-ci.yml and expand CHANGELOG.md · 593f63c1
      Florian Schröder authored
      Updated the pdoc command in .gitlab-ci.yml file to correct the hyphen usage in the "footer_text" flag. The CHANGELOG.md is significantly expanded to provide a more detailed and organized account of changes with version releases, following the guidelines from keepachangelog.com.
      593f63c1
    • Florian Schröder's avatar
      Update CI config and improve code readability · 09a0bc5c
      Florian Schröder authored
      The CI configuration file and several Python scripts were updated for better adherence to best practices. The CI now includes a footer in the pdoc document generation step. Moreover, variable names and import paths were updated to be more explicit and clear. Some paths in the scripts were also generalized. In addition, the json.dumps function was used to print the create_json_schema function's output in a prettier format. Lastly, minor modifications were made to the README and comments for better clarity and understanding.
      09a0bc5c
    • Florian Schröder's avatar
      Add favicon to pdoc command in GitLab CI configuration · 76a69a2a
      Florian Schröder authored
      Added a favicon parameter to the pdoc command in the .gitlab-ci.yml file. This results in the favicon being specified during the documentation generation process. This change should improve the importance of the favicon when the documentation is viewed in a browser tab.
      76a69a2a
  2. Mar 04, 2024
    • Florian Schröder's avatar
      Add missing comma in game_port argument · dee75f4c
      Florian Schröder authored
      A missing comma was discovered and corrected in the game_port argument on the study_server.py file. This could potentially prevent syntax errors and bugs that might result from incomplete statements and ensure smoother execution of the function.
      dee75f4c
    • Florian Schröder's avatar
      Update argument names in function calls · 794a4414
      Florian Schröder authored
      The argument names in the main function calls within study_server.py and game_server.py were updated for clarity. These changes better reflect their function within these scripts, making the code easier to understand and maintain. The modifications primarily involve changing 'url' and 'port' to 'game_url' and 'game_port', and 'port' to 'study_port'.
      794a4414
    • Florian Schröder's avatar
      Add checks for available meals before creating orders · a103b0ad
      Florian Schröder authored
      The updates address issues with empty meal lists during order creation. When no meals are available, no orders will be created, returning empty lists instead. Furthermore, the mandatory meal assertion in the environment's validate_environment method has been commented out. The meal list in the level1 config has been updated to only include 'Burger'.
      a103b0ad
    • 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
    • Florian Schröder's avatar
      Merge branch '101-refactoring-environment-class-file' into 'main' · 9fd3def7
      Florian Schröder authored
      Resolve "Refactoring Environment class + file"
      
      Closes #101
      
      See merge request scs/cocosy/overcooked-simulator!71
      9fd3def7
  3. Mar 03, 2024
  4. Mar 01, 2024
  5. Feb 29, 2024
    • Florian Schröder's avatar
      Rearrange list order in cooperative_cuisine/__init__.py · 06bd2b8a
      Florian Schröder authored
      The game **items** description has been moved down the list for better organization and readability in cooperative_cuisine/__init__.py file. This change doesn't affect the functionality but improves the structure of the documentation.
      06bd2b8a
    • 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
    • Fabian Heinrich's avatar
      Added examples for lettuce sprites · 9dd03d7f
      Fabian Heinrich authored
      9dd03d7f
    • Florian Schröder's avatar
      Update player addition test · b1e263ab
      Florian Schröder authored
      The player addition test has been updated to check for error handling. Now, it checks if adding a player with an already existing name raises a ValueError, instead of testing for a restriction in player count.
      b1e263ab
    • 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
Loading