From f9bdfbe7027c6b584d2d8b82cc2e5d69d1766248 Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 4 Sep 2024 14:58:08 +0200 Subject: [PATCH] bump version to 6.4 --- Makefile | 2 +- input/v6.4/area/area.dbf | Bin 0 -> 119 bytes input/v6.4/area/area.poly | 13 ++ input/v6.4/area/area.prj | 1 + input/v6.4/area/area.shp | Bin 0 -> 300 bytes input/v6.4/area/area.shx | Bin 0 -> 108 bytes input/v6.4/berlin-v6.4-vehicleTypes.xml | 209 +++++++++++++++++ input/v6.4/berlin-v6.4.config.xml | 218 ++++++++++++++++++ input/v6.4/berlin-v6.4.drt-config.xml | 138 +++++++++++ input/v6.4/pt-area/pt-area.cpg | 1 + input/v6.4/pt-area/pt-area.dbf | Bin 0 -> 1611 bytes input/v6.4/pt-area/pt-area.prj | 1 + input/v6.4/pt-area/pt-area.qmd | 27 +++ input/v6.4/pt-area/pt-area.shp | Bin 0 -> 1292 bytes input/v6.4/pt-area/pt-area.shx | Bin 0 -> 108 bytes pom.xml | 2 +- .../org/matsim/run/OpenBerlinScenario.java | 2 +- 17 files changed, 611 insertions(+), 3 deletions(-) create mode 100644 input/v6.4/area/area.dbf create mode 100644 input/v6.4/area/area.poly create mode 100644 input/v6.4/area/area.prj create mode 100644 input/v6.4/area/area.shp create mode 100644 input/v6.4/area/area.shx create mode 100644 input/v6.4/berlin-v6.4-vehicleTypes.xml create mode 100644 input/v6.4/berlin-v6.4.config.xml create mode 100644 input/v6.4/berlin-v6.4.drt-config.xml create mode 100644 input/v6.4/pt-area/pt-area.cpg create mode 100644 input/v6.4/pt-area/pt-area.dbf create mode 100644 input/v6.4/pt-area/pt-area.prj create mode 100644 input/v6.4/pt-area/pt-area.qmd create mode 100644 input/v6.4/pt-area/pt-area.shp create mode 100644 input/v6.4/pt-area/pt-area.shx diff --git a/Makefile b/Makefile index 2d983abba..0f7018819 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ JAR := matsim-berlin-*.jar -V := v6.3 +V := v6.4 CRS := EPSG:25832 p := input/$V diff --git a/input/v6.4/area/area.dbf b/input/v6.4/area/area.dbf new file mode 100644 index 0000000000000000000000000000000000000000..2caa1f7d9db939070719dd1ba59380526781f7c2 GIT binary patch literal 119 zcmZRsX5wOGU|>jO5CxK$ATtFn<_BVN!MPAdUSe)4RLB`bqs#Luz=1(xQEDQDCj|gv C=LiJ= literal 0 HcmV?d00001 diff --git a/input/v6.4/area/area.poly b/input/v6.4/area/area.poly new file mode 100644 index 000000000..ceba25a93 --- /dev/null +++ b/input/v6.4/area/area.poly @@ -0,0 +1,13 @@ +area +1 + 13.219000451630821 52.804645826658245 + 13.563415935578835 52.7636439833311 + 13.762958239770938 52.64337190957148 + 13.816260636096226 52.400094305830414 + 13.644052894122218 52.18278453619655 + 13.0713938156531 52.178684351863836 + 12.744745797146848 52.345425181394226 + 12.983923216555192 52.79644545799282 + 13.219000451630821 52.804645826658245 +END +END diff --git a/input/v6.4/area/area.prj b/input/v6.4/area/area.prj new file mode 100644 index 000000000..f45cbadf0 --- /dev/null +++ b/input/v6.4/area/area.prj @@ -0,0 +1 @@ +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]] \ No newline at end of file diff --git a/input/v6.4/area/area.shp b/input/v6.4/area/area.shp new file mode 100644 index 0000000000000000000000000000000000000000..a5b387f11e2a66a9fdd23d53df52fff6975fe442 GIT binary patch literal 300 zcmZQzQ0HR64yL_eW?*0i%5`X%2Km=&I(#|)Tj9Q#mxHS~)2lZNwH?ItvKReJ^K!th z9YvH8$V(u`ERaG@sMd)Jhc7D>Xu<6%+O~%DA zqJj|aI+*M2WoGQ<5aPq-d(czc;lZ>^)v4lM4u^KX+tsV01@{NcU#FK9JTcSpa!5V2 V^2Cwvnhtgo_P+U;>g9lLKL8WUScL!p literal 0 HcmV?d00001 diff --git a/input/v6.4/area/area.shx b/input/v6.4/area/area.shx new file mode 100644 index 0000000000000000000000000000000000000000..a4a038216181da659978b7a3fa093c44ff8d5e30 GIT binary patch literal 108 zcmZQzQ0HR64$NLKGcd3MgZyhX9ljj@t#Dt=%fVHg>D8Ns+74oR*^B + + + + + + + + 1 + serial + 1 + + + + + + + + + 1 + serial + 1 + + + + + + + + + 1 + serial + 1 + + + + + + + + + + 1 + serial + 1 + + + + + + + + + + + + Golf 1.4 Trendline + + + + + + + PASSENGER_CAR + average + average + petrol (4S) + + + + + 0.0049 + 0.0049 + + + + + + + + + + VW Caddy 2.0 Maxi TDI + + + + + + + PASSENGER_CAR + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + + Mercedes 313 CDI + + + + + + + LIGHT_COMMERCIAL_VEHICLE + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + + Light Vehicle 7.5t + + + + + + + LIGHT_COMMERCIAL_VEHICLE + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + + Medium Vehicle 18t + + + + + + + HEAVY_GOODS_VEHICLE + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + Heavy Vehicle 40t + + + + + + + HEAVY_GOODS_VEHICLE + average + average + diesel + + + + + 0.00559 + 0.00559 + + + + + + + diff --git a/input/v6.4/berlin-v6.4.config.xml b/input/v6.4/berlin-v6.4.config.xml new file mode 100644 index 000000000..7c3f3744d --- /dev/null +++ b/input/v6.4/berlin-v6.4.config.xml @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/input/v6.4/berlin-v6.4.drt-config.xml b/input/v6.4/berlin-v6.4.drt-config.xml new file mode 100644 index 000000000..3365acd48 --- /dev/null +++ b/input/v6.4/berlin-v6.4.drt-config.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/input/v6.4/pt-area/pt-area.cpg b/input/v6.4/pt-area/pt-area.cpg new file mode 100644 index 000000000..3ad133c04 --- /dev/null +++ b/input/v6.4/pt-area/pt-area.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/input/v6.4/pt-area/pt-area.dbf b/input/v6.4/pt-area/pt-area.dbf new file mode 100644 index 0000000000000000000000000000000000000000..0234ef4384fad11cbaac654917bcdd0a19fe9379 GIT binary patch literal 1611 zcmd^*y$*sf6opHO#>LUa2}c(~i%`0%v#&skT#@jjxrN2}>_%#E5XBehSx$Pt+vJ{O z-|eME2w7R{NoQXw)066lJME9bhURh6;*F3o9@nyh?%OCw$kY}8^O%lvSv0LI$zGo} z8{8)mWIsA+Uraw2u7G(34Im*u`P`w*d&x0Ulo=Vj54}ZMr%)#?W(L;KrLU3;szMqV x-l=m)0o4VQTpiD*HNZT!@fhP>ZeRF3+VFsK-{qn3MEEX4zgXY~K_n<$J^>Os)nxzx literal 0 HcmV?d00001 diff --git a/input/v6.4/pt-area/pt-area.prj b/input/v6.4/pt-area/pt-area.prj new file mode 100644 index 000000000..bd846aeb2 --- /dev/null +++ b/input/v6.4/pt-area/pt-area.prj @@ -0,0 +1 @@ +PROJCS["ETRS_1989_UTM_Zone_32N",GEOGCS["GCS_ETRS_1989",DATUM["D_ETRS_1989",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",9.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/input/v6.4/pt-area/pt-area.qmd b/input/v6.4/pt-area/pt-area.qmd new file mode 100644 index 000000000..e5cd6b250 --- /dev/null +++ b/input/v6.4/pt-area/pt-area.qmd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + +proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs + 0 + 0 + + + + + false + + + + diff --git a/input/v6.4/pt-area/pt-area.shp b/input/v6.4/pt-area/pt-area.shp new file mode 100644 index 0000000000000000000000000000000000000000..dc4679f1257e62c34719afddb210aa6c4715646f GIT binary patch literal 1292 zcma*ne=yr;7y$4Hoz|Sqf*DFl@Rjeh)~X}D;t7dbhcuBds&nj+(TQJGjXN5&oo?2W z_BKw7>bCmP2-{kxn+P`4uWfC2VkP~h%KVsiQ&t*#+^xOau7B+P@AE$I^SLR7JC&(GyI{d8((ih#|MmBh^P5F%-|t_SS7DV4^Slr~>^km+1>gVWJHO>V4i1Aet&2pO(9YrhC93ni?IWciHdFXrJbdP$W3n)o; zHrgPgD~W@);DF(p=N4AZuQ~6|hA1gon7dx@i)Ls?`V-JMGJ357(N}$=I^)niuG@$p z^uFW|evd{wXc=|8(H8Ora|-R{THYu?M;N)a3DIADtk8vpP7KlShYx6f}l+*B9PnLb}<5jfH6Upv1PwGb|vM7kbT(P#|gA| zIyaazaolwI90kV574%hqHjqxo%lkf~;H`{0Lz4hD>~3sP>_i8eZdVSA*&xr5wJ(-Z z5FKFug&>lR?=>W4qMfRxvO%;$)RpyD2?a&hcz)ApZ}mXj9J=781|LQg8!kIZyL9Lg zdd}M{^oRKxvtjg%YJX`;kvnhj}$Be#`L!Pde3DozLqve_NpS+7!{ zcRv&6kM7O5+L4ZClRZ6wXq~n4Nea4g>PlD;I%#b7Y%;p)>EQwg?5i!Zz2B0z#1O7; z60h~yP|F^k9r{_{-BJoIZO|n(6W^O+oPIW{?V3&u@08_czKk~Fjr#wHmUgZh8Kd)k zh{AsKiTapweJTm$q};3rJ^x;I?L%~rx5dUz^s-#@pk7LX%>*}7h)z9XyjX>H?PjS% z(HB!Ahl4FCOK{s!f+4o?68 literal 0 HcmV?d00001 diff --git a/input/v6.4/pt-area/pt-area.shx b/input/v6.4/pt-area/pt-area.shx new file mode 100644 index 0000000000000000000000000000000000000000..afe362e65580a65f56bc6266bdce17b53f3da4f8 GIT binary patch literal 108 zcmZQzQ0HR64$NLKGcd3M4.0.0 com.github.matsim-scenarios matsim-berlin - 6.3 + 6.4-SNAPSHOT MATSim Open Berlin scenario MATSim Open Berlin scenario diff --git a/src/main/java/org/matsim/run/OpenBerlinScenario.java b/src/main/java/org/matsim/run/OpenBerlinScenario.java index 120f3b1b3..9ce01efec 100644 --- a/src/main/java/org/matsim/run/OpenBerlinScenario.java +++ b/src/main/java/org/matsim/run/OpenBerlinScenario.java @@ -30,7 +30,7 @@ @CommandLine.Command(header = ":: Open Berlin Scenario ::", version = OpenBerlinScenario.VERSION, mixinStandardHelpOptions = true) public class OpenBerlinScenario extends MATSimApplication { - public static final String VERSION = "6.3"; + public static final String VERSION = "6.4"; public static final String CRS = "EPSG:25832"; @CommandLine.Mixin