diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb index b28b5a04a30e63f5547eec277ad8895c8e4a2ef8..bc1e87c9970efb529cbfebe9f825d01eff13a8a4 100644 --- a/VECTO/Input Files/Gearbox.vb +++ b/VECTO/Input Files/Gearbox.vb @@ -556,7 +556,7 @@ Public Class Gearbox End Get End Property - Public ReadOnly Property DownshiftMaxAccelerationAT As double? Implements IGearshiftEngineeringInputData.DownshiftMaxAccelerationAT + Public ReadOnly Property EffshiftAccelerationFactorAT As double? Implements IGearshiftEngineeringInputData.EffshiftAccelerationFactorAT get return Nothing End Get diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs index f48fef9fd17ec354ce8f9af546348334ca4475fe..acbadd88830c44a92b55aacdefd2287d7f95c90c 100644 --- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs +++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs @@ -285,7 +285,7 @@ namespace TUGraz.VectoCommon.InputData Second ATLookAheadTime { get; } double[][] ShiftSpeedsTCToLocked { get; } - double? DownshiftMaxAccelerationAT { get; } + double? EffshiftAccelerationFactorAT { get; } } public interface ITorqueConverterEngineeringShiftParameterInputData diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs index c4ceb7941f661ec660b57252748dddd564b5e81a..5c309188d183ff75cac795516176f02539ee99b7 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs @@ -390,7 +390,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public PerSecond MinEngineSpeedPostUpshift => null; public Second ATLookAheadTime => null; public double[][] ShiftSpeedsTCToLocked => null; - public double? DownshiftMaxAccelerationAT => null; + public double? EffshiftAccelerationFactorAT => null; public double? VeloictyDropFactor => null; diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs index 8d623244181e351839cf1c6db9357940b6b27f7b..649cc6bda6be8a2d6cd52dbb8aea060ce82ecf2c 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs @@ -145,7 +145,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON } } - public double? DownshiftMaxAccelerationAT + public double? EffshiftAccelerationFactorAT { get { diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs index 48a81e7b15a9b114b9f4f56ea4b02c6b3a657b10..4bfbd382e1bad186fcc395981f11449e6fd93a5b 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs @@ -137,7 +137,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider public PerSecond MinEngineSpeedPostUpshift => null; public Second ATLookAheadTime => null; public double[][] ShiftSpeedsTCToLocked => null; - public double? DownshiftMaxAccelerationAT { get; } + public double? EffshiftAccelerationFactorAT { get; } public double? AccelerationFactor => null; diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs index 7de16c2af3016bb6f1a8c77ab7d4ff6f65670650..6c827f53d62eb9aabefcff9eb994a4d57aeaf93d 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs @@ -623,7 +623,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter LoadStageThresoldsDown = gsInputData.LoadStageThresholdsDown?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresoldsDown, LoadStageThresoldsUp = gsInputData.LoadStageThresholdsUp?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresholdsUp, ShiftSpeedsTCToLocked = engineIdlingSpeed == null ? null : (gsInputData.ShiftSpeedsTCToLocked ?? DeclarationData.GearboxTCU.ShiftSpeedsTCToLocked).Select(x => x.Select(y => y + engineIdlingSpeed.AsRPM).ToArray()).ToArray(), - EffshiftAccelerationFactorAT = gsInputData.DownshiftMaxAccelerationAT ?? DeclarationData.GearboxTCU.DownshiftMaxAccelerationAT, + EffshiftAccelerationFactorAT = gsInputData.EffshiftAccelerationFactorAT ?? DeclarationData.GearboxTCU.DownshiftMaxAccelerationAT, }; diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs index c3bec05cb9cdc2c587c3512fc22c79279920dea0..af790b87a385e96a4b8e8a7202ed32b926dc1876 100644 --- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs +++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs @@ -513,7 +513,7 @@ namespace TUGraz.VectoCore.Models.Declaration //public static string DefaultShiftStrategy = ""; public const double DragMarginFactor = 0.7; - + public static bool Fallback_ATEcoRollReleaseLockupClutch = false; public static double DownshiftMaxAccelerationAT = 0.35; @@ -561,8 +561,8 @@ namespace TUGraz.VectoCore.Models.Declaration MinEngineSpeedPostUpshift = tcuData.MinEngineSpeedPostUpshift; } - if (tcuData.DownshiftMaxAccelerationAT != null) { - DownshiftMaxAccelerationAT = tcuData.DownshiftMaxAccelerationAT.Value; + if (tcuData.EffshiftAccelerationFactorAT != null) { + DownshiftMaxAccelerationAT = tcuData.EffshiftAccelerationFactorAT.Value; } var raw = tcuData as JSONFile;