Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit f08819cd authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

fix: don't require deprecated LAC input data

parent bdf7f811
No related branches found
No related tags found
No related merge requests found
...@@ -398,8 +398,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON ...@@ -398,8 +398,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
: null; : null;
return new LookAheadCoastingInputData() { return new LookAheadCoastingInputData() {
Enabled = lac.GetEx<bool>(JsonKeys.DriverData_Lookahead_Enabled), Enabled = lac.GetEx<bool>(JsonKeys.DriverData_Lookahead_Enabled),
Deceleration = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_Deceleration).SI<MeterPerSquareSecond>(), //Deceleration = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_Deceleration).SI<MeterPerSquareSecond>(),
MinSpeed = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_MinSpeed).KMPHtoMeterPerSecond(), //MinSpeed = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_MinSpeed).KMPHtoMeterPerSecond(),
LookaheadDistanceFactor = distanceScalingFactor, LookaheadDistanceFactor = distanceScalingFactor,
CoastingDecisionFactorOffset = lacDfOffset, CoastingDecisionFactorOffset = lacDfOffset,
CoastingDecisionFactorScaling = lacDfScaling, CoastingDecisionFactorScaling = lacDfScaling,
......
...@@ -59,9 +59,9 @@ namespace TUGraz.VectoCore.InputData.Impl ...@@ -59,9 +59,9 @@ namespace TUGraz.VectoCore.InputData.Impl
{ {
public bool Enabled { get; internal set; } public bool Enabled { get; internal set; }
public MeterPerSquareSecond Deceleration { get; internal set; } //public MeterPerSquareSecond Deceleration { get; internal set; }
public MeterPerSecond MinSpeed { get; internal set; } //public MeterPerSecond MinSpeed { get; internal set; }
public double CoastingDecisionFactorOffset { get; internal set; } public double CoastingDecisionFactorOffset { get; internal set; }
public double CoastingDecisionFactorScaling { get; internal set; } public double CoastingDecisionFactorScaling { get; internal set; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment