Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: proroklab/VectorizedMultiAgentSimulator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.4.2
Choose a base ref
...
head repository: proroklab/VectorizedMultiAgentSimulator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.4.3
Choose a head ref
  • 15 commits
  • 47 files changed
  • 6 contributors

Commits on Jul 10, 2024

  1. VMAS-1.4.2

    matteobettini committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b90cd27 View commit details
    Browse the repository at this point in the history
  2. [Doc] Format README.md

    matteobettini committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a9d545f View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. [Feature] Vectorized lidar (#124)

    * init
    
    * added raycasting with multiple angles
    
    * out commenting the old
    
    * aemnd
    
    * aemnd
    
    * aemnd
    
    * aemnd
    
    * aemnd
    
    * aemnd
    
    * aemnd
    
    ---------
    
    Co-authored-by: Zartris <Jonas.le.fevre@gmail.com>
    matteobettini and Zartris authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    cd7c14a View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. [Feature] Joint rotation offset and more dynamics (#125)

    * amend
    
    * amend
    
    * amend
    
    * amend
    
    * amend
    
    * amend
    matteobettini authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    aa1e02a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b5eeeca View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Configuration menu
    Copy the full SHA
    fe9c3b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. [Feature] allow different number of discrete actions for each action …

    …dimension (#119)
    
    * support custom nvec for discrete actions
    
    Changes:
    - add action_nvec property to the Dynamics ABC (defaults to 3s as before when not overridden)
    - add Agent.action_nvec
    - In Environment: update get_agent_action_space, get_random_action, _set_action to support Agent.action_nvec
    
    * add composite dynamics
    
    Changes:
    - add simulator.dynamics.composite with Composite class
    - add Rotation to simulator.dynamics.holonomic_with_rot
    
    * revert changes to dynamics, improve logic for bc-compatibility
    
    * Apply suggestions from code review
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * fix discrete to multi-discrete mapping, add tests
    
    * Apply suggestions from code review
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * improve tests
    
    ---------
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    rikifunt and matteobettini authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    21a3199 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Configuration menu
    Copy the full SHA
    ee892d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Introduce x_semidim and y_semidim kwargs to selected scenarios (#133)

    * Introduce x_semidim and y_semidim parameters for managing environment dimensions
    
    * [discovery]introduce x_semidim and y_semidim parameters for managing environment dimensions
    
    * [navigation]introduce x_semidim and y_semidim parameters for managing environment dimensions
    Giovannibriglia authored Aug 27, 2024
    Configuration menu
    Copy the full SHA
    73bb583 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. [BugFix] Discovery obs (#137)

    * amend
    
    * amend
    
    * amend
    matteobettini authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    ff58363 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. [Feature] Navigation: kwargs for spawning ranges (#139)

    * Introduce x_semidim and y_semidim parameters for managing environment dimensions
    
    * [discovery]introduce x_semidim and y_semidim parameters for managing environment dimensions
    
    * [navigation]introduce x_semidim and y_semidim parameters for managing environment dimensions
    
    * [environment rendering] implementing boundary visualization for limited environments
    
    * [navigation] ensure entity placement within constrained environment boundaries
    
    * [environment rendering] implementing boundary visualization for limited environments
    
    * [Features] world_spawning_x, world_spawning_y and enforce_bounds
    
    * [Bug Fix] world_spawning_x, world_spawning_y and enforce_bounds
    
    * Update vmas/scenarios/navigation.py
    
    * Update vmas/scenarios/navigation.py
    
    * [Bug Fix] world_spawning_x, world_spawning_y and enforce_bounds
    
    * [Bug Fix] world_spawning_x, world_spawning_y and enforce_bounds
    
    ---------
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    Giovannibriglia and matteobettini authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    89882a6 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. [Feature] Enable to set the number of lidar rays in navigation, disco…

    …very and flocking scenarios (#141)
    
    * introduce "n_lidar_rays_entities" and "n_lidar_rays_agents"
    
    * introduce "n_lidar_rays"
    
    * introduce "n_lidar_rays"
    
    * Update vmas/scenarios/discovery.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/scenarios/flocking.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/scenarios/navigation.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    ---------
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    Giovannibriglia and matteobettini authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    26ceb42 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. [Feature] Boundary visualization for limited-size environments (#142)

    * add boundary visualization for limited-size environments
    
    * add boundary visualization for limited-size environments
    
    * add boundary visualization for limited-size environments
    
    * introduce "visualize_semidims" to display boundaries
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/simulator/scenario.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * add boundary visualization for limited-size environments
    
    * disabled "visualize_semidims" as boundaries are already being plotted in this scenario
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * disabled "visualize_semidims" as boundaries are already being plotted in this scenario
    
    * add boundary visualization for limited-size environments
    
    * Update vmas/simulator/environment/environment.py
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    
    * add boundary visualization for limited-size environments
    
    ---------
    
    Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
    Giovannibriglia and matteobettini authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    132d97b View commit details
    Browse the repository at this point in the history
  2. [Feature] Terminated/truncated support and Gymnasium wrapper (#143)

    * add gymnasium integration but maintain openai gym support
    
    * update documentation (default being gym)
    
    * by default preserve original interface of all functions
    
    * Update gymnasium/ gym integration
    - base VMAS environment uses OpenAI gym spaces
    - base VMAS environment has new flag `terminated_truncated` (default:
      False) that determines whether `done()` and `step()` return the
      default `done` value or separate values for `terminated` and
      `truncated`
    - update `gymnasium` wrapper to convert gym spaces of base environment
      to gymnasium spaces
    - add `gymnasium_vec` wrapper that can wrap vectorized VMAS environment
      as gymnasium environment
    - add new installation options of VMAS for optional dependencies (used
      for features like rllib, torchrl, gymnasium, rendering, testing)
    - add `return_numpy` flag in gymnasium wrappers (default: True) to
      determine whether to convert torch tensors to numpy --> passed through by `make_env` function
    - add `render_mode` flag in gymnasium wrappers (default: "human") to
      determine mode to render --> passed through by `make_env` function
    
    * use gymnasium and shimmy tools to convert spaces + use vmas to_numpy
    conversion
    
    * update VMAS wrappers
    - add base VMAS wrapper class for type conversion between tensors and np
      for singleton and vectorized envs
    - change default of gym wrapper to return np data
    - update interactive rendering to be compatible with non gym wrapper
      class (to preserve tensor types)
    - add error messages for gymnasium and rllib wrappers without installing
      first
    
    * update vmas wrapper base class, move wrappers and add wrapper tests
    
    * incorporate feedback
    - update github dependency installation
    - unify get scenario test function and limit wrapper tests to fewer
      scenarios
    - allow import of all gym wrappers from `vmas.simulator.environment.gym`
    - consider env continuous_actions for action type conversion in wrappers
    - compress info to single nested info if needed rather than combining
      keys
    
    * remove import error
    
    * Revert "remove import error"
    
    This reverts commit 2d0ad62.
    
    * import optional deps only when needed
    
    * relative imports
    
    * installation docs
    
    * interactive render
    
    * docs
    
    * more docs
    
    * various
    
    * small nits
    
    * gym wrapper tests for dict spaces check obs shapes matching obs key
    
    ---------
    
    Co-authored-by: Matteo Bettini <mb2389@cl.cam.ac.uk>
    LukasSchaefer and matteobettini authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    659c390 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. VMAS-1.4.3

    matteobettini committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    dc77a5f View commit details
    Browse the repository at this point in the history
Loading