From 3938e5481befe462ea11f60926f469f9ee502aeb Mon Sep 17 00:00:00 2001 From: akegermany Date: Fri, 16 Dec 2016 14:29:35 +0100 Subject: [PATCH] corrected plotting of first, 5h, etc vehicle, fixed configurations --- sim/bookScenarioStartStop/runall | 2 +- sim/bookScenarioStartStop/startStop.gpl | 6 +-- sim/bookScenarioStartStop/startStop_ACC.xprj | 13 +++--- sim/bookScenarioStartStop/startStop_BARL.xprj | 46 +++---------------- sim/bookScenarioStartStop/startStop_CCS.xprj | 11 ++--- sim/bookScenarioStartStop/startStop_FVDM.xprj | 11 ++--- .../startStop_GIPPS.xprj | 11 ++--- sim/bookScenarioStartStop/startStop_IDM.xprj | 12 ++--- sim/bookScenarioStartStop/startStop_IDMM.xprj | 10 ++-- .../startStop_IDM_w_noise.xprj | 10 ++-- sim/bookScenarioStartStop/startStop_IIDM.xprj | 10 ++-- sim/bookScenarioStartStop/startStop_KKW.xprj | 45 +++--------------- .../startStop_KRAUSS.xprj | 11 ++--- .../startStop_NEWELL.xprj | 10 ++-- sim/bookScenarioStartStop/startStop_NSM.xprj | 46 +++---------------- sim/bookScenarioStartStop/startStop_OVM.xprj | 10 ++-- .../startStop_all_ca_initialConditions.xml | 1 + .../startStop_initialConditions_KKW.xml | 36 +++++++++++++++ .../startStop_initialConditions_NSM.xml | 36 +++++++++++++++ 19 files changed, 153 insertions(+), 184 deletions(-) create mode 100644 sim/bookScenarioStartStop/startStop_initialConditions_KKW.xml create mode 100644 sim/bookScenarioStartStop/startStop_initialConditions_NSM.xml diff --git a/sim/bookScenarioStartStop/runall b/sim/bookScenarioStartStop/runall index d2ce9182..676e2d2c 100755 --- a/sim/bookScenarioStartStop/runall +++ b/sim/bookScenarioStartStop/runall @@ -7,7 +7,7 @@ cleanmovsim for ldm in ${startStop} do - input="startStop_$ldm.xml" + input="startStop_$ldm" echo "input = $input" runmovsim -f $input gnuplot "startStop_$ldm.gpl" diff --git a/sim/bookScenarioStartStop/startStop.gpl b/sim/bookScenarioStartStop/startStop.gpl index d7a746bc..8ae4a85c 100644 --- a/sim/bookScenarioStartStop/startStop.gpl +++ b/sim/bookScenarioStartStop/startStop.gpl @@ -21,12 +21,12 @@ if (!exists("lang")) lang = "en" # variables baseFile = "startStop_".ldm vehicle = ldm."1" -c0 = 1 +c0 = 27 # input files fundFile = inputPath.baseFile.".fund_".vehicle.".csv" if (ldm eq "IDM_w_noise") fundFile = inputPath.baseFile.".fund_IDM1.csv" -carFile(n) = sprintf(inputPath.baseFile.".car.route_main.%06d.csv",c0+n) +carFile(n) = sprintf(inputPath.baseFile.".car.route_main.%06d.csv",c0-n) carLsaFile(n) = sprintf(inputPath.baseFile."LSA.car%d.csv",c0+n) trajectoriesFile = inputPath.baseFile.".traj.route_main.csv" @@ -144,7 +144,7 @@ set ytics 10 print "carFile(1)=", carFile(1)," c0=",c0 set out distanceOutput -if(c0 == 1) plot\ +plot\ carFile(1) using 1:9 title car(1) with lines linestyle 1,\ carFile(5) using 1:9 title car(5) with lines linestyle 2,\ carFile(10) using 1:9 title car(10) with lines linestyle 3,\ diff --git a/sim/bookScenarioStartStop/startStop_ACC.xprj b/sim/bookScenarioStartStop/startStop_ACC.xprj index 9cacbcae..72ab4295 100644 --- a/sim/bookScenarioStartStop/startStop_ACC.xprj +++ b/sim/bookScenarioStartStop/startStop_ACC.xprj @@ -4,7 +4,8 @@ - + + @@ -30,11 +31,11 @@ - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_BARL.xprj b/sim/bookScenarioStartStop/startStop_BARL.xprj index aa42af40..af01837a 100644 --- a/sim/bookScenarioStartStop/startStop_BARL.xprj +++ b/sim/bookScenarioStartStop/startStop_BARL.xprj @@ -19,45 +19,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -66,12 +33,11 @@ - - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_CCS.xprj b/sim/bookScenarioStartStop/startStop_CCS.xprj index 5cbc5e1e..c9502b05 100644 --- a/sim/bookScenarioStartStop/startStop_CCS.xprj +++ b/sim/bookScenarioStartStop/startStop_CCS.xprj @@ -31,12 +31,11 @@ - - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_FVDM.xprj b/sim/bookScenarioStartStop/startStop_FVDM.xprj index facc84e7..a52bc9aa 100644 --- a/sim/bookScenarioStartStop/startStop_FVDM.xprj +++ b/sim/bookScenarioStartStop/startStop_FVDM.xprj @@ -32,12 +32,11 @@ - - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_GIPPS.xprj b/sim/bookScenarioStartStop/startStop_GIPPS.xprj index 5063a276..cedec516 100644 --- a/sim/bookScenarioStartStop/startStop_GIPPS.xprj +++ b/sim/bookScenarioStartStop/startStop_GIPPS.xprj @@ -30,12 +30,11 @@ - - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_IDM.xprj b/sim/bookScenarioStartStop/startStop_IDM.xprj index a261db78..61911835 100644 --- a/sim/bookScenarioStartStop/startStop_IDM.xprj +++ b/sim/bookScenarioStartStop/startStop_IDM.xprj @@ -4,7 +4,7 @@ - + @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_IDMM.xprj b/sim/bookScenarioStartStop/startStop_IDMM.xprj index a0ca930d..866567cb 100644 --- a/sim/bookScenarioStartStop/startStop_IDMM.xprj +++ b/sim/bookScenarioStartStop/startStop_IDMM.xprj @@ -29,11 +29,11 @@ - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_IDM_w_noise.xprj b/sim/bookScenarioStartStop/startStop_IDM_w_noise.xprj index 4c1be4e0..64b0769c 100644 --- a/sim/bookScenarioStartStop/startStop_IDM_w_noise.xprj +++ b/sim/bookScenarioStartStop/startStop_IDM_w_noise.xprj @@ -31,11 +31,11 @@ - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_IIDM.xprj b/sim/bookScenarioStartStop/startStop_IIDM.xprj index 84b2f119..37b34e5b 100644 --- a/sim/bookScenarioStartStop/startStop_IIDM.xprj +++ b/sim/bookScenarioStartStop/startStop_IIDM.xprj @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_KKW.xprj b/sim/bookScenarioStartStop/startStop_KKW.xprj index b33bb64a..4691cd9a 100644 --- a/sim/bookScenarioStartStop/startStop_KKW.xprj +++ b/sim/bookScenarioStartStop/startStop_KKW.xprj @@ -17,45 +17,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -64,12 +32,11 @@ - - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_KRAUSS.xprj b/sim/bookScenarioStartStop/startStop_KRAUSS.xprj index 3ff0121d..49e4203d 100644 --- a/sim/bookScenarioStartStop/startStop_KRAUSS.xprj +++ b/sim/bookScenarioStartStop/startStop_KRAUSS.xprj @@ -31,12 +31,11 @@ - - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_NEWELL.xprj b/sim/bookScenarioStartStop/startStop_NEWELL.xprj index a7b17d29..1dff5c5e 100644 --- a/sim/bookScenarioStartStop/startStop_NEWELL.xprj +++ b/sim/bookScenarioStartStop/startStop_NEWELL.xprj @@ -30,11 +30,11 @@ - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_NSM.xprj b/sim/bookScenarioStartStop/startStop_NSM.xprj index b14316b8..5682201e 100644 --- a/sim/bookScenarioStartStop/startStop_NSM.xprj +++ b/sim/bookScenarioStartStop/startStop_NSM.xprj @@ -20,45 +20,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -67,12 +34,11 @@ - - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_OVM.xprj b/sim/bookScenarioStartStop/startStop_OVM.xprj index 6747209a..b060d951 100644 --- a/sim/bookScenarioStartStop/startStop_OVM.xprj +++ b/sim/bookScenarioStartStop/startStop_OVM.xprj @@ -30,11 +30,11 @@ - - - - - + + + + + diff --git a/sim/bookScenarioStartStop/startStop_all_ca_initialConditions.xml b/sim/bookScenarioStartStop/startStop_all_ca_initialConditions.xml index 61207989..6f4c3dff 100644 --- a/sim/bookScenarioStartStop/startStop_all_ca_initialConditions.xml +++ b/sim/bookScenarioStartStop/startStop_all_ca_initialConditions.xml @@ -92,6 +92,7 @@ + diff --git a/sim/bookScenarioStartStop/startStop_initialConditions_KKW.xml b/sim/bookScenarioStartStop/startStop_initialConditions_KKW.xml new file mode 100644 index 00000000..ba48cdfc --- /dev/null +++ b/sim/bookScenarioStartStop/startStop_initialConditions_KKW.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sim/bookScenarioStartStop/startStop_initialConditions_NSM.xml b/sim/bookScenarioStartStop/startStop_initialConditions_NSM.xml new file mode 100644 index 00000000..a12180a5 --- /dev/null +++ b/sim/bookScenarioStartStop/startStop_initialConditions_NSM.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +