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

Feature/vru two heavy vehicles #172

Merged
merged 4 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions co-simulation/bundle/src/assembly/resources/scenarios/Town04/sumo/Town04.rou.xml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-05-23 13:36:19 by Eclipse SUMO netedit Version 1.16.0
<!-- generated on 2023-11-06 14:44:39 by Eclipse SUMO netedit Version 1.18.0
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Routes -->
<route id="r_0" edges="-7 -8 -9 -10 -11 -12 -13 -14 -36 -37 -38 -39 33 47 44 39 38 37 36 35"/>
<route id="r_0" edges="11 10 17"/>
<route id="r_1" edges="12 11 10 17"/>
<route id="r_2" edges="13 12 11 10 17"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="v_0" depart="999.00" route="r_0"/>
</routes>
<vehicle id="v_0" type="vehicle.carlamotors.carlacola" depart="0.00" route="r_2"/>
<vehicle id="v_1" type="vehicle.carlamotors.carlacola" depart="3.00" route="r_1"/>
<vehicle id="v_2" type="vehicle.carlamotors.carlacola" depart="8.00" route="r_0">
<stop busStop="bs_2" duration="5.00"/>
</vehicle>
<!--This is for keeping the simulation alive-->
<vehicle id="v_3" type="vehicle.carlamotors.carlacola" depart="999.00" route="r_0"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

what is this one? seems like there are 4 vehicles?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This one is used for keeping the scenario alive, if we only have three cars, the simulation will stop after the last car finishes, might not give us time for other Carma stuff we want to do, this is a safety

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add some sort of comment indicating that this vehicle is just there to extend the CARLA scenario.

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
</traci_server>
<input>
<net-file value="Town04.net.xml"/>
<route-files value="Town04.rou.xml"/>
<additional-files value="detector.xml"/>
<route-files value="carlavtypes.rou.xml,Town04.rou.xml"/>
<additional-files value="detector.xml, bus_stop.add.xml"/>
<gui-settings-file value="gui.settings.xml"/>
MishkaMN marked this conversation as resolved.
Show resolved Hide resolved

</input>
<gui_only>
<tracker-interval value="0.1"/>
<gui-settings-file value="viewsettings.xml"/>
MishkaMN marked this conversation as resolved.
Show resolved Hide resolved
</gui_only>
<time>
<step-length value="0.1"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-06 15:52:06 by Eclipse SUMO netedit Version 1.18.0
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<busStop id="bs_2" lane="10_3" startPos="2.00" endPos="8.00"/>
</additional>
Comment on lines +1 to +9
Copy link
Contributor

Choose a reason for hiding this comment

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

If we are not using bus stop, do we still need this? or is also being used for the heavy_vehicles to stop?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it's actually used in the rou.xml file, under the third car

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--generated on 2020-03-04 18:25:00 by create_sumo_vtypes.py-->
<routes>
<vType id="vehicle.audi.a2" length="3.7186214923858643" width="1.7924479246139526" height="1.5354934930801392" vClass="passenger"/>
<vType id="vehicle.audi.tt" length="4.147226333618164" width="2.0032031536102295" height="1.382421851158142" vClass="passenger"/>
<vType id="vehicle.carlamotors.carlacola" length="5.1992292404174805" width="2.6150190830230713" height="2.4768505096435547" vClass="truck" guiShape="truck" tau="0.1" minGap="1"/>
<vType id="vehicle.dodge_charger.police" length="5.010976314544678" width="2.054335832595825" height="1.5807031393051147" vClass="authority" guiShape="police"/>
<vType id="vehicle.jeep.wrangler_rubicon" length="3.8681068420410156" width="1.906570553779602" height="1.8799999952316284" vClass="passenger"/>
<vType id="vehicle.chevrolet.impala" length="5.369193077087402" width="2.052736520767212" height="1.4150995016098022" vClass="passenger"/>
<vType id="vehicle.mini.cooperst" length="3.8021926879882812" width="1.9740344285964966" height="1.4750006198883057" vClass="passenger"/>
<vType id="vehicle.bmw.isetta" length="2.2024967670440674" width="1.4853248596191406" height="1.3464953899383545" vClass="evehicle"/>
<vType id="vehicle.audi.etron" length="4.892005443572998" width="2.08632230758667" height="1.6511509418487549" vClass="evehicle"/>
<vType id="vehicle.mercedes-benz.coupe" length="5.043785095214844" width="2.1629974842071533" height="1.640134572982788" vClass="passenger"/>
<vType id="vehicle.bmw.grandtourer" length="4.639087677001953" width="2.259321928024292" height="1.6781779527664185" vClass="passenger"/>
<vType id="vehicle.toyota.prius" length="4.538333415985107" width="2.0011305809020996" height="1.5373616218566895" vClass="evehicle"/>
<vType id="vehicle.citroen.c3" length="3.9753477573394775" width="1.862074851989746" height="1.6257729530334473" vClass="passenger"/>
<vType id="vehicle.mustang.mustang" length="4.904701232910156" width="2.0606582164764404" height="1.478397011756897" vClass="passenger"/>
<vType id="vehicle.tesla.model3" length="4.808821678161621" width="2.1695058345794678" height="1.5231821537017822" vClass="evehicle"/>
<vType id="vehicle.diamondback.century" length="1.6562436819076538" width="0.42141881585121155" height="1.49351167678833" vClass="bicycle"/>
<vType id="vehicle.gazelle.omafiets" length="1.843441367149353" width="0.4674844741821289" height="1.590073823928833" vClass="bicycle"/>
<vType id="vehicle.harley-davidson.low_rider" length="2.350175619125366" width="0.7662330269813538" height="1.4637391567230225" vClass="motorcycle"/>
<vType id="vehicle.bh.crossbike" length="1.5093227624893188" width="0.8659406304359436" height="1.5306309461593628" vClass="bicycle"/>
<vType id="vehicle.tesla.cybertruck" length="6.364232063293457" width="2.3934903144836426" height="2.1439828872680664" vClass="evehicle"/>
<vType id="vehicle.volkswagen.t2" length="4.473711013793945" width="1.8112499713897705" height="2.0543651580810547" vClass="passenger" guiShape="passenger/van"/>
<vType id="vehicle.kawasaki.ninja" length="2.043684244155884" width="0.7969123125076294" height="1.374603033065796" vClass="motorcycle"/>
<vType id="vehicle.lincoln.mkz2017" length="4.904701232910156" width="2.0606582164764404" height="1.478397011756897" vClass="passenger"/>
<vType id="vehicle.seat.leon" length="4.207873821258545" width="1.8198652267456055" height="1.4694602489471436" vClass="passenger"/>
<vType id="vehicle.yamaha.yzf" length="2.1907684803009033" width="0.7662330269813538" height="1.6345058679580688" vClass="motorcycle"/>
<vType id="vehicle.nissan.patrol" length="4.519999980926514" width="1.9199999570846558" height="1.8871309757232666" vClass="passenger"/>
<vType id="vehicle.nissan.micra" length="3.6688475608825684" width="1.8561522960662842" height="1.5232137441635132" vClass="passenger"/>
</routes>
Loading