diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs index c3dc2b310c2dd4c63aba03c2d0bb9fa5d6cdbc22..a7b16787757996e2efd3d646e0558c3ab0f93731 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 320a9542b61eb1ecfe5b74f22dea3f4b4bb5c4df..38d30a59b8533fd2e06ed28b93a4265c00f2d93a 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 d62df7a117cb7b10a68b5fa0405d82fd345dd3c3..9c3676c1bc4678808066f3a8edec342b76cfa894 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; }