max
/
TrainRun.jl
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename the real world path file

pull/1/head v0.5.1
Max Kannenberg 2021-12-13 11:56:22 +01:00
parent 7eed749d49
commit 16c753814d
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Project.toml
View File

@ -1,7 +1,7 @@
name = "TrainRun"
uuid = "e4541106-d44c-4e00-b50b-ecdf479fcf92"
authors = ["Max Kannenberg"]
version = "0.5.0"
version = "0.5.1"
[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

1
data/paths/path_4_real_Ostsachsen_DG-DN_spp_5.yaml → data/paths/path_4_real_Germany_EastSaxony_DG-DN.yaml
View File

@ -97,7 +97,6 @@ path:
- [23736.0, 160, 0.9]
- [24124.0, 160, 7]
- [24918.0, 160, 7.6]
- [25100.0, 150, 7.6]
- [25100.0, 150, 7.1]
- [25580.0, 150, 7.4]
- [25708.0, 160, 7.4]

2
data/settings.yaml
View File

@ -8,4 +8,4 @@ settings:
operationModeMinimumEnergyConsumption: true # operation mode "minimum energy consumption"
typeOfOutput: "CSV" # output as "julia dictionary" or as "CSV"
detailOfOutput: "driving course" # should the output be "reduced" or "driving course"?
csvFolderPath: "~/Desktop/TrainRun"
csvDirectory: "~/Desktop/TrainRun"

4
examples/MinimalWorkingExample.jl
View File

@ -11,14 +11,14 @@ allPaths=[]
push!(allPaths, "../data/paths/path_1_10km_nConst_vConst.yaml")
push!(allPaths, "../data/paths/path_2_10km_nVar_vConst.yaml")
push!(allPaths, "../data/paths/path_3_10km_nConst_vVar.yaml")
push!(allPaths, "../data/paths/path_4_real_Ostsachsen_DG-DN_spp_5.yaml")
push!(allPaths, "../data/paths/path_4_real_Germany_EastSaxony_DG-DN.yaml")
allSettings=[]
push!(allSettings, "../data/settings.yaml")
allTrains=[]
push!(allTrains, "../data/trains/train_freight_V90withOreConsist.yaml")
push!(allTrains, "../data/trains/train_yaml_files\\train_passenger_SiemensDesiroClassic.yaml")
push!(allTrains, "../data/trains/train_passenger_SiemensDesiroClassic.yaml")
push!(allTrains, "../data/trains/train_passenger_IC2.yaml")
for pathDirectory in allPaths

8
src/Output.jl
View File

@ -112,13 +112,13 @@ function createOutputCsv(settings::Settings, pathName::String, trainName::String
outputArray="outputArrayMinimumEnergyConsumption"
date = Dates.now()
dateString=Dates.format(date, "yyyy-mm-dd_HH.MM.SS")
csvFilePath=settings.csvDirectory*"\\"*dateString*"_MinimumEnergyConsumption.csv"
csvFilePath=settings.csvDirectory*"/"*dateString*"_MinimumEnergyConsumption.csv"
else
operationMode="minimum running time"
outputArray="outputArrayMinimumRunningTime"
date = Dates.now()
dateString=Dates.format(date, "yyyy-mm-dd_HH.MM.SS")
csvFilePath=settings.csvDirectory*"\\"*dateString*"_MinimumRunningTime.csv"
csvFilePath=settings.csvDirectory*"/"*dateString*"_MinimumRunningTime.csv"
end
# creating information block
@ -195,7 +195,7 @@ function createOutputCsv(settings::Settings, pathName::String, trainName::String
end
date = Dates.now()
dateString=Dates.format(date, "yyyy-mm-dd_HH.MM.SS")
csvFilePath=settings.csvDirectory*"\\"*dateString*"_dataMinimumRunningTime.csv"
csvFilePath=settings.csvDirectory*"/"*dateString*"_dataMinimumRunningTime.csv"
CSV.write(csvFilePath, df, header=false)
println("The output CSV file has been created for minimum running time at ",csvFilePath)
end #if settings.operationModeMinimumRunningTime
@ -235,7 +235,7 @@ function createOutputCsv(settings::Settings, pathName::String, trainName::String
# creating a CSV-file at csvDirectory
date = Dates.now()
dateString=Dates.format(date, "yyyy-mm-dd_HH.MM.SS")
csvFilePath=settings.csvDirectory*"\\"*dateString*"_dataMinimumEnergyConsumption.csv"
csvFilePath=settings.csvDirectory*"/"*dateString*"_dataMinimumEnergyConsumption.csv"
CSV.write(csvFilePath, df, header=false)
println("The output CSV file has been created for minimum energy consumption at ",csvFilePath)
end # if settings.operationModeMinimumEnergyConsumption