From 550b705a5150351b9d5c8176f5b7abd775fc1c3e Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 19 Jul 2016 14:22:48 +0200
Subject: [PATCH] introduce declaration contants for gearbox shifting
parameters
---
.../VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs | 7 ++++---
.../Reader/DataObjectAdapter/DeclarationDataAdapter.cs | 6 +++---
VectoCore/VectoCore/Models/Declaration/DeclarationData.cs | 3 +++
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
index e55d23d01d..7522a855aa 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
@@ -38,6 +38,7 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Impl;
+using TUGraz.VectoCore.Models.Declaration;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
@@ -214,7 +215,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get
{
return Body["DownshiftAferUpshiftDelay"] == null
- ? 10.SI<Second>()
+ ? DeclarationData.Gearbox.DownshiftAfterUpshiftDelay
: Body.GetEx<double>("DownshiftAferUpshiftDelay").SI<Second>();
}
}
@@ -224,7 +225,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get
{
return Body["UpshiftAfterDownshiftDelay"] == null
- ? 10.SI<Second>()
+ ? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay
: Body.GetEx<double>("UpshiftAfterDownshiftDelay").SI<Second>();
}
}
@@ -234,7 +235,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get
{
return Body["UpshiftMinAcceleration"] == null
- ? 0.1.SI<MeterPerSquareSecond>()
+ ? DeclarationData.Gearbox.UpshiftMinAcceleration
: Body.GetEx<double>("UpshiftMinAcceleration").SI<MeterPerSquareSecond>();
}
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 1f5714cbc1..8b56fdc444 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -222,9 +222,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
});
}).ToDictionary(kv => kv.Key, kv => kv.Value);
- retVal.DownshiftAfterUpshiftDelay = 10.SI<Second>();
- retVal.UpshiftAfterDownshiftDelay = 10.SI<Second>();
- retVal.UpshiftMinAcceleration = 0.1.SI<MeterPerSquareSecond>();
+ retVal.DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay;
+ retVal.UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay;
+ retVal.UpshiftMinAcceleration =DeclarationData.Gearbox.UpshiftMinAcceleration;
return retVal;
}
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index cedc823aca..a002f7698a 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -236,6 +236,9 @@ namespace TUGraz.VectoCore.Models.Declaration
private static double ShiftPolygonEngineFldMargin = 0.98;
public static readonly Second MinTimeBetweenGearshifts = 2.SI<Second>();
+ public static readonly Second DownshiftAfterUpshiftDelay = 10.SI<Second>();
+ public static readonly Second UpshiftAfterDownshiftDelay = 10.SI<Second>();
+ public static readonly MeterPerSquareSecond UpshiftMinAcceleration = 0.1.SI<MeterPerSquareSecond>();
/// <summary>
/// computes the shift polygons for a single gear according to the whitebook 2016
--
GitLab