Skip to content
Snippets Groups Projects
  1. Feb 29, 2024
    • 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
    • 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
    • Florian Schröder's avatar
      Update level configurations and add RecipeValidation class · baa88a0c
      Florian Schröder authored
      The configurations for study level and game layout have been updated to accommodate new requirements. Additionally, a RecipeValidation class has been created to handle recipe graphs, which is now being utilized in both the drawing and game_server files. This is instead of the previous more scattered approach of handling such graphs within other classes or standalone functions. These changes make the code more organized and efficient.
      baa88a0c
    • 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
    • Florian Schröder's avatar
      Update test suite and add coverage configuration · 2aca985b
      Florian Schröder authored
      Extended the test suite by adding new test cases and a new test file for dispensers and serving windows. The CI/CD pipeline was updated to include a coverage configuration file (.coveragerc), ensuring lines not relevant to coverage are excluded. Additionally, minor changes were made to the basic.layout file.
      2aca985b
    • Florian Schröder's avatar
      Update README.md · b0c48b37
      Florian Schröder authored
      b0c48b37
    • Florian Schröder's avatar
      Merge branch '65-more-test-coverage' into 'main' · bb27ed32
      Florian Schröder authored
      Resolve "More test coverage"
      
      Closes #65
      
      See merge request scs/cocosy/overcooked-simulator!31
      bb27ed32
    • Florian Schröder's avatar
      Update coverage badges text in README · 15f1a88f
      Florian Schröder authored
      The labels for the main and development test coverage badges in the README file have been updated. They now specifically say "Main Test Coverage" and "Dev Test Coverage" to provide clearer information about what they represent.
      15f1a88f
    • Florian Schröder's avatar
      Remove links from coverage report badges · 6c02238e
      Florian Schröder authored
      The links from the coverage report badges in the README.md file have been removed. This means the badges are now only displayed as images, but will no longer lead to detailed reports when clicked on.
      6c02238e
    • Florian Schröder's avatar
      Center align images and badges in README · 0554b4a8
      Florian Schröder authored
      The images and badges in the README file have been aligned to the center for aesthetic improvement. Additionally, the width parameters of a couple of badges have been adjusted to fit them perfectly within the newly center-aligned format. A "work in progress" note has also been removed.
      0554b4a8
    • Florian Schröder's avatar
      Adjust key width in README badge links · 37fca0ff
      Florian Schröder authored
      The key width for the Main Pipeline, Main Coverage, and Dev Coverage badge links in the README.md file have been slightly increased. This ensures that the badge text is fully visible and without overlapping adjacent badges or text.
      37fca0ff
    • Florian Schröder's avatar
      Update key width in badge URLs · b5e9bd28
      Florian Schröder authored
      The key width value in the badge URLs was decreased from 130 to 80, resulting in a cleaner presentation of the project README file. The update affects both the main and dev pipelines and coverage report badges.
      b5e9bd28
    • Florian Schröder's avatar
      Update README badges with links · 1b21203c
      Florian Schröder authored
      The commit changes the README file by updating the pipeline and coverage badges. It adds direct links to the main and dev commit history on these badges, improving navigation and making it easier to access the corresponding information.
      1b21203c
    • Florian Schröder's avatar
      Update README badges · 998b328d
      Florian Schröder authored
      The pipeline and coverage badges in the README file have been updated for better clarity. Instead of a single badge for every branch, there are now separate badges for the main and development branches.
      998b328d
    • Florian Schröder's avatar
      Update pytest command in GitLab CI configuration · ec78240d
      Florian Schröder authored
      The pytest command in `.gitlab-ci.yml` file has been updated to include also `term-missing` coverage report and junit report. This configuration outputs which lines were not hit by testing and produces the report in xml format suitable for integration with CI systems.
      ec78240d
    • Florian Schröder's avatar
      Update coverage pattern in .gitlab-ci.yml · dba65271
      Florian Schröder authored
      The commit modifies the regular expression used for coverage reporting in .gitlab-ci.yml. The change ensures correct mapping and accurate percentage capture by controlling the starting point of the coverage line match.
      dba65271
    • Florian Schröder's avatar
      Update regex for coverage report in GitLab CI · ebda2328
      Florian Schröder authored
      The regular expression used to extract the coverage percentage from the coverage report was updated. Due to modified output format of pytest, the regex pattern was not working correctly. It has been changed to ensure accurate extraction.
      ebda2328
    • Florian Schröder's avatar
      Fix regex pattern in .gitlab-ci.yml · 6081f743
      Florian Schröder authored
      The regular expression pattern for the coverage line in the .gitlab-ci.yml file was not properly formatted. It was causing issues in the CI pipeline as it couldn't correctly parse the coverage percentage. This commit wraps the expression in single quotes to correct this issue.
      6081f743
    • Florian Schröder's avatar
      Update coverage pattern in .gitlab-ci.yml file · 093a9b76
      Florian Schröder authored
      The coverage pattern has been updated in the .gitlab-ci.yml file. The change made was to remove the special wildcard characters from the start of the regex pattern. This modification improves pattern recognition for the coverage report.
      093a9b76
    • Florian Schröder's avatar
      .pytest configuration and fix README typo · 6ba547f2
      Florian Schröder authored
      The .gitlab-ci.yml file was updated to change the coverage regex and remove the specific branches that the pytest stage runs on. In the README file, a typo in the coverage badge URL was corrected.
      6ba547f2
    • Florian Schröder's avatar
      Update .gitlab-ci.yml and README.md · 644927ae
      Florian Schröder authored
      The .gitlab-ci.yml file is modified to limit pytest to only 'main' and '65-more-test-coverage' branches. In the README.md, the pipeline and coverage badge URLs have been updated to dynamically reflect the current branch.
      644927ae
    • Florian Schröder's avatar
      Remove test_requirements from setup.py · 8adfb8e9
      Florian Schröder authored
      The setup file has been updated to remove the 'tests_require' attribute. Instead, 'test_requirements' has been added under 'extras_require'. This change allows the flexible installation of test requirements.
      8adfb8e9
    • Florian Schröder's avatar
      Update coverage report path in CI configuration · 153b764d
      Florian Schröder authored
      In the file .gitlab-ci.yml, the path to the coverage report file has been updated. It has been changed from `cooperative_cuisine/coverage.xml` to `coverage.xml`, adjusting the directory where the report file is located.
      153b764d
    • Florian Schröder's avatar
      Refactor pip installation commands in GitLab CI · 50d94284
      Florian Schröder authored
      The two pip installation commands in the .gitlab-ci.yml script have been combined into a single command. This change simplifies the script and ensures all necessary packages, including pytest, are installed correctly for the test environment.
      50d94284
    • Florian Schröder's avatar
      Update coverage path and badge URLs · 3c4a4349
      Florian Schröder authored
      The coverage path in .gitlab-ci.yml has been updated to point to the correct directory within the project structure. Additionally, the badge URLs in the README.md file have been corrected to display the proper pipeline and coverage status for this project.
      3c4a4349
    • Florian Schröder's avatar
      Update pytest command in GitLab CI configuration · 0e7746e9
      Florian Schröder authored
      The pytest command in the .gitlab-ci.yml file has been updated to remove redundant output. Previously, the command specified both `term` and `xml:coverage.xml` for `--cov-report`, but now it only includes `xml:coverage.xml` to simplify the report generation.
      0e7746e9
    • Florian Schröder's avatar
      Update pytest and coverage commands in GitLab CI · 4920a85a
      Florian Schröder authored
      The pytest command in the GitLab CI configuration has been updated to also generate a coverage report. Additionally, the coverage reporting syntax has been altered to specifically target the Cobertura coverage format and specify the path for the coverage.xml file.
      4920a85a
    • Florian Schröder's avatar
      Update GitLab CI configuration and README · 5bf35d63
      Florian Schröder authored
      Removed the coverage line from the .gitlab-ci.yml file. Also, badges for the pipeline status and coverage were added to the README file. The changes improve the information available at a glance on the project's README.
      5bf35d63
    • Florian Schröder's avatar
      Update testing procedures and dependencies · 2eafc355
      Florian Schröder authored
      Changed the testing script in .gitlab-ci.yml to use Pytest's coverage feature instead of the standalone Coverage tool. Also, updated the test_requirements in setup.py to include pytest-cov, eliminating the need for separate coverage version.
      2eafc355
    • Florian Schröder's avatar
      Implement coverage measurement for tests · 035b2a6d
      Florian Schröder authored
      The pytest command in .gitlab-ci.yml has been updated to include code coverage measurements. The "coverage" Python package was added in setup.py under test requirements. Also, small updates were made in tests to reflect changes in the module imports and object comparisons.
      035b2a6d
    • Florian Schröder's avatar
    • Florian Schröder's avatar
      Merge branch '100-player-id-in-hooks-and-in-all-relevant-methods' into 'main' · d6cc42d7
      Florian Schröder authored
      Resolve "player id in hooks and in all relevant methods"
      
      Closes #100
      
      See merge request scs/cocosy/overcooked-simulator!69
      d6cc42d7
  2. Feb 28, 2024
    • Florian Schröder's avatar
      Update meal configurations and add player context to counters · e60d58b0
      Florian Schröder authored
      Meal configurations in the level 1 configuration file are updated, swapping out the previous meals with new ones. Player name has been added as a parameter to the pick_up and drop_off methods in player.py and counters.py. This allows for better tracking of the actions of individual players, which can be useful in cooperative environments where player accountability is imperative. Additionally, served meals now also log the serving player's name, providing additional context during gameplay and post-game analysis.
      e60d58b0
    • Florian Schröder's avatar
      Update README.md and __init__.py with new server instructions and data descriptions · 10291784
      Florian Schröder authored
      Updated instructions on how to start the game and study servers, and run PyGame GUI individually. Now, these can be initiated with specific arguments. Enhanced the data descriptions by adding additional documentation for Study Config and for generating images/videos from recordings. Also, revised the base models and TypedDicts within state representation.
      10291784
    • Florian Schröder's avatar
      Merge branch '71-file-dir-renaming-2' into 'main' · 5cbbe589
      Florian Schröder authored
      Resolve "File, dir renaming"
      
      Closes #71
      
      See merge request scs/cocosy/overcooked-simulator!67
      5cbbe589
    • Florian Schröder's avatar
      Update directory name in installation instructions · 04ac8523
      Florian Schröder authored
      The installation instructions in README.md and __init__.py have been updated to reflect the change in directory name from 'cooperative_cuisine' to 'overcooked-simulator'. This update ensures the correct directory is specified for the 'cd' command post cloning of the repository.
      04ac8523
    • Florian Schröder's avatar
      Update project title in README · 7e1a0ec1
      Florian Schröder authored
      The project title in the README.md file was incorrect. This commit updates it from "Cooperative Cuisine Simulator" to the correct title, "Cooperative Cuisine Environment".
      7e1a0ec1
Loading