From f08819cdd0d4eaa9e9be924b05cdcf2e8054e534 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 6 Sep 2016 13:38:03 +0200
Subject: [PATCH] fix: don't require deprecated LAC input data
---
VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs | 4 ++--
VectoCore/VectoCore/InputData/Impl/InputData.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 5726ab3565..85fc230041 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -398,8 +398,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
: null;
return new LookAheadCoastingInputData() {
Enabled = lac.GetEx<bool>(JsonKeys.DriverData_Lookahead_Enabled),
- Deceleration = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_Deceleration).SI<MeterPerSquareSecond>(),
- MinSpeed = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_MinSpeed).KMPHtoMeterPerSecond(),
+ //Deceleration = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_Deceleration).SI<MeterPerSquareSecond>(),
+ //MinSpeed = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_MinSpeed).KMPHtoMeterPerSecond(),
LookaheadDistanceFactor = distanceScalingFactor,
CoastingDecisionFactorOffset = lacDfOffset,
CoastingDecisionFactorScaling = lacDfScaling,
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index 0810c78ddc..629584d16b 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -59,9 +59,9 @@ namespace TUGraz.VectoCore.InputData.Impl
{
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 CoastingDecisionFactorScaling { get; internal set; }
--
GitLab