diff --git a/data/settings.yaml b/data/settings/settings_distanceStep_massPoint.yaml similarity index 100% rename from data/settings.yaml rename to data/settings/settings_distanceStep_massPoint.yaml diff --git a/data/settings/settings_timeStep_massPoint.yaml b/data/settings/settings_timeStep_massPoint.yaml new file mode 100644 index 0000000..dd1aef0 --- /dev/null +++ b/data/settings/settings_timeStep_massPoint.yaml @@ -0,0 +1,12 @@ +%YAML 1.2 +--- +settings: +# settings for the simulation + massModel: "mass point" # model type of train mass "mass point" or "homogeneous strip" + stepVariable: "t in s" # step variable of the step method "s in m", "t in s" or "v in m/s" + stepSize: 3.0 # step size (unit depends on stepVariable s in m, t in s and v in m/s) + operationModeMinimumRunningTime: true # operation mode "minimum running time" + operationModeMinimumEnergyConsumption: false # operation mode "minimum energy consumption" + typeOfOutput: "julia dictionary" # output as "julia dictionary" or as "CSV" + detailOfOutput: "driving course" # should the output be "minimal", "points of interest" or "driving course"? + csvDirectory: "~/Desktop/TrainRun" diff --git a/data/settings/settings_velocityStep_massPoint.yaml b/data/settings/settings_velocityStep_massPoint.yaml new file mode 100644 index 0000000..b246686 --- /dev/null +++ b/data/settings/settings_velocityStep_massPoint.yaml @@ -0,0 +1,12 @@ +%YAML 1.2 +--- +settings: +# settings for the simulation + massModel: "mass point" # model type of train mass "mass point" or "homogeneous strip" + stepVariable: "v in m/s" # step variable of the step method "s in m", "t in s" or "v in m/s" + stepSize: 0.1 # step size (unit depends on stepVariable s in m, t in s and v in m/s) + operationModeMinimumRunningTime: true # operation mode "minimum running time" + operationModeMinimumEnergyConsumption: false # operation mode "minimum energy consumption" + typeOfOutput: "julia dictionary" # output as "julia dictionary" or as "CSV" + detailOfOutput: "driving course" # should the output be "minimal", "points of interest" or "driving course"? + csvDirectory: "~/Desktop/TrainRun" diff --git a/examples/ExtendedWorkingExample.jl b/examples/ExtendedWorkingExample.jl index 7eb70fb..f82362f 100644 --- a/examples/ExtendedWorkingExample.jl +++ b/examples/ExtendedWorkingExample.jl @@ -16,7 +16,7 @@ push!(allPaths, importYamlFile(:path, "data/paths/path_4_real_Germany_EastSaxony allSettings=[] -push!(allSettings, importYamlFile(:settings, "data/settings.yaml")) +push!(allSettings, importYamlFile(:settings, "data/settings/settings_distanceStep_massPoint.yaml")) allTrains=[] push!(allTrains, importYamlFile(:train, "data/trains/train_freight_V90withOreConsist.yaml")) diff --git a/examples/MinimalWorkingExample.jl b/examples/MinimalWorkingExample.jl index 9f7016c..0eac758 100644 --- a/examples/MinimalWorkingExample.jl +++ b/examples/MinimalWorkingExample.jl @@ -10,7 +10,7 @@ using .TrainRun train_directory = "data/trains/train_freight_V90withOreConsist.yaml" running_path_directory = "data/paths/path_1_10km_nConst_vConst.yaml" -setting_directory = "data/settings.yaml" +setting_directory = "data/settings/settings_distanceStep_massPoint.yaml" (train, running_path, settings) = importYamlFiles(train_directory, running_path_directory, setting_directory) train_run = calculateDrivingDynamics(train, running_path, settings)