From d1e8644c05638f4342624d8417087e175d5a9ca3 Mon Sep 17 00:00:00 2001 From: Michael Krisper <michael.krisper@tugraz.at> Date: Fri, 18 Jun 2021 08:18:40 +0200 Subject: [PATCH] renamed constant "NOT_AVAILABLE" (typo) --- VECTO/Input Files/Battery.vb | 2 +- VECTO/Input Files/ElectricMachine.vb | 2 +- VECTO/Input Files/Engine.vb | 4 ++-- VECTO/Input Files/Gearbox.vb | 4 ++-- VECTO/Input Files/SuperCap.vb | 2 +- VECTO/Input Files/Vehicle.vb | 10 +++++----- VectoCore/VectoCore/Configuration/Constants.cs | 2 +- .../VectoCore/InputData/FileIO/JSON/JSONBattery.cs | 4 ++-- .../InputData/FileIO/JSON/JSONElectricMotor.cs | 4 ++-- .../InputData/FileIO/JSON/JSONEngineData.cs | 4 ++-- .../InputData/FileIO/JSON/JSONGearboxData.cs | 4 ++-- .../InputData/FileIO/JSON/JSONVehicleData.cs | 10 +++++----- .../DataProvider/AbstractCommonComponentType.cs | 2 +- .../VectoCore/OutputData/SummaryDataContainer.cs | 14 +++++++------- .../OutputData/XML/XMLDeclarationWriter.cs | 6 +++--- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/VECTO/Input Files/Battery.vb b/VECTO/Input Files/Battery.vb index 23c62cbc4f..e1923b4a0c 100644 --- a/VECTO/Input Files/Battery.vb +++ b/VECTO/Input Files/Battery.vb @@ -202,7 +202,7 @@ Public Class Battery End Property Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber Get - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb index d150072ff4..e67059c6e8 100644 --- a/VECTO/Input Files/ElectricMachine.vb +++ b/VECTO/Input Files/ElectricMachine.vb @@ -186,7 +186,7 @@ Public Class ElectricMachine End Property Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber Get - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb index bb4bb6f496..a1889be48b 100644 --- a/VECTO/Input Files/Engine.vb +++ b/VECTO/Input Files/Engine.vb @@ -266,7 +266,7 @@ Public Class Engine Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer Get ' Just for the interface. Value is not available in GUI yet. - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property @@ -291,7 +291,7 @@ Public Class Engine Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber Get ' Just for the interface. Value is not available in GUI yet. - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb index 3f24eecc22..5d67c96eac 100644 --- a/VECTO/Input Files/Gearbox.vb +++ b/VECTO/Input Files/Gearbox.vb @@ -351,7 +351,7 @@ Public Class Gearbox Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer Get ' Just for the interface. Value is not available in GUI yet. - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property @@ -378,7 +378,7 @@ Public Class Gearbox Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber Get ' Just for the interface. Value is not available in GUI yet. - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property diff --git a/VECTO/Input Files/SuperCap.vb b/VECTO/Input Files/SuperCap.vb index b3354b5482..efeadb4c0e 100644 --- a/VECTO/Input Files/SuperCap.vb +++ b/VECTO/Input Files/SuperCap.vb @@ -82,7 +82,7 @@ Public Class SuperCap End Property Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber Get - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb index 2f13141fd8..630b36b625 100644 --- a/VECTO/Input Files/Vehicle.vb +++ b/VECTO/Input Files/Vehicle.vb @@ -304,14 +304,14 @@ Public Class Vehicle Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer Get ' Just for the interface. Value is not available in GUI yet. - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property Public ReadOnly Property Model As String Implements IComponentInputData.Model Get ' Just for the interface. Value is not available in GUI yet. - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property @@ -337,7 +337,7 @@ Public Class Vehicle Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber Get ' Just for the interface. Value is not available in GUI yet. - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property @@ -375,7 +375,7 @@ Public Class Vehicle Public ReadOnly Property VIN As String Implements IVehicleDeclarationInputData.VIN Get - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property @@ -409,7 +409,7 @@ Public Class Vehicle Public ReadOnly Property ManufacturerAddress As String Implements IVehicleDeclarationInputData.ManufacturerAddress Get - Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE + Return TUGraz.VectoCore.Configuration.Constants.NOT_AVAILABLE End Get End Property diff --git a/VectoCore/VectoCore/Configuration/Constants.cs b/VectoCore/VectoCore/Configuration/Constants.cs index d8ce358306..5dca2e72d7 100644 --- a/VectoCore/VectoCore/Configuration/Constants.cs +++ b/VectoCore/VectoCore/Configuration/Constants.cs @@ -36,7 +36,7 @@ namespace TUGraz.VectoCore.Configuration { public static class Constants { - public const string NOT_AVailABLE = "N/A"; + public const string NOT_AVAILABLE = "N/A"; public static Second DefaultPowerShiftTime = 0.8.SI<Second>(); public const double RPMToRad = 2 * Math.PI / 60; diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs index 17223a7852..4b1703719e 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs @@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public JSONBatteryV1(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { } - public string Manufacturer => Constants.NOT_AVailABLE; + public string Manufacturer => Constants.NOT_AVAILABLE; public string Model => Body.GetEx<string>("Model"); @@ -22,7 +22,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public CertificationMethod CertificationMethod => CertificationMethod.NotCertified; - public string CertificationNumber => Constants.NOT_AVailABLE; + public string CertificationNumber => Constants.NOT_AVAILABLE; public DigestData DigestValue => null; diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs index 702ddc98fb..c843414f17 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs @@ -24,14 +24,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON { public class JSONElectricMotorV1 : JSONFile, IElectricMotorEngineeringInputData { public JSONElectricMotorV1(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { } - public virtual string Manufacturer => Constants.NOT_AVailABLE; + public virtual string Manufacturer => Constants.NOT_AVAILABLE; public virtual string Model => Body.GetEx<string>("Model"); public virtual DateTime Date => DateTime.MinValue; public virtual CertificationMethod CertificationMethod => CertificationMethod.NotCertified; - public string CertificationNumber => Constants.NOT_AVailABLE; + public string CertificationNumber => Constants.NOT_AVAILABLE; public DigestData DigestValue => null; diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs index e319c443e8..19d9c1519d 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs @@ -348,7 +348,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public virtual double CorrectionFactorRegPer => 1; - public virtual string Manufacturer => Constants.NOT_AVailABLE; + public virtual string Manufacturer => Constants.NOT_AVAILABLE; public virtual string Model => Body.GetEx<string>(JsonKeys.Engine_ModelName); @@ -357,7 +357,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public virtual CertificationMethod CertificationMethod => CertificationMethod.NotCertified; - public virtual string CertificationNumber => Constants.NOT_AVailABLE; + public virtual string CertificationNumber => Constants.NOT_AVAILABLE; public virtual DigestData DigestValue => null; } diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs index 9d8d2be4c9..3d039c3d1b 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs @@ -445,7 +445,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON #endregion - public string Manufacturer => Constants.NOT_AVailABLE; + public string Manufacturer => Constants.NOT_AVAILABLE; public string Model => Body.GetEx<string>(JsonKeys.Gearbox_ModelName); @@ -453,7 +453,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public CertificationMethod CertificationMethod => CertificationMethod.NotCertified; - public string CertificationNumber => Constants.NOT_AVailABLE; + public string CertificationNumber => Constants.NOT_AVAILABLE; public DigestData DigestValue => null; } diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs index 6bb6cdf369..56a5b1d3a9 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs @@ -220,7 +220,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public virtual bool ExemptedVehicle => false; - public virtual string VIN => Constants.NOT_AVailABLE; + public virtual string VIN => Constants.NOT_AVAILABLE; public string LegislativeCategory => null; @@ -306,7 +306,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON public virtual IList<IAxleEngineeringInputData> AxlesEngineering => AxleWheels().Cast<IAxleEngineeringInputData>().ToList(); - public virtual string ManufacturerAddress => Constants.NOT_AVailABLE; + public virtual string ManufacturerAddress => Constants.NOT_AVAILABLE; public virtual PerSecond EngineIdleSpeed => Body["IdlingSpeed"] != null ? Body.GetEx<double>("IdlingSpeed").RPMtoRad() : null; @@ -488,15 +488,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON #endregion - public virtual string Manufacturer => Constants.NOT_AVailABLE; + public virtual string Manufacturer => Constants.NOT_AVAILABLE; - public virtual string Model => Constants.NOT_AVailABLE; + public virtual string Model => Constants.NOT_AVAILABLE; public virtual DateTime Date => DateTime.MinValue; public CertificationMethod CertificationMethod => CertificationMethod.NotCertified; - public virtual string CertificationNumber => Constants.NOT_AVailABLE; + public virtual string CertificationNumber => Constants.NOT_AVAILABLE; public virtual DigestData DigestValue => null; diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs index 3a76fecd89..5784f124f3 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs @@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider public virtual CertificationMethod CertificationMethod => CertificationMethod.NotCertified; - public virtual string CertificationNumber => Constants.NOT_AVailABLE; + public virtual string CertificationNumber => Constants.NOT_AVAILABLE; public virtual DigestData DigestValue => null; diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs index 9b03857807..47015a0310 100644 --- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs @@ -922,9 +922,9 @@ namespace TUGraz.VectoCore.OutputData ? "" : data.CertificationNumber; } else { - row[Fields.ANGLEDRIVE_MANUFACTURER] = Constants.NOT_AVailABLE; - row[Fields.ANGLEDRIVE_MODEL] = Constants.NOT_AVailABLE; - row[Fields.ANGLEDRIVE_RATIO] = Constants.NOT_AVailABLE; + row[Fields.ANGLEDRIVE_MANUFACTURER] = Constants.NOT_AVAILABLE; + row[Fields.ANGLEDRIVE_MODEL] = Constants.NOT_AVAILABLE; + row[Fields.ANGLEDRIVE_RATIO] = Constants.NOT_AVAILABLE; row[Fields.ANGLEDRIVE_CERTIFICATION_METHOD] = ""; row[Fields.ANGLEDRIVE_CERTIFICATION_NUMBER] = ""; } @@ -941,8 +941,8 @@ namespace TUGraz.VectoCore.OutputData ? "" : data.CertificationNumber; } else { - row[Fields.RETARDER_MANUFACTURER] = Constants.NOT_AVailABLE; - row[Fields.RETARDER_MODEL] = Constants.NOT_AVailABLE; + row[Fields.RETARDER_MANUFACTURER] = Constants.NOT_AVAILABLE; + row[Fields.RETARDER_MODEL] = Constants.NOT_AVAILABLE; row[Fields.RETARDER_CERTIFICATION_METHOD] = ""; row[Fields.RETARDER_CERTIFICATION_NUMBER] = ""; } @@ -983,8 +983,8 @@ namespace TUGraz.VectoCore.OutputData row[Fields.GEAR_RATIO_LAST_GEAR] = data.Gears.Count > 0 ? (ConvertedSI)data.Gears.Last().Value.Ratio.SI<Scalar>() : (ConvertedSI)0.SI<Scalar>(); - row[Fields.TORQUECONVERTER_MANUFACTURER] = Constants.NOT_AVailABLE; - row[Fields.TORQUECONVERTER_MODEL] = Constants.NOT_AVailABLE; + row[Fields.TORQUECONVERTER_MANUFACTURER] = Constants.NOT_AVAILABLE; + row[Fields.TORQUECONVERTER_MODEL] = Constants.NOT_AVAILABLE; row[Fields.TORQUE_CONVERTER_CERTIFICATION_METHOD] = ""; row[Fields.TORQUE_CONVERTER_CERTIFICATION_NUMBER] = ""; } diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs index 6da3b15672..2534c73a24 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs @@ -128,7 +128,7 @@ namespace TUGraz.VectoCore.OutputData.XML return new XElement(tns + XMLNames.Component_Vehicle, new XAttribute(XMLNames.Component_ID_Attr, id), - GetDefaultComponentElements(vehicle.CertificationNumber, vehicle.Model, Constants.NOT_AVailABLE), + GetDefaultComponentElements(vehicle.CertificationNumber, vehicle.Model, Constants.NOT_AVAILABLE), new XElement(tns + XMLNames.Vehicle_LegislativeClass, "N3"), new XElement(tns + XMLNames.Vehicle_VehicleCategory, vehicle.VehicleCategory.ToXMLFormat()), new XElement(tns + XMLNames.Vehicle_AxleConfiguration, vehicle.AxleConfiguration.GetName()), @@ -299,7 +299,7 @@ namespace TUGraz.VectoCore.OutputData.XML return new XElement((ns ?? tns) + XMLNames.Component_Axlegear, new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, typeId), - GetDefaultComponentElements(typeId, Constants.NOT_AVailABLE), + GetDefaultComponentElements(typeId, Constants.NOT_AVAILABLE), new XElement(tns + "LineType", "Single portal axle"), new XElement(tns + XMLNames.Axlegear_Ratio, data.Ratio.ToXMLFormat(3)), new XElement(tns + XMLNames.Component_CertificationMethod, "Standard values"), @@ -374,7 +374,7 @@ namespace TUGraz.VectoCore.OutputData.XML return new XElement((ns ?? tns) + XMLNames.Component_AirDrag, new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), - GetDefaultComponentElements(data.Model, Constants.NOT_AVailABLE), + GetDefaultComponentElements(data.Model, Constants.NOT_AVAILABLE), new XElement(tns + "CdxA_0", data.AirDragArea.Value().ToXMLFormat(2)), new XElement(tns + "TransferredCdxA", data.AirDragArea.Value().ToXMLFormat(2)), new XElement(tns + XMLNames.AirDrag_DeclaredCdxA, data.AirDragArea.Value().ToXMLFormat(2))), -- GitLab