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

renamed DrivingDynamics.jl to Formulary.jl

development
Martin Scheidt 2022-04-21 14:04:59 +02:00
parent 5d77fa97f1
commit 01c1751001
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -19,7 +19,7 @@ Refactor the modular structure:
* Extract the modules Export and AdditionalOutput from TrainRunCalc * Extract the modules Export and AdditionalOutput from TrainRunCalc
* Divide the module Operationsmodes and add its functions to TrainRunCalc and EnergySaving * Divide the module Operationsmodes and add its functions to TrainRunCalc and EnergySaving
* Add the remaining functions of the module types to 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 * Rename the module Preparation to Characteristics

6
src/Behavior.jl
View File

@ -7,14 +7,14 @@
module Behavior module Behavior
include("./DrivingDynamics.jl") include("./Formulary.jl")
using .DrivingDynamics using .Formulary
export addBreakFreeSection!, addClearingSection!, addAcceleratingSection!, addCruisingSection!, addDiminishingSection!, addCoastingSection!, addBrakingSection!, addStandstill!, export addBreakFreeSection!, addClearingSection!, addAcceleratingSection!, addCruisingSection!, addDiminishingSection!, addCoastingSection!, addBrakingSection!, addStandstill!,
# addBrakingSectionInOneStep! is not used in the current version of the tool # addBrakingSectionInOneStep! is not used in the current version of the tool
calculateForces!, createDataPoint, calculateForces!, createDataPoint,
# export functions from DrivingDynamics # export functions from Formulary
calcBrakingDistance, calcBrakingStartVelocity, calc_Δs_with_Δt calcBrakingDistance, calcBrakingStartVelocity, calc_Δs_with_Δt

2
src/EnergySaving.jl
View File

@ -10,7 +10,7 @@
# TODO: calculation time for passenger trains on path1 is very long and should be reduced # 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/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/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/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 # 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

4
src/DrivingDynamics.jl → src/Formulary.jl
View File

@ -5,7 +5,7 @@
# __copyright__ = "2022" # __copyright__ = "2022"
# __license__ = "ISC" # __license__ = "ISC"
module DrivingDynamics module Formulary
######################### #########################
## literature the driving dynamics equations are based on: ## 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 return a_braking
end #function calcBrakingAcceleration end #function calcBrakingAcceleration
end #module DrivingDynamics end #module Formulary