From 6c3dbc5be86ed99b966daf88d23f29200ece38c6 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 22 Sep 2016 08:32:23 +0200
Subject: [PATCH] allow empty list of cycles
---
.../VectoCore/InputData/FileIO/JSON/JSONInputData.cs | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 1e9f15c106..c6b764db12 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -318,6 +318,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get
{
var retVal = new List<ICycleData>();
+ if (Body[JsonKeys.Job_Cycles] == null) {
+ return retVal;
+ }
foreach (var cycle in Body.GetEx(JsonKeys.Job_Cycles)) {
//.Select(cycle =>
var cycleFile = Path.Combine(BasePath, cycle.Value<string>());
@@ -409,10 +412,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
? ReadTableData(lac.GetEx<string>("Df_velocityDropLookup"),
"Lookahead Coasting Decisionfactor - Velocity drop", false)
: null;
+ var minSpeed = lac["MinSpeed"] != null
+ ? lac.GetEx<double>(JsonKeys.DriverData_Lookahead_MinSpeed).KMPHtoMeterPerSecond()
+ : DeclarationData.Driver.LookAhead.MinimumSpeed;
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(),
+ MinSpeed = minSpeed,
LookaheadDistanceFactor = distanceScalingFactor,
CoastingDecisionFactorOffset = lacDfOffset,
CoastingDecisionFactorScaling = lacDfScaling,
--
GitLab