Permalink
Browse files

Merge branch 'develop' of github.com:movsim/movsim into develop

  • Loading branch information...
akegermany committed Sep 25, 2018
2 parents a792c28 + 3fb2a0e commit 39865fcd5a18c25623a00ceb61b333b394bc3f02
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -12,7 +12,7 @@
</AccelerationModelType>
</VehiclePrototypeConfiguration>
</VehiclePrototypes>
<Scenario network_filename="simple_onramp.xodr">
<Scenario network_filename="simple_onramp_CA_dx7.5.xodr">
<Simulation timestep="1" duration="7200" seed="42" crash_exit="false">
<TrafficComposition>
<VehicleType label="BARL1" fraction="1" />
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -11,7 +11,7 @@
</AccelerationModelType>
</VehiclePrototypeConfiguration>
</VehiclePrototypes>
<Scenario network_filename="simple_onramp.xodr">
<Scenario network_filename="simple_onramp_CA_dx0.5.xodr">
<Simulation timestep="1" duration="7200" seed="42" crash_exit="false">
<TrafficComposition>
<VehicleType label="KKW1" fraction="1" />
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -13,7 +13,7 @@
<LaneChangeModelType />
</VehiclePrototypeConfiguration>
</VehiclePrototypes>
<Scenario network_filename="simple_onramp.xodr">
<Scenario network_filename="simple_onramp_CA_dx7.5.xodr">
<Simulation timestep="1" duration="7200" seed="42" crash_exit="false">
<TrafficComposition>
<VehicleType label="NSM1" fraction="1" />
@@ -39,8 +39,8 @@
</SimpleRamp>
<Detectors sample_interval="60" logging="true">
<CrossSection position="0" />
<CrossSection position="1000" />
<CrossSection position="2000" />
<CrossSection position="100" />
<CrossSection position="200" />
</Detectors>
</Road>
<Road id="3" />
@@ -0,0 +1,10 @@
xPixSizeWindow=1200
yPixSizeWindow=700
xOffset=-13800
yOffset=1000
initialScale=0.5
drawRoadId=true
drawSources=true
drawSinks=true
drawSpeedLimits=false
drawSlopes=falses
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<OpenDRIVE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="OpenDRIVE_1.3.xsd">
<header revMajor="1" revMinor="2" name="" version="1.00" date="Thu Sep 2 20:31:10 2010" north="0.0" south="0.0" east="0.0" west="0.0" />
<road name="" length="14000.0" id="1" junction="-1">
<road name="MainUpstream" length="14000.0" id="1" junction="-1">
<link>
<successor elementType="road" elementId="2" contactPoint="start" />
</link>
@@ -23,15 +24,32 @@
</laneSection>
</lanes>
</road>
<road name="" length="2000.0" id="2" junction="-1">
<!-- simple ramp: vehicles are just dropped along its length at a
given rate; offset simpleRamp by 5 m in the y dir to make it visible-->
<road name="SimpleRamp" length="2000.0" id="2" junction="-1">
<link>
<predecessor elementType="road" elementId="1" contactPoint="end" />
<successor elementType="road" elementId="3" contactPoint="start" />
</link>
<planView>
<geometry s="0.0" x="14000.0" y="300.0" hdg="0.0" length="2000.0">
<geometry s="0.0" x="14000.0" y="300.0" hdg="0.0" length="100.0">
<arc curvature="0.002" />
</geometry>
<geometry s="0.0" x="14100.0" y="310.0" hdg="0.2" length="100.0">
<arc curvature="-0.002" />
</geometry>
<geometry s="0.0" x="14200.0" y="320.0" hdg="0.0" length="1600.0">
<line />
</geometry>
<geometry s="0.0" x="15800.0" y="320.0" hdg="0.0" length="100.0">
<arc curvature="-0.002" />
</geometry>
<geometry s="0.0" x="15900.0" y="310.0" hdg="-0.2" length="100.0">
<arc curvature="0.002" />
</geometry>
</planView>
<lanes>
<laneSection s="0.0">
@@ -47,6 +65,7 @@
</laneSection>
</lanes>
</road>
<road name="" length="4000.0" id="3" junction="-1">
<link>
<predecessor elementType="road" elementId="2" contactPoint="end" />
@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- infrastructure file for CA with cell width 0.5 m: everything is
multiplied with 1/dxCell although top-level length obviously does not have an
effect, only the planView lengths -->
<!-- bug if cell length<1m: vehicles removed if #cells exceeds road length in meters =>
need to add phantom road elements in planView (fitting the road
geometry of the subsequent sections) for the rest -->
<OpenDRIVE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="OpenDRIVE_1.3.xsd">
<header revMajor="1" revMinor="2" name="" version="1.00" date="Thu Sep 2 20:31:10 2010" north="0.0" south="0.0" east="0.0" west="0.0" />
<road name="MainUpstream" length="14000.0" id="1" junction="-1">
<link>
<successor elementType="road" elementId="2" contactPoint="start" />
</link>
<planView>
<geometry s="0.0" x="0.0" y="300.0" hdg="0.0" length="14000.0">
<line />
</geometry>
<!-- bug: need to formally make road as long as #cells;
otherwise liftoff if #cell=#m (bug); use geometry of
the subsequent real roads -->
<geometry s="0.0" x="14000.0" y="300.0" hdg="0.0" length="100.0">
<arc curvature="0.002" />
</geometry>
<geometry s="0.0" x="14100.0" y="310.0" hdg="0.2" length="100.0">
<arc curvature="-0.002" />
</geometry>
<geometry s="0.0" x="14200.0" y="320.0" hdg="0.0" length="1600.0">
<line />
</geometry>
<geometry s="0.0" x="15800.0" y="320.0" hdg="0.0" length="100.0">
<arc curvature="-0.002" />
</geometry>
<geometry s="0.0" x="15900.0" y="310.0" hdg="-0.2" length="100.0">
<arc curvature="0.002" />
</geometry>
<geometry s="0.0" x="16000.0" y="300.0" hdg="0.0" length="12000.0">
<line />
</geometry>
</planView>
<lanes>
<laneSection s="0.0">
<right>
<lane id="-1" type="driving" level="0">
<link>
<successor id="-1" />
</link>
<width sOffset="0.0" a="10.0" b="0.0" c="0.0" d="0.0" />
</lane>
</right>
</laneSection>
</lanes>
</road>
<!-- simple ramp: vehicles are just dropped along its length at a
given rate; offset simpleRamp by 5 m in the y dir to make it visible-->
<road name="SimpleRamp" length="2000.0" id="2" junction="-1">
<link>
<predecessor elementType="road" elementId="1" contactPoint="end" />
<successor elementType="road" elementId="3" contactPoint="start" />
</link>
<planView>
<geometry s="0.0" x="14000.0" y="300.0" hdg="0.0" length="100.0">
<arc curvature="0.002" />
</geometry>
<geometry s="0.0" x="14100.0" y="310.0" hdg="0.2" length="100.0">
<arc curvature="-0.002" />
</geometry>
<geometry s="0.0" x="14200.0" y="320.0" hdg="0.0" length="1600.0">
<line />
</geometry>
<geometry s="0.0" x="15800.0" y="320.0" hdg="0.0" length="100.0">
<arc curvature="-0.002" />
</geometry>
<geometry s="0.0" x="15900.0" y="310.0" hdg="-0.2" length="100.0">
<arc curvature="0.002" />
</geometry>
<!-- need to formally make road as long as #cells;
otherwise liftoff if #cell=#m (bug)-->
<geometry s="0.0" x="16000.0" y="300.0" hdg="0.0" length="2000.0">
<line />
</geometry>
</planView>
<lanes>
<laneSection s="0.0">
<right>
<lane id="-1" type="driving" level="0">
<link>
<predecessor id="-1" />
<successor id="-1" />
</link>
<width sOffset="0.0" a="10.0" b="0.0" c="0.0" d="0.0" />
</lane>
</right>
</laneSection>
</lanes>
</road>
<road name="" length="4000.0" id="3" junction="-1">
<link>
<predecessor elementType="road" elementId="2" contactPoint="end" />
</link>
<planView>
<geometry s="0.0" x="16000.0" y="300.0" hdg="0.0" length="4000.0">
<line />
</geometry>
</planView>
<lanes>
<laneSection s="0.0">
<right>
<lane id="-1" type="driving" level="0">
<link>
<predecessor id="-1" />
</link>
<width sOffset="0.0" a="10.0" b="0.0" c="0.0" d="0.0" />
</lane>
</right>
</laneSection>
</lanes>
</road>
</OpenDRIVE>
Oops, something went wrong.

0 comments on commit 39865fc

Please sign in to comment.