Skip to content

Commit

Permalink
Update to use simulations with initial positions
Browse files Browse the repository at this point in the history
  • Loading branch information
chraibi committed Oct 9, 2024
1 parent 061bf76 commit c9c9878
Show file tree
Hide file tree
Showing 6 changed files with 408 additions and 98 deletions.
2 changes: 1 addition & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
st.session_state.data = {}

if "all_files" not in st.session_state:
st.session_state.all_files = ["files/bottleneck.json"]
st.session_state.all_files = ["files/inifile.json"]

tab = init_sidebar()

Expand Down
136 changes: 95 additions & 41 deletions files/bottleneck.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,81 +5,89 @@
],
"version": 0.1,
"velocity_init_parameters": {
"a_ped": 0.4,
"d_ped": 0.1,
"a_wall": 0.6,
"d_wall": 0.2,
"a_ped_min": 0.4,
"a_ped_max": 0.4,
"a_ped": 0.1,
"d_ped": 0.4,
"a_ped_min": 0.1,
"a_ped_max": 1.0,
"d_ped_min": 0.1,
"d_ped_max": 0.1,
"d_ped_max": 1.0,
"a_wall": 0.4,
"d_wall": 0.2,
"radius": 0.10
},
"simulation_parameters": {
"fps": 60,
"time_step": 0.002,
"time_step": 0.001,
"number_agents": 50,
"simulation_time": 200
"simulation_time": 100
},
"measurement_line": {
"vertices": [
[
60,
101.7
1.47,
19.57
],
[
60,
102.3
-1.52,
19.57
]
]
},
"measurement_area": {
"vertices": [
[
60,
101.6
3.57,
-0.89
],
[
3.64,
19.57
],
[
60,
102.4
1.47,
19.57
],
[
-1.52,
19.57
],
[
59,
102.4
-3.57,
19.57
],
[
59,
101.6
-3.54,
-1.13
]
]
},
"motivation_parameters": {
"motivation_strategy": "default",
"motivation_strategy": "EVC",
"normal_v_0": 1.2,
"normal_time_gap": 1.0,
"width": 1.0,
"height": 1.0,
"width": 2.0,
"height": 2.0,
"seed": 1.0,
"max_value_high": 1.0,
"min_value_high": 0.5,
"min_value_high": 0.8,
"max_value_low": 0.5,
"min_value_low": 0.0,
"number_high_value":10,
"min_value_low": 0.2,
"number_high_value": 30,
"competition_max": 1,
"competition_decay_reward": 10,
"percent": 1,
"competition_decay_reward": 5,
"percent": 0.8,
"motivation_doors": [
{
"id": 1,
"label": "door",
"vertices": [
[
58,
102.3
-2.5,
18.0
],
[
58,
101.7
2.5,
18.0
]
]
}
Expand Down Expand Up @@ -154,22 +162,68 @@
{
"id": 1,
"label": "exit",
"vertices": [
[
-5.0,
23.0
],
[
-6,
23.0
],
[
-6,
22.0
],
[
-5,
22.0
]
]
}
,
{
"id": 2,
"label": "exit",
"vertices": [
[
5.0,
23.0
],
[
6.0,
23.0
],
[
6.0,
22.0
],
[
5.0,
22.0
]
]

},
{
"id": 3,
"label": "exit",
"vertices": [
[
64.5,
102.6
-0.2,
25.0
],
[
64.5,
101.4
0.2,
25.0
],
[
65,
101.4
0.2,
24.0
],
[
65,
102.6
-0.2,
24.0
]
]
}
Expand Down
204 changes: 204 additions & 0 deletions positions.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit c9c9878

Please sign in to comment.