refactored test refs #5080

tests/sumo/junction_model/junction_type/zipper/variations/input_routes.rou.xml → tests/sumo/junction_model/junction_type/zipper/input_routes.rou.xml

@@ -1,5 +1,5 @@
 <routes>
-    <route id="r0" edges="beg end"/>
+    <route id="r0" edges="beg middle end"/>
     <flow id="right" color="red" route="r0" begin="0" end="1000" period="5" departLane="0" departSpeed="max" departPos="random"/>
     <flow id="left" color="blue" route="r0" begin="0" end="1000" period="5" departLane="1" departSpeed="max" departPos="random"/>
 </routes>

tests/sumo/junction_model/junction_type/zipper/variations/net.net.xml → tests/sumo/junction_model/junction_type/zipper/net.net.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu 24 Jan 2019 09:04:03 AM CET by Eclipse SUMO netedit Version v1_0_1+0645-93703db
+<!-- generated on Thu 24 Jan 2019 10:25:20 AM CET by Eclipse SUMO netedit Version v1_0_1+0645-93703db
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
-        <sumo-net-file value="/scr1/sumo/tests/sumo/junction_model/junction_type/zipper/variations/net.net.xml"/>
+        <sumo-net-file value="/scr1/sumo/tests/sumo/junction_model/junction_type/zipper/net.net.xml"/>
     </input>
 
     <output>
-        <output-file value="/scr1/sumo/tests/sumo/junction_model/junction_type/zipper/variations/net.net.xml"/>
+        <output-file value="/scr1/sumo/tests/sumo/junction_model/junction_type/zipper/net.net.xml"/>
     </output>
 
     <processing>
@@ -39,26 +39,42 @@
         <lane id=":gneJ1_0_0" index="0" speed="13.89" length="8.40" shape="396.00,-4.80 398.46,-4.30 400.00,-3.20 401.54,-2.10 404.00,-1.60"/>
         <lane id=":gneJ1_0_1" index="1" speed="13.89" length="8.40" shape="396.00,-1.60 404.00,-1.60"/>
     </edge>
+    <edge id=":gneJ4_0" function="internal">
+        <lane id=":gneJ4_0_0" index="0" speed="13.89" length="0.10" shape="330.00,-4.80 330.00,-4.80"/>
+        <lane id=":gneJ4_0_1" index="1" speed="13.89" length="0.10" shape="330.00,-1.60 330.00,-1.60"/>
+    </edge>
 
-    <edge id="beg" from="gneJ0" to="gneJ1" priority="1">
-        <lane id="beg_0" index="0" speed="13.89" length="146.00" shape="250.00,-4.80 396.00,-4.80"/>
-        <lane id="beg_1" index="1" speed="13.89" length="146.00" shape="250.00,-1.60 396.00,-1.60"/>
+    <edge id="beg" from="gneJ0" to="gneJ4" priority="1">
+        <lane id="beg_0" index="0" speed="13.89" length="80.00" shape="250.00,-4.80 330.00,-4.80"/>
+        <lane id="beg_1" index="1" speed="13.89" length="80.00" shape="250.00,-1.60 330.00,-1.60"/>
     </edge>
     <edge id="end" from="gneJ1" to="gneJ3" priority="1">
         <lane id="end_0" index="0" speed="13.89" length="96.00" shape="404.00,-1.60 500.00,-1.60"/>
     </edge>
+    <edge id="middle" from="gneJ4" to="gneJ1" priority="1">
+        <lane id="middle_0" index="0" speed="13.89" length="66.00" shape="330.00,-4.80 396.00,-4.80"/>
+        <lane id="middle_1" index="1" speed="13.89" length="66.00" shape="330.00,-1.60 396.00,-1.60"/>
+    </edge>
 
     <junction id="gneJ0" type="dead_end" x="250.00" y="0.00" incLanes="" intLanes="" shape="250.00,0.00 250.00,-6.40"/>
-    <junction id="gneJ1" type="zipper" x="400.00" y="0.00" incLanes="beg_0 beg_1" intLanes=":gneJ1_0_0 :gneJ1_0_1" shape="404.00,0.00 404.00,-3.20 396.00,-6.40 396.00,0.00">
+    <junction id="gneJ1" type="zipper" x="400.00" y="0.00" incLanes="middle_0 middle_1" intLanes=":gneJ1_0_0 :gneJ1_0_1" shape="404.00,0.00 404.00,-3.20 396.00,-6.40 396.00,0.00">
         <request index="0" response="10" foes="10" cont="0"/>
         <request index="1" response="01" foes="01" cont="0"/>
     </junction>
     <junction id="gneJ3" type="dead_end" x="500.00" y="0.00" incLanes="end_0" intLanes="" shape="500.00,-3.20 500.00,0.00"/>
+    <junction id="gneJ4" type="priority" x="330.00" y="0.00" incLanes="beg_0 beg_1" intLanes=":gneJ4_0_0 :gneJ4_0_1" shape="330.00,0.00 330.00,-6.40 330.00,0.00">
+        <request index="0" response="00" foes="00" cont="0"/>
+        <request index="1" response="00" foes="00" cont="0"/>
+    </junction>
 
-    <connection from="beg" to="end" fromLane="0" toLane="0" via=":gneJ1_0_0" dir="s" state="Z"/>
-    <connection from="beg" to="end" fromLane="1" toLane="0" via=":gneJ1_0_1" dir="s" state="Z"/>
+    <connection from="beg" to="middle" fromLane="0" toLane="0" via=":gneJ4_0_0" dir="s" state="M"/>
+    <connection from="beg" to="middle" fromLane="1" toLane="1" via=":gneJ4_0_1" dir="s" state="M"/>
+    <connection from="middle" to="end" fromLane="0" toLane="0" via=":gneJ1_0_0" dir="s" state="Z"/>
+    <connection from="middle" to="end" fromLane="1" toLane="0" via=":gneJ1_0_1" dir="s" state="Z"/>
 
     <connection from=":gneJ1_0" to="end" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":gneJ1_0" to="end" fromLane="1" toLane="0" dir="s" state="M"/>
+    <connection from=":gneJ4_0" to="middle" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":gneJ4_0" to="middle" fromLane="1" toLane="1" dir="s" state="M"/>
 
 </net>

tests/sumo/junction_model/junction_type/zipper/testsuite.sumo

@@ -8,3 +8,4 @@ variations
 
 # input longer flow to test different configurations
 variations_subsecond
+variations_subsecond_IDM

tests/sumo/junction_model/junction_type/zipper/variations/output.sumo

@@ -1,20 +1,20 @@
 Loading net-file from 'net.net.xml'... done (1ms).
 Loading done.
 Simulation version v1_0_1+0645-93703db started with time: 0.00
-Simulation ended at time: 1013.00
+Simulation ended at time: 1016.00
 Reason: All vehicles have left the simulation.
 Performance: 
  Duration: 38ms
- Real time factor: 26657.9
- UPS: 164236.842105
+ Real time factor: 26736.8
+ UPS: 181500.000000
 Vehicles: 
  Inserted: 400
  Running: 0
  Waiting: 0
 Statistics (avg):
- RouteLength: 186.40
- Duration: 15.60
- WaitingTime: 0.02
- TimeLoss: 1.72
- DepartDelay: 0.23
+ RouteLength: 213.45
+ Duration: 17.24
+ WaitingTime: 0.00
+ TimeLoss: 1.39
+ DepartDelay: 0.07
 

tests/sumo/junction_model/junction_type/zipper/variations_subsecond/output.sumo

@@ -1,20 +1,20 @@
 Loading net-file from 'net.net.xml'... done (1ms).
 Loading done.
 Simulation version v1_0_1+0645-93703db started with time: 0.00
-Simulation ended at time: 1013.00
+Simulation ended at time: 1012.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 38ms
- Real time factor: 26657.9
- UPS: 164236.842105
+ Duration: 109ms
+ Real time factor: 9284.4
+ UPS: 291357.798165
 Vehicles: 
  Inserted: 400
  Running: 0
  Waiting: 0
 Statistics (avg):
- RouteLength: 186.40
- Duration: 15.60
- WaitingTime: 0.02
- TimeLoss: 1.72
- DepartDelay: 0.23
+ RouteLength: 212.27
+ Duration: 15.88
+ WaitingTime: 0.00
+ TimeLoss: 0.51
+ DepartDelay: 0.00
 

tests/sumo/junction_model/junction_type/zipper/variations_subsecond_IDM/options.sumo

@@ -0,0 +1,5 @@
+--no-step-log 
+-n net.net.xml -r input_routes.rou.xml
+--duration-log.statistics
+--step-length 0.2
+--carfollow.model IDM

tests/sumo/junction_model/junction_type/zipper/variations_subsecond_IDM/output.sumo

@@ -0,0 +1,20 @@
+Loading net-file from 'net.net.xml'... done (1ms).
+Loading done.
+Simulation version v1_0_1+0645-93703db started with time: 0.00
+Simulation ended at time: 1012.20
+Reason: All vehicles have left the simulation.
+Performance: 
+ Duration: 115ms
+ Real time factor: 8801.74
+ UPS: 293269.565217
+Vehicles: 
+ Inserted: 400
+ Running: 0
+ Waiting: 0
+Statistics (avg):
+ RouteLength: 212.46
+ Duration: 16.86
+ WaitingTime: 0.00
+ TimeLoss: 1.47
+ DepartDelay: 0.01
+