diff --git a/VECTO/Input Files/Battery.vb b/VECTO/Input Files/Battery.vb index 23c62cbc4fe54776d3ae62345f9cef2c04dff181..e1923b4a0c0540f21da66f60f4cfba116cd59926 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 d150072ff40c22ca4a4f223beff268701666df15..e67059c6e868c7c51cc2305c8d321aaeb6e16719 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 bb4bb6f496ec217e51c733437389f87964e085c7..a1889be48b4db0e46774c0b1ef743315f8871187 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 3f24eecc22bf20f68c58b07050e50057c4a612d0..5d67c96eac0c5e2efa7d677d9404039da90e9dd2 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 b3354b548244f3cf6521d94760e094ea04c577c1..efeadb4c0eca19d4de31d6f41e534cb0e285061d 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 2f13141fd8b69340383de3a9282a5ff50f4f375d..630b36b625d0cde1fcb3d121d7ce39c84bff713e 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 d8ce3583060d09bb4cc052dc804316accf33135c..5dca2e72d78652308bac51eb4077ff0443e5d73c 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 17223a78524f49f3e28d18f4c6b345ff0431b3ef..4b1703719e38f3fcf8f989f0e7ed8782a513fea0 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 702ddc98fb3140fcd945676e66096c538ee95086..c843414f177a42b7d7565694a0bd723e8c8fac05 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 e319c443e8932a7f8a3df44a46528320d46b0d5c..19d9c1519d80092faeafe8d4bfcad428c7340e9d 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 9d8d2be4c97c98590644e5b857ec00e084abc2b2..3d039c3d1b099a6ac6239fe0d76ec9422501fec3 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 6bb6cdf3697420417783b899688174ee037848c1..56a5b1d3a9a78c0ce98d0fc7cc7af9cf37cd8bac 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 3a76fecd895ee3d5665c384abd79ef265d75a018..5784f124f3f62e7d9c131bc3f61df98cb8a632f6 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 9b03857807ac2778228c4d8ebd2de75db3740682..47015a0310780ee39655a21a286272944fc4f97a 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 6da3b15672a4cbe14e3c19cfac6d32317fd8381e..2534c73a24fdbd79d71af22d2b0c236507ced5a1 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))),