Skip to content

Commit

Permalink
Merge pull request #98 from matsim-vsp/develop
Browse files Browse the repository at this point in the history
update main from Develop
  • Loading branch information
rewertvsp authored Dec 19, 2024
2 parents 254095b + 0cc2daf commit 8a8a72f
Show file tree
Hide file tree
Showing 48 changed files with 4,339 additions and 2,788 deletions.
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>simwrapper</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>emissions</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<carriers>
<carriers xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/carriersDefinitions_v2.1.xsd">
<carrier id="BSR_Gradestrasse">
<capabilities fleetSize="INFINITE">
<vehicles>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<carriers>
<carriers xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/carriersDefinitions_v2.1.xsd">
<carrier id="BSR_Gradestrasse">
<capabilities fleetSize="INFINITE">
<vehicles>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<carriers>
<carriers xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/carriersDefinitions_v2.1.xsd">
<carrier id="BSR_Gradestrasse">
<capabilities fleetSize="INFINITE">
<vehicles>
Expand Down
110 changes: 110 additions & 0 deletions scenarios/wasteCollection/Vulkaneifel/Abfalltermine_Vulkaneifel_BA.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
Stra�e;Tag;KW
Arbach;Mi;U
Basberg;Do;G
Beinhausen;Mi;U
Bereborn;Di;U
Berenbach;Mi;U
Berlingen;Di;G
Berndorf;Mo;U
Betteldorf;Di;G
Birgel;Do;G
Birresborn;Mi;G
Bleckhausen;Mo;G
Bodenbach;Di;U
Bongard;Di;U
Borler;Di;U
Boxberg;Mi;U
Brockscheid;Mo;G
Br�cktal;Di;U
Darscheid;Do;U
Daun;Do;U
Demerath;Fr;U
Densborn;Mi;G
Deudesfeld;Mo;G
Dockweiler;Mi;U
Dohm-Lammersdorf;Fr;G
Drees;Di;U
Dreis-Br�ck;Mo;U
Duppach;Do;G
Ellscheid;Fr;U
Esch;Do;G
Feusdorf;Do;G
Gefell;Mi;U
Gelenberg;Di;U
Gerolstein;Mi;G
Gillenfeld;Fr;U
G�nnersdorf;Do;G
Gunderath;Mi;U
Hallschlag;Do;G
Hillesheim;Fr;G
Hinterweiler;Di;G
H�chstberg;Mi;U
Hohenfels-Essingen;Di;G
Horperath;Mi;U
H�rscheid;Do;U
H�rschhausen;Mi;U
Immerath;Fr;U
J�nkerath;Fr;G
Kalenborn-Scheuern;Do;G
Kaperich;Mi;U
Katzwinkel;Mi;U
Kelberg;Di;U
Kerpen (Eifel);Di;U
Kerschenbach;Fr;G
Kirchweiler;Di;G
Kirsbach;Di;U
Kolverath;Di;U
Kopp;Mi;G
K�tterichen;Mi;U
Kradenbach;Mi;U
Lirstal;Mi;U
Lissendorf;Fr;G
Mannebach;Di;U
Mehren;Fr;U
Meisburg;Mo;G
Mosbruch;Di;U
M�ckeln;Mo;G
M�rlenbach;Mi;G
Neichen;Mi;U
Nerdlen;Mi;U
Neroth;Di;G
Niederstadtfeld;Mo;G
Nitz;Di;U
Nohn;Di;U
Oberbettingen;Fr;G
Oberehe-Stroheich;Mo;U
Oberelz;Mi;U
Oberstadtfeld;Mo;G
Ormont;Do;G
Pelm;Di;G
Reimerath;Di;U
Retterath;Di;U
Reuth;Do;G
Rockeskyll;Di;G
Salm;Di;G
Sarmersbach;Mi;U
Sassen;Di;U
Saxler;Fr;U
Schalkenmehren;Fr;U
Scheid;Do;G
Sch�nbach;Mi;U
Sch�ller;Fr;G
Schutz;Mo;G
Stadtkyll;Fr;G
Steffeln;Do;G
Steineberg;Fr;U
Steiningen;Fr;U
Strohn;Mo;G
Strotzb�sch;Mo;G
�dersdorf;Mo;G
Udler;Fr;U
Uersfeld;Mi;U
Ue�;Di;U
Utzerath;Mi;U
�xheim;Di;U
Wallenborn;Di;G
Walsdorf;Mo;U
Weidenbach;Mo;G
Welcherath;Di;U
Wiesbaum;Mo;U
Winkel (Eifel);Fr;U
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTF-8
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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]]
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="3.34.2-Prizren">
<identifier></identifier>
<parentidentifier></parentidentifier>
<language></language>
<type>dataset</type>
<title></title>
<abstract></abstract>
<links/>
<dates/>
<fees></fees>
<encoding></encoding>
<crs>
<spatialrefsys nativeFormat="Wkt">
<wkt>PROJCRS["ETRS89 / UTM zone 32N",BASEGEOGCRS["ETRS89",ENSEMBLE["European Terrestrial Reference System 1989 ensemble",MEMBER["European Terrestrial Reference Frame 1989"],MEMBER["European Terrestrial Reference Frame 1990"],MEMBER["European Terrestrial Reference Frame 1991"],MEMBER["European Terrestrial Reference Frame 1992"],MEMBER["European Terrestrial Reference Frame 1993"],MEMBER["European Terrestrial Reference Frame 1994"],MEMBER["European Terrestrial Reference Frame 1996"],MEMBER["European Terrestrial Reference Frame 1997"],MEMBER["European Terrestrial Reference Frame 2000"],MEMBER["European Terrestrial Reference Frame 2005"],MEMBER["European Terrestrial Reference Frame 2014"],ELLIPSOID["GRS 1980",6378137,298.257222101,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[0.1]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4258]],CONVERSION["UTM zone 32N",METHOD["Transverse Mercator",ID["EPSG",9807]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",9,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["Scale factor at natural origin",0.9996,SCALEUNIT["unity",1],ID["EPSG",8805]],PARAMETER["False easting",500000,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["(E)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["(N)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Engineering survey, topographic mapping."],AREA["Europe between 6°E and 12°E: Austria; Belgium; Denmark - onshore and offshore; Germany - onshore and offshore; Norway including - onshore and offshore; Spain - offshore."],BBOX[38.76,6,84.33,12.01]],ID["EPSG",25832]]</wkt>
<proj4>+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs</proj4>
<srsid>2105</srsid>
<srid>25832</srid>
<authid>EPSG:25832</authid>
<description>ETRS89 / UTM zone 32N</description>
<projectionacronym>utm</projectionacronym>
<ellipsoidacronym>EPSG:7019</ellipsoidacronym>
<geographicflag>false</geographicflag>
</spatialrefsys>
</crs>
<extent/>
</qgis>
Binary file not shown.
Binary file not shown.
35 changes: 18 additions & 17 deletions scenarios/wasteCollection/vehicleTypes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@

<vehicleType id="diesel_vehicle">

<capacity seats="1" standingRoomInPersons="0" other="11500.0">
<capacity seats="1" standingRoomInPersons="0" other="11500.0">

</capacity>
<maximumVelocity meterPerSecond="22.22222222222222"/>
<engineInformation>
<attributes>
<attribute name="fuelConsumptionPerTonnePickupWaste" class="java.lang.Double">0.5</attribute>
<attribute name="fuelConsumptionPerKm" class="java.lang.Double">60.0</attribute>
<attribute name="fuelType" class="java.lang.String">diesel</attribute>
<engineInformation>
<attributes>
<attribute name="fuelConsumptionPerTonnePickupWaste" class="java.lang.Double">0.5</attribute>
<attribute name="fuelConsumptionLitersPerMeter" class="java.lang.Double">0.0006</attribute>
<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
</attributes>
</engineInformation>
<costInformation fixedCostsPerDay="982.98" costsPerMeter="8.46E-4" costsPerSecond="0.0">
<costInformation fixedCostsPerDay="841.89" costsPerMeter="15.3218E-4" costsPerSecond="0.0">

</costInformation>
<networkMode networkMode="car"/>
</vehicleType>

<vehicleType id="EV_small_battery">
Expand All @@ -30,13 +31,13 @@
<maximumVelocity meterPerSecond="22.22222222222222"/>
<engineInformation>
<attributes>
<attribute name="engeryCapacity" class="java.lang.Double">80.0</attribute>
<attribute name="engeryConsumptionPerTonnePickupWaste" class="java.lang.Double">1.4</attribute>
<attribute name="engeryConsumptionPerKm" class="java.lang.Double">1.0</attribute>
<attribute name="fuelType" class="java.lang.String">electricity</attribute>
<attribute name="energyCapacityInKWhOrLiters" class="java.lang.Double">122.8</attribute> <!-- Original capacity of 155 is reduced by the consumption of 2 full collected capacities -->
<attribute name="energyConsumptionPerTonnePickupWaste" class="java.lang.Double">1.4</attribute>
<attribute name="energyConsumptionKWhPerMeter" class="java.lang.Double">0.001</attribute>
<attribute name="HbefaTechnology" class="java.lang.String">electricity</attribute>
</attributes>
</engineInformation>
<costInformation fixedCostsPerDay="1198.06" costsPerMeter="1.53E-4" costsPerSecond="0.0">
<costInformation fixedCostsPerDay="1001.42" costsPerMeter="4.915E-4" costsPerSecond="0.0">

</costInformation>
<passengerCarEquivalents pce="1.0"/>
Expand All @@ -54,13 +55,13 @@
<maximumVelocity meterPerSecond="22.22222222222222"/>
<engineInformation>
<attributes>
<attribute name="engeryCapacity" class="java.lang.Double">310.0</attribute>
<attribute name="engeryConsumptionPerTonnePickupWaste" class="java.lang.Double">1.4</attribute>
<attribute name="engeryConsumptionPerKm" class="java.lang.Double">1.0</attribute>
<attribute name="fuelType" class="java.lang.String">electricity</attribute>
<attribute name="energyCapacityInKWhOrLiters" class="java.lang.Double">280.6</attribute> <!-- Original capacity of 310 is reduced by the consumption of 2 full collected capacities -->
<attribute name="energyConsumptionPerTonnePickupWaste" class="java.lang.Double">1.4</attribute>
<attribute name="energyConsumptionKWhPerMeter" class="java.lang.Double">0.001</attribute>
<attribute name="HbefaTechnology" class="java.lang.String">electricity</attribute>
</attributes>
</engineInformation>
<costInformation fixedCostsPerDay="1262.17" costsPerMeter="1.53E-4" costsPerSecond="0.0">
<costInformation fixedCostsPerDay="1037.27" costsPerMeter="4.915E-4" costsPerSecond="0.0">

</costInformation>
<passengerCarEquivalents pce="1.0"/>
Expand Down
46 changes: 46 additions & 0 deletions src/main/R/Ricardo/AnalyszeMautDataGermany.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
install.packages(c("ggplot2", "sf", "dplyr", "ggmap", "ggspatial", "prettymapr", "raster"))
library(ggplot2)
library(sf)
library(dplyr)
install.packages("prettymapr")
library(ggspatial)

setwd("C:/Users/erica/Downloads/Mauttabelle_2024_11_17")

# Daten einlesen (ersetzen Sie 'path_to_your_file.csv' durch den tatsächlichen Dateipfad)
data <- read.csv("2024-11-17_Mauttabelle.CSV", sep = ";", dec = ".")
data$Breite_Von <- as.numeric(data$Breite_Von)
data$Laenge_Von <- as.numeric(data$Laenge_Von)
data$Breite_Nach <- as.numeric(data$Breite_Nach)
data$Laenge_Nach <- as.numeric(data$Laenge_Nach)
# Nur die ersten 3 Zeilen der Daten verwenden
data <- data[1:4, ]
# Überprüfen Sie die Koordinaten, um sicherzustellen, dass keine ungültigen Werte vorhanden sind
summary(data[, c("Breite_Von", "Laenge_Von", "Breite_Nach", "Laenge_Nach")])

# Geometrien erstellen (Fehlerbehandlung einbauen)
edges <- data %>%
rowwise() %>%
mutate(
geometry = tryCatch(
st_sfc(st_linestring(matrix(c(Laenge_Von, Breite_Von, Laenge_Nach, Breite_Nach),
ncol = 2, byrow = TRUE))),
error = function(e) NULL # Fehlerabfangung, falls ungültige Koordinaten vorliegen
)
) %>%
filter(!is.null(geometry)) %>% # Ungültige Zeilen herausfiltern
st_as_sf(crs = 4326) # WGS84-Koordinatensystem (EPSG:4326)

# Plotten mit OpenStreetMap-Hintergrund über ggspatial
ggplot() +
annotation_map_tile(type = "osm", zoom = 10) + # OpenStreetMap Hintergrund
geom_sf(data = edges, aes(geometry = geometry), color = "blue", size = 1) +
coord_sf(crs = 4326) + # Sicherstellen, dass wir das WGS84 CRS verwenden
labs(title = "Strassenabschnitte mit OSM-Hintergrund", x = "Laengengrad", y = "Breitengrad") +
theme_minimal()

ggplot(data) +
geom_point(aes(x = Laenge_Von, y = Breite_Von), color = "blue") +
geom_point(aes(x = Laenge_Nach, y = Breite_Nach), color = "red") +
labs(title = "Koordinatenueberpruefung: Start und Zielpunkte") +
theme_minimal()
Loading

0 comments on commit 8a8a72f

Please sign in to comment.