From 49ac46430a99ad05c5349e923350732b528ef164 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 26 Jul 2016 08:23:42 +0200
Subject: [PATCH] adaptations for torque converter input data
---
.../InputData/DeclarationInputData.cs | 21 +---------------
.../InputData/EngineeringInputData.cs | 24 ++++++++++++++++++-
.../InputData/IInputDataProvider.cs | 4 ++++
3 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index c3dc2b310c..a7b1678775 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -264,27 +264,8 @@ namespace TUGraz.VectoCommon.InputData
double Efficiency { get; }
}
- public interface ITorqueConverterInputData
+ public interface ITorqueConverterDeclarationInputData
{
- /// <summary>
- /// P090
- /// cf. VECTO Input Parameters.xlsx
- /// </summary>
- bool Enabled { get; }
-
- /// <summary>
- /// P092
- /// cf. VECTO Input Parameters.xlsx
- /// </summary>
- // ReSharper disable once InconsistentNaming
- PerSecond ReferenceRPM { get; }
-
- /// <summary>
- /// P127
- /// cf. VECTO Input Parameters.xlsx
- /// </summary>
- KilogramSquareMeter Inertia { get; }
-
/// <summary>
/// P091
/// P099, P100, P101
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index 320a9542b6..38d30a59b8 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -171,7 +171,7 @@ namespace TUGraz.VectoCommon.InputData
/// P090, P091, P092, P127
/// cf. VECTO Input Parameters.xlsx
/// </summary>
- ITorqueConverterInputData TorqueConverter { get; }
+ ITorqueConverterEngineeringInputData TorqueConverter { get; }
[Required, SIRange(0, double.MaxValue)]
Second DownshiftAferUpshiftDelay { get; }
@@ -183,6 +183,28 @@ namespace TUGraz.VectoCommon.InputData
MeterPerSquareSecond UpshiftMinAcceleration { get; }
}
+ public interface ITorqueConverterEngineeringInputData : ITorqueConverterDeclarationInputData
+ {
+ ///// <summary>
+ ///// P090
+ ///// cf. VECTO Input Parameters.xlsx
+ ///// </summary>
+ //bool Enabled { get; } // deprecated
+
+ /// <summary>
+ /// P092
+ /// cf. VECTO Input Parameters.xlsx
+ /// </summary>
+ // ReSharper disable once InconsistentNaming
+ PerSecond ReferenceRPM { get; }
+
+ /// <summary>
+ /// P127
+ /// cf. VECTO Input Parameters.xlsx
+ /// </summary>
+ KilogramSquareMeter Inertia { get; }
+ }
+
public interface IEngineEngineeringInputData : IEngineDeclarationInputData
{
/// <summary>
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index d62df7a117..9c3676c1bc 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -41,6 +41,8 @@ namespace TUGraz.VectoCommon.InputData
IGearboxDeclarationInputData GearboxInputData { get; }
+ ITorqueConverterDeclarationInputData TorqueConverterInputData { get; }
+
IAxleGearInputData AxleGearInputData { get; }
IAngularGearInputData AngularGearInputData { get; }
@@ -62,6 +64,8 @@ namespace TUGraz.VectoCommon.InputData
IGearboxEngineeringInputData GearboxInputData { get; }
+ ITorqueConverterEngineeringInputData TorqueConverterInputData { get; }
+
IAxleGearInputData AxleGearInputData { get; }
IAngularGearInputData AngularGearInputData { get; }
--
GitLab