Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@rohanchandra30
rohanchandra30 committed Feb 22, 2024
1 parent 992706c commit 1052c38
Show file tree
Hide file tree
Showing 29 changed files with 1,081 additions and 111 deletions.
2 changes: 1 addition & 1 deletion config_runner/configs/1_31_23/door/sacadrl.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"num_agents": 2,
"eval_num_agents": [3, 4, 5, 7, 10, 20],
"eval_num_agents": 2,
"train_length": 250000,
"ending_eval_trials": 25,
"eval_frequency": 0,
Expand Down
67 changes: 37 additions & 30 deletions docker/vectordisplay/maps/tmp/multi-scenario/multi-scenario.navigation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 1,
"s1_id": 2
"s1_id": 6
},
{
"has_automated_door": false,
Expand All @@ -27,8 +27,8 @@
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 2,
"s1_id": 3
"s0_id": 6,
"s1_id": 2
},
{
"has_automated_door": false,
Expand All @@ -37,8 +37,8 @@
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 3,
"s1_id": 4
"s0_id": 2,
"s1_id": 3
},
{
"has_automated_door": false,
Expand All @@ -58,7 +58,7 @@
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 5,
"s1_id": 6
"s1_id": 7
},
{
"has_automated_door": false,
Expand Down Expand Up @@ -87,86 +87,93 @@
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 9,
"s1_id": 10
"s0_id": 10,
"s1_id": 11
}
],
"nodes": [
{
"id": 0,
"loc": {
"x": -84.42088317871094,
"y": 36.796165466308594
"x": -85.81442260742188,
"y": 37.51080322265625
}
},
{
"id": 1,
"loc": {
"x": -65.49714660644531,
"y": 35.95743942260742
"x": -63.93830871582031,
"y": 37.298927307128906
}
},
{
"id": 2,
"loc": {
"x": -64.39631652832031,
"y": 13.678800582885742
"x": -55.14548873901367,
"y": 9.066556930541992
}
},
{
"id": 3,
"loc": {
"x": -70.1101303100586,
"y": 13.573960304260254
"x": -54.66876983642578,
"y": 40.053306579589844
}
},
{
"id": 4,
"loc": {
"x": -70.16255187988281,
"y": 7.860144138336182
"x": -84.17239379882813,
"y": 27.287824630737305
}
},
{
"id": 5,
"loc": {
"x": -57.47683334350586,
"y": 8.01740550994873
"x": -84.06645202636719,
"y": 7.000773906707764
}
},
{
"id": 6,
"loc": {
"x": -57.73893737792969,
"y": 37.844573974609375
"x": -64.20315551757813,
"y": 9.119525909423828
}
},
{
"id": 7,
"loc": {
"x": -85.10234069824219,
"y": 6.602056503295898
"x": -60.76018142700195,
"y": 6.577023506164551
}
},
{
"id": 8,
"loc": {
"x": -70.1101303100586,
"y": 6.287534236907959
"x": -51.490638732910156,
"y": 6.471086025238037
}
},
{
"id": 9,
"loc": {
"x": -55.43243408203125,
"y": 6.339954853057861
"x": -51.75548553466797,
"y": 35.92173767089844
}
},
{
"id": 10,
"loc": {
"x": -56.06148147583008,
"y": 38.001834869384766
"x": -63.991275787353516,
"y": -7.459708213806152
}
},
{
"id": 11,
"loc": {
"x": -64.15018463134766,
"y": 3.76967716217041
}
}
]
Expand Down
30 changes: 15 additions & 15 deletions docker/vectordisplay/maps/tmp/multi-scenario/multi-scenario.vectormap.txt
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
-87.844826, 40.172413, -88.017242, -13.965517
-19.000624, 26.448141, -19.000624, 26.448141
-20.026054, 26.319963, -20.026054, 26.319963
-87.704407, 30.549860, -68.605782, 30.549860
-60.658703, 39.906906, -60.530525, 9.913089
-68.477600, 30.678040, -68.093063, 18.501062
-68.033943, 18.292671, -79.927086, 18.129751
-79.927086, 18.129751, -79.764160, 10.309603
-79.764160, 10.146683, -73.573212, 10.146683
-60.621090, 10.146683, -66.893501, 10.228143
-88.073074, 5.014711, -73.654671, 4.933251
-73.654671, 4.933251, -73.736130, -13.476682
-66.730583, 4.770331, -66.486206, -13.639602
-66.730583, 4.444491, -53.126781, 4.444491
-53.126781, 4.281572, -54.104301, 40.042458
-88.073074, -13.721062, -66.404739, -13.558142
-87.828690, 40.205379, -60.702553, 39.716621
-87.911598, 40.313660, -87.996986, 5.135178
-87.911598, 40.399044, -60.588509, 40.313660
-60.588509, 40.313660, -60.673893, 10.087488
-87.826218, 34.592888, -66.906975, 34.507504
-66.906975, 34.507504, -66.992355, 14.185952
-66.992355, 14.100568, -80.226982, 14.100568
-80.226982, 14.100568, -80.312363, 26.566729
-87.911598, 5.220562, -66.992355, 5.305947
-66.992355, 5.305947, -66.906975, -8.270215
-60.246967, -7.843292, -60.161583, 5.476716
-60.588509, 10.002104, -56.233891, 9.916719
-60.246967, 5.391332, -53.160042, 5.305947
-56.063122, 9.831334, -55.977737, 40.825970
-53.245426, 5.391332, -50.427731, 5.391332
-50.427731, 5.305947, -50.513119, 40.996738
180 changes: 180 additions & 0 deletions docker/vectordisplay/maps/tmp/multi_scenario/multi_scenario.navigation.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
{
"edges": [
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 0,
"s1_id": 1
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 1,
"s1_id": 6
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 6,
"s1_id": 2
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 2,
"s1_id": 3
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 4,
"s1_id": 5
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 5,
"s1_id": 7
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 7,
"s1_id": 8
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 8,
"s1_id": 9
},
{
"has_automated_door": false,
"has_door": false,
"has_elevator": false,
"has_stairs": false,
"max_clearance": 1.0,
"max_speed": 2.0,
"s0_id": 10,
"s1_id": 11
}
],
"nodes": [
{
"id": 0,
"loc": {
"x": -85.81442260742188,
"y": 37.51080322265625
}
},
{
"id": 1,
"loc": {
"x": -63.93830871582031,
"y": 37.298927307128906
}
},
{
"id": 2,
"loc": {
"x": -55.14548873901367,
"y": 9.066556930541992
}
},
{
"id": 3,
"loc": {
"x": -54.66876983642578,
"y": 40.053306579589844
}
},
{
"id": 4,
"loc": {
"x": -84.17239379882813,
"y": 27.287824630737305
}
},
{
"id": 5,
"loc": {
"x": -84.06645202636719,
"y": 7.000773906707764
}
},
{
"id": 6,
"loc": {
"x": -64.20315551757813,
"y": 9.119525909423828
}
},
{
"id": 7,
"loc": {
"x": -60.76018142700195,
"y": 6.577023506164551
}
},
{
"id": 8,
"loc": {
"x": -51.490638732910156,
"y": 6.471086025238037
}
},
{
"id": 9,
"loc": {
"x": -51.75548553466797,
"y": 35.92173767089844
}
},
{
"id": 10,
"loc": {
"x": -63.991275787353516,
"y": -7.459708213806152
}
},
{
"id": 11,
"loc": {
"x": -64.15018463134766,
"y": 3.76967716217041
}
}
]
}
Empty file added docker/vectordisplay/maps/tmp/multi_scenario/multi_scenario.navigation.txt
View file
Empty file.
17 changes: 17 additions & 0 deletions docker/vectordisplay/maps/tmp/multi_scenario/multi_scenario.vectormap.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
-19.000624, 26.448141, -19.000624, 26.448141
-20.026054, 26.319963, -20.026054, 26.319963
-87.911598, 40.313660, -87.996986, 5.135178
-87.911598, 40.399044, -60.588509, 40.313660
-60.588509, 40.313660, -60.673893, 10.087488
-87.826218, 34.592888, -66.906975, 34.507504
-66.906975, 34.507504, -66.992355, 14.185952
-66.992355, 14.100568, -80.226982, 14.100568
-80.226982, 14.100568, -80.312363, 26.566729
-87.911598, 5.220562, -66.992355, 5.305947
-66.992355, 5.305947, -66.906975, -8.270215
-60.246967, -7.843292, -60.161583, 5.476716
-60.588509, 10.002104, -56.233891, 9.916719
-60.246967, 5.391332, -53.160042, 5.305947
-56.063122, 9.831334, -55.977737, 40.825970
-53.245426, 5.391332, -50.427731, 5.391332
-50.427731, 5.305947, -50.513119, 40.996738
Loading

0 comments on commit 1052c38

Please sign in to comment.