diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb index 1ed3033f8538b7df77b6a5bf5fac9df8b774c59a..6f1ac441b69ad5914273e55ff27963813a9735b8 100644 --- a/VECTO/Input Files/Gearbox.vb +++ b/VECTO/Input Files/Gearbox.vb @@ -631,13 +631,13 @@ Public Class Gearbox End Get End Property - Public Overridable ReadOnly Property LoadStageThresoldsUp As IList(Of Double) Implements IGearshiftEngineeringInputData.LoadStageThresoldsUp + Public Overridable ReadOnly Property LoadStageThresholdsUp As IList(Of Double) Implements IGearshiftEngineeringInputData.LoadStageThresholdsUp Get Return Nothing End Get End Property - Public Overridable ReadOnly Property LoadStageThresoldsDown As IList(Of Double) Implements IGearshiftEngineeringInputData.LoadStageThresoldsDown + Public Overridable ReadOnly Property LoadStageThresholdsDown As IList(Of Double) Implements IGearshiftEngineeringInputData.LoadStageThresholdsDown Get Return Nothing End Get diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs index 5ff457a67ea411dddf473a6aac67ed3eddf72ccc..fdb10e079374f165f481bbba0534e11da1c6dad8 100644 --- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs +++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs @@ -283,8 +283,8 @@ namespace TUGraz.VectoCommon.InputData // Voith GS Parameters TableData LoadStageShiftLines { get; } - IList<double> LoadStageThresoldsUp { get; } - IList<double> LoadStageThresoldsDown { get; } + IList<double> LoadStageThresholdsUp { get; } + IList<double> LoadStageThresholdsDown { get; } PerSecond MinEngineSpeedPostUpshift { get; } Second ATLookAheadTime { get; } diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs index 315820c6af3a99fc7088afa25f9c633ade96c51f..3ae66751bb46be562d4828b149d4fb5d1c2f36b6 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs @@ -420,8 +420,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON } public TableData LoadStageShiftLines { get { return null; } } - public IList<double> LoadStageThresoldsUp { get { return null; } } - public IList<double> LoadStageThresoldsDown { get { return null; } } + public IList<double> LoadStageThresholdsUp { get { return null; } } + public IList<double> LoadStageThresholdsDown { get { return null; } } public Second PowershiftShiftTime { diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs index d68830d93752433db4cece5003b3ada53f790a15..79d70dc0b6abdece95455c784cfa5eba2fab47c8 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs @@ -344,14 +344,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON } } - public IList<double> LoadStageThresoldsUp + public IList<double> LoadStageThresholdsUp { get { return (Body["LoadStageThresoldsUp"]?.ToString())?.Split(';').Select(x => x.ToDouble(0)).ToList(); } } - public IList<double> LoadStageThresoldsDown + public IList<double> LoadStageThresholdsDown { get { return (Body["LoadStageThresoldsDown"]?.ToString())?.Split(';').Select(x => x.ToDouble(0)).ToList(); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs index c99079403a1a45fc5cc1eb85da45a43feb47e7a7..3a3a9e41fed9feb47a8b0b0669f500e59ac8220f 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs @@ -128,8 +128,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider } public virtual TableData LoadStageShiftLines { get { return null; } } - public virtual IList<double> LoadStageThresoldsUp { get { return null; } } - public virtual IList<double> LoadStageThresoldsDown { get { return null; } } + public virtual IList<double> LoadStageThresholdsUp { get { return null; } } + public virtual IList<double> LoadStageThresholdsDown { get { return null; } } public virtual Second PowershiftShiftTime { diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs index ce6675079bff2164deff9bd133feab6688c7e4dc..c20033664a6973fbadb39b4837b2025cc37a7608 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs @@ -464,15 +464,15 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter MinEngineSpeedPostUpshift = gsInputData.MinEngineSpeedPostUpshift ?? DeclarationData.GearboxTCU.MinEngineSpeedPostUpshift, ATLookAheadTime = gsInputData.ATLookAheadTime ?? DeclarationData.GearboxTCU.ATLookAheadTime, - LoadStageThresoldsDown = gsInputData.LoadStageThresoldsDown?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresoldsDown, - LoadStageThresoldsUp = gsInputData.LoadStageThresoldsUp?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresholdsUp, + LoadStageThresoldsDown = gsInputData.LoadStageThresholdsDown?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresoldsDown, + LoadStageThresoldsUp = gsInputData.LoadStageThresholdsUp?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresholdsUp, ShiftSpeedsTCToLocked = gsInputData.ShiftSpeedsTCToLocked ?? DeclarationData.GearboxTCU.ShiftSpeedsTCToLocked, // voith gs parameters GearshiftLines = gsInputData.LoadStageShiftLines, - LoadstageThresholds = gsInputData.LoadStageThresoldsUp != null && gsInputData.LoadStageThresoldsDown != null ? gsInputData.LoadStageThresoldsUp.Zip(gsInputData.LoadStageThresoldsDown, Tuple.Create) : null + LoadstageThresholds = gsInputData.LoadStageThresholdsUp != null && gsInputData.LoadStageThresholdsDown != null ? gsInputData.LoadStageThresholdsUp.Zip(gsInputData.LoadStageThresholdsDown, Tuple.Create) : null }; return retVal; diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs index 05ee610761790fe73fed98ca00f95600c92b4257..802f73e90afbea5707b4f2799b952802504bb8fd 100644 --- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs +++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs @@ -271,13 +271,13 @@ namespace TUGraz.VectoCore.Models.Declaration if (tcuData.ATLookAheadTime != null) { ATLookAheadTime = tcuData.ATLookAheadTime; } - if (LoadStageThresoldsDown != null && LoadStageThresoldsDown.Length > 0) { - LoadStageThresoldsDown = tcuData.LoadStageThresoldsDown.ToArray(); + if (tcuData.LoadStageThresholdsDown != null && LoadStageThresoldsDown.Length > 0) { + LoadStageThresoldsDown = tcuData.LoadStageThresholdsDown.ToArray(); } - if (LoadStageThresholdsUp != null && LoadStageThresholdsUp.Length > 0) { - LoadStageThresholdsUp = tcuData.LoadStageThresoldsUp.ToArray(); + if (tcuData.LoadStageThresholdsUp != null && LoadStageThresholdsUp.Length > 0) { + LoadStageThresholdsUp = tcuData.LoadStageThresholdsUp.ToArray(); } - if (ShiftSpeedsTCToLocked != null && ShiftSpeedsTCToLocked.Length > 0) { + if (tcuData.ShiftSpeedsTCToLocked != null && ShiftSpeedsTCToLocked.Length > 0) { ShiftSpeedsTCToLocked = tcuData.ShiftSpeedsTCToLocked; } if (tcuData.MinEngineSpeedPostUpshift != null) {