Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

named parameters in up.sh; saving trajectories; trajectories replay #29

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

bmielnicki
Copy link
Collaborator

  1. Added usage of named parameters to up.sh. They can be used everything that was specified by env variables (that are no longer used), also trajectories and agents directories.
  2. Pass to docker-compose all env variables by .env file. This prevents any naming collisions with other applications.
  3. Trajectory and agent directories are now passed as volumes so all changes there (like saving trajectory) are now kept between sessions.
  4. Added saving trajectories to trajectory directory. It uses OvercookedEnv so there is no code duplication between overcooked-demo and overcooked_ai code. Checkbox in index.html is added so user can choose if trajectory should be saved.
    save_trajectory
  5. Small changes in OvercookedPsiturk to work with changes in OvercookedGame.

I plan to add additional stuff into this branch (like replaying trajectories from trajectory directory), but changes above seems to be mergable into master now.

@bmielnicki bmielnicki added the enhancement New feature or request label Oct 7, 2020
Copy link
Collaborator

@mesutyang97 mesutyang97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow! Thanks for adding this long-awaited feature! LGTM but would like to get feedback from @nathan-miller23

I have cloned this branch and tested it locally. It does indeed work

@mesutyang97
Copy link
Collaborator

@bmielnicki just one more question, is this supposed to work with the trajectory visualization PR?

@bmielnicki
Copy link
Collaborator Author

@bmielnicki just one more question, is this supposed to work with the trajectory visualization PR?

Currently, there is no integration between this PR and HumanCompatibleAI/overcooked_ai#38 except they use the same trajectory format. I plan to get them both working together - when the player picks the trajectory file to visualize he will be able to see both the replay and the chart.

@bmielnicki
Copy link
Collaborator Author

bmielnicki commented Oct 13, 2020

Additional changes are pushed:

  1. Creating trajectory with selected filename (with use of template values for layout name or timestamp)
  2. Replay of trajectories
    • based OvercookedTrajectoryReplay on the legacy branch
    • currently, it is not an object as I've had problems with changing context when putting all variables and functions into class (this changes context from object to window easily)
    • Timesteps per render number is used for controlling how many timesteps should be between consecutive renders (with high Timesteps per second variable whole code is slowing down if we want to render every state).
      replay

Next step:

  • Use the code from Trajectory visualization overcooked_ai#38 to render chart below the game (and line up slider handle with timesteps on the chart). Add a checkbox to turn on and off the chart and/or trajectory replay.

As before - this change is ready to be merged after getting feedback.

@bmielnicki bmielnicki linked an issue Oct 13, 2020 that may be closed by this pull request
@bmielnicki bmielnicki changed the title named parameters in up.sh; saving trajectories named parameters in up.sh; saving trajectories; trajectories replay Oct 13, 2020
@bmielnicki
Copy link
Collaborator Author

Extension of this PR is #30 It is separate PR because it requires review of HumanCompatibleAI/overcooked_ai#38 and I don't want to prevent merge of previous changes because of that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Front End Control for Step-Speed in Trajectory Replay
2 participants