Refactor input and import and set default values
parent
9343e1cc74
commit
18c902e98c
|
@ -9,28 +9,30 @@ include("../src/TrainRun.jl")
|
||||||
using .TrainRun
|
using .TrainRun
|
||||||
|
|
||||||
allPaths=[]
|
allPaths=[]
|
||||||
push!(allPaths, importYamlFile(:path, "data/paths/path_1_10km_nConst_vConst.yaml"))
|
push!(allPaths, importFromYaml(:path, "data/paths/path_1_10km_nConst_vConst.yaml"))
|
||||||
push!(allPaths, importYamlFile(:path, "data/paths/path_2_10km_nVar_vConst.yaml"))
|
push!(allPaths, importFromYaml(:path, "data/paths/path_2_10km_nVar_vConst.yaml"))
|
||||||
push!(allPaths, importYamlFile(:path, "data/paths/path_3_10km_nConst_vVar.yaml"))
|
push!(allPaths, importFromYaml(:path, "data/paths/path_3_10km_nConst_vVar.yaml"))
|
||||||
push!(allPaths, importYamlFile(:path, "data/paths/path_4_real_Germany_EastSaxony_DG-DN.yaml"))
|
push!(allPaths, importFromYaml(:path, "data/paths/path_4_real_Germany_EastSaxony_DG-DN.yaml"))
|
||||||
|
|
||||||
allSettings=[]
|
allSettings=[]
|
||||||
push!(allSettings, importYamlFile(:settings, "data/settings/settings_distanceStep_massPoint.yaml"))
|
push!(allSettings, importFromYaml(:settings, "data/settings/settings_distanceStep_massPoint.yaml"))
|
||||||
|
|
||||||
allTrains=[]
|
allTrains=[]
|
||||||
push!(allTrains, importYamlFile(:train, "data/trains/train_freight_V90withOreConsist.yaml"))
|
push!(allTrains, importFromYaml(:train, "data/trains/train_freight_V90withOreConsist.yaml"))
|
||||||
push!(allTrains, importYamlFile(:train, "data/trains/train_passenger_SiemensDesiroClassic.yaml"))
|
push!(allTrains, importFromYaml(:train, "data/trains/train_passenger_SiemensDesiroClassic.yaml"))
|
||||||
push!(allTrains, importYamlFile(:train, "data/trains/train_passenger_IC2.yaml"))
|
push!(allTrains, importFromYaml(:train, "data/trains/train_passenger_IC2.yaml"))
|
||||||
|
|
||||||
for path in allPaths
|
for path in allPaths
|
||||||
# println(" - - - - - - - - -")
|
# println(" - - - - - - - - -")
|
||||||
# println("path: ", path)
|
# println("path: ", path[:name])
|
||||||
for train in allTrains
|
for train in allTrains
|
||||||
# println("train: ", train)
|
# println("train: ", train[:name])
|
||||||
for settings in allSettings
|
for settings in allSettings
|
||||||
resultsDict = calculateDrivingDynamics(train, path, settings)
|
resultsDict = calculateDrivingDynamics(train, path, settings)
|
||||||
exportToCsv(resultsDict)
|
if haskey(settings, :typeOfOutput) && settings[:typeOfOutput] == "CSV"
|
||||||
sleep(2)
|
exportToCsv(resultsDict, settings)
|
||||||
|
sleep(2)
|
||||||
|
end
|
||||||
# println("")
|
# println("")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue