From 01c1751001b57932eea513ac2fff6772aad90b28 Mon Sep 17 00:00:00 2001 From: Martin Scheidt Date: Thu, 21 Apr 2022 14:04:59 +0200 Subject: [PATCH] renamed DrivingDynamics.jl to Formulary.jl --- CHANGELOG.md | 2 +- src/Behavior.jl | 6 +++--- src/EnergySaving.jl | 2 +- src/{DrivingDynamics.jl => Formulary.jl} | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/{DrivingDynamics.jl => Formulary.jl} (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 529f8aa..02d2eb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ Refactor the modular structure: * Extract the modules Export and AdditionalOutput from TrainRunCalc * Divide the module Operationsmodes and add its functions to TrainRunCalc and EnergySaving * Add the remaining functions of the module types to EnergySaving -* Divide the module MovingPhases into Behavior and DrivingDynamics +* Divide the module MovingPhases into Behavior and Formulary * Rename the module Preparation to Characteristics diff --git a/src/Behavior.jl b/src/Behavior.jl index 91b7f90..8d65c09 100644 --- a/src/Behavior.jl +++ b/src/Behavior.jl @@ -7,14 +7,14 @@ module Behavior -include("./DrivingDynamics.jl") -using .DrivingDynamics +include("./Formulary.jl") +using .Formulary export addBreakFreeSection!, addClearingSection!, addAcceleratingSection!, addCruisingSection!, addDiminishingSection!, addCoastingSection!, addBrakingSection!, addStandstill!, # addBrakingSectionInOneStep! is not used in the current version of the tool calculateForces!, createDataPoint, -# export functions from DrivingDynamics +# export functions from Formulary calcBrakingDistance, calcBrakingStartVelocity, calc_Δs_with_Δt diff --git a/src/EnergySaving.jl b/src/EnergySaving.jl index 26c4d18..037f9af 100644 --- a/src/EnergySaving.jl +++ b/src/EnergySaving.jl @@ -10,7 +10,7 @@ # TODO: calculation time for passenger trains on path1 is very long and should be reduced # TODO from 2022/01/18: Test if enum trainType is working correctly in function calculateRecoveryTime or if only the else-pathis taken -# TODO from 2022/01/19: Are here calculations that should be transferred to DrivingDynamics.jl? +# TODO from 2022/01/19: Are here calculations that should be transferred to Formulary.jl? # TODO from 2022/01/22: use always copyCharacteristicSection and don't do it manually like "csModified=Dict(:id => csOriginal[:id], ..." three times # TODO from 2022/03/18: stateFlags need to be added to functions that add behavior sections # TODO from 2022/03/21: consider previous speed limits during the coasting section in case F_R < 0.0 and the train is getting faster diff --git a/src/DrivingDynamics.jl b/src/Formulary.jl similarity index 99% rename from src/DrivingDynamics.jl rename to src/Formulary.jl index 617d8e6..2f5f1f0 100644 --- a/src/DrivingDynamics.jl +++ b/src/Formulary.jl @@ -5,7 +5,7 @@ # __copyright__ = "2022" # __license__ = "ISC" -module DrivingDynamics +module Formulary ######################### ## literature the driving dynamics equations are based on: @@ -253,4 +253,4 @@ function calcBrakingAcceleration(v_start::Real, v_end::Real, s_braking::Real) return a_braking end #function calcBrakingAcceleration -end #module DrivingDynamics +end #module Formulary