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

Anticipation Velocity Model (AVM) #1432

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

Conversation

chraibi
Copy link
Contributor

@chraibi chraibi commented Dec 30, 2024

In this PR, the model Anticipation in a velocity-based model for pedestrian dynamics
is implemented.

  • Add the skeleton of the model
  • Rename model to AnticipationVelocityModel
  • Add Parameters to API: AntiTime, ConstantAlpha
  • Python API
  • Add Tests
  • Add Documentation

- This change is to make sure, I'm using my own version.
- Will be reversed when I'm done
@chraibi chraibi added the Model Model developements label Dec 30, 2024
@chraibi chraibi added this to the v1.2.2 milestone Dec 30, 2024
TODO: _JPS_Agent_GetCollisionFreeSpeedModelV3State can not be found
when importing jupedsim
Copy link
Contributor

@Ozaq Ozaq left a comment

Choose a reason for hiding this comment

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

You should consider another name for this model. CFSMv3 implies a direct evolution on v2. I am not sure if this really is the case or if there is more novelty to it.

@chraibi chraibi changed the title Collision Free Speed Model v3 Anticipation velocity model (AVM) Jan 1, 2025
@chraibi chraibi changed the title Anticipation velocity model (AVM) Anticipation Velocity Model (AVM) Jan 1, 2025
@chraibi chraibi self-assigned this Jan 1, 2025
@chraibi chraibi requested a review from xuqiancheng January 6, 2025 18:38
@chraibi
Copy link
Contributor Author

chraibi commented Jan 6, 2025

@xuqiancheng I think the model is ready for your review. Can you please check if the equations are implemented correctly according to the model?

We can not yet use the model though, due to lack of the python-API.

Copy link
Contributor

@xuqiancheng xuqiancheng left a comment

Choose a reason for hiding this comment

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

I have checked the code, except for the function BoundaryRepulsion, other equations of the AVM are implemented correctly.

libsimulator/src/AnticipationVelocityModel.cpp Outdated Show resolved Hide resolved
libsimulator/src/AnticipationVelocityModel.cpp Outdated Show resolved Hide resolved
@chraibi chraibi requested a review from xuqiancheng January 7, 2025 12:25
@chraibi chraibi requested a review from Ozaq January 15, 2025 13:18
@chraibi
Copy link
Contributor Author

chraibi commented Jan 15, 2025

@Ozaq I think most of the text in the first cell of the model-comparison-notebook, might be better placed in pedestrian_models/index.html.

What do you think? I would do it directly in this PR.

CMakeLists.txt Outdated
@@ -2,7 +2,7 @@
# Project setup
################################################################################
cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
project(JuPedSim VERSION 1.3.0 LANGUAGES CXX)
project(JuPedSim VERSION 1.3.1 LANGUAGES CXX)
Copy link
Contributor

Choose a reason for hiding this comment

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

Please revert the version bump, 1.3.0 is still unreleased

Comment on lines 29 to 30
# geometry = shapely.GeometryCollection(shapely.box(0, -2.5, 50, 2.5))
# exit_polygon = shapely.box(48, -2.5, 50, 2.5) #
Copy link
Contributor

Choose a reason for hiding this comment

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

remove commented out code

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Model Model developements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants