diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 55aeba29ba861538151e9886954b20ca97fe7e0b..b1005431df3dba34c874c91a5853a852b4240ee6 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -290,7 +290,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 "N.A."
+ Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE
End Get
End Property
@@ -309,7 +309,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 "N.A."
+ 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 4ffe936751a56af3e811c1ee06b4d60799a63f05..2e560490577433be15981343087976d7af95f0cb 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -307,7 +307,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 "N.A."
+ Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE
End Get
End Property
@@ -327,7 +327,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 "N.A."
+ Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE
End Get
End Property
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index fab6992313e5068e66aa422c1bcaac5a50538fc1..de5e6fdd7a8e54c8a116160d0d052a7c78e4f6da 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -269,14 +269,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 "N.A."
+ 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 "N.A."
+ Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE
End Get
End Property
@@ -296,7 +296,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 "N.A."
+ Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE
End Get
End Property
@@ -328,7 +328,7 @@ Public Class Vehicle
Public ReadOnly Property VIN As String Implements IVehicleDeclarationInputData.VIN
Get
- Return "N.A."
+ Return TUGraz.VectoCore.Configuration.Constants.NOT_AVailABLE
End Get
End Property
@@ -360,7 +360,7 @@ Public Class Vehicle
Public ReadOnly Property ManufacturerAddress As String Implements IVehicleDeclarationInputData.ManufacturerAddress
Get
- Return "N.A."
+ 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 13c86c1ba175a202c0a6f6f2bafd67cc048ae12e..8dfce62d5a097e2f328e52a06018ab65bda7029c 100644
--- a/VectoCore/VectoCore/Configuration/Constants.cs
+++ b/VectoCore/VectoCore/Configuration/Constants.cs
@@ -36,6 +36,8 @@ namespace TUGraz.VectoCore.Configuration
{
public static class Constants
{
+ public const string NOT_AVailABLE = "N/A";
+
public static Second DefaultPowerShiftTime = 0.8.SI<Second>();
public const double RPMToRad = 2 * Math.PI / 60;
public const double Kilo = 1000;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
index 100a8513162bc3a1eb8ea16c77f7cf2d75eeb30b..3c35a8d5d0bdcf64d0cb9a9571a83acbb5895965 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
@@ -35,6 +35,7 @@ using Newtonsoft.Json.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
@@ -217,7 +218,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string Manufacturer
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public string Model
@@ -228,7 +229,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string Date
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public CertificationMethod CertificationMethod
@@ -238,7 +239,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string CertificationNumber
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public DigestData DigestValue
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
index 017b4c151e80e990b2f64aac66c0112aef079ddb..dca9784de138457ac6553ae87acc75feeb4a89f6 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
@@ -477,7 +477,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string Manufacturer
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public string Model
@@ -487,7 +487,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string Date
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public CertificationMethod CertificationMethod
@@ -497,7 +497,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string CertificationNumber
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public DigestData DigestValue
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index 522d802fc27312461cbb39a2b5c5b6b7abb8fff1..15faa04db4767a0dfc4ef4eb4b0518292715f991 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -38,6 +38,7 @@ using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.Models.Declaration;
@@ -60,7 +61,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string VIN
{
- get { return "N.A."; }
+ get { return Constants.NOT_AVailABLE; }
}
public LegislativeClass LegislativeClass
@@ -143,7 +144,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string ManufacturerAddress
{
- get { return "N.A."; }
+ get { return Constants.NOT_AVailABLE; }
}
public PerSecond EngineIdleSpeed
@@ -483,17 +484,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string Manufacturer
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public string Model
{
- get { return "N.A."; }
+ get { return Constants.NOT_AVailABLE; }
}
public string Date
{
- get { return "N/A"; }
+ get { return Constants.NOT_AVailABLE; }
}
public CertificationMethod CertificationMethod
@@ -503,7 +504,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string CertificationNumber
{
- get { return "N.A."; }
+ get { return Constants.NOT_AVailABLE; }
}
public DigestData DigestValue
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/AbstractEngineeringXMLComponentDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/AbstractEngineeringXMLComponentDataProvider.cs
index a0813e7cb2c2c573e439b611fe32996c48279098..fb26aecc77e682977228e375e067eebfce9aec08 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/AbstractEngineeringXMLComponentDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/AbstractEngineeringXMLComponentDataProvider.cs
@@ -36,6 +36,7 @@ using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration;
using TUGraz.VectoCore.Utils;
@@ -66,7 +67,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
SourceType = DataSourceType.Embedded;
}
- public new string Source { get { return FSBasePath; } }
+ public new string Source { get { return FSBasePath; } }
public override bool SavedInDeclarationMode
{
@@ -96,7 +97,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public override string CertificationNumber
{
- get { return "N.A."; }
+ get { return Constants.NOT_AVailABLE; }
}
public override CertificationMethod CertificationMethod
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
index 769b62228da0736052834b937a5e7b9afcae52ec..afda6f12d4358c451732b95e3088fdd0f9509b6e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public string ManufacturerAddress
{
- get { return "N.A."; }
+ get { return Constants.NOT_AVailABLE; }
}
public PerSecond EngineIdleSpeed
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index f7876a52d831effb1d68371fe77d0a1db5dce044..2cd0e98b3189a3c98b4879fda4864b1b71f1e986 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -813,10 +813,11 @@ namespace TUGraz.VectoCore.OutputData
? ""
: data.CertificationNumber;
} else {
- row[ANGLEDRIVE_MANUFACTURER] = "n.a.";
- row[ANGLEDRIVE_MODEL] = "n.a.";
- row[ANGLEDRIVE_RATIO] = "n.a.";
+ row[ANGLEDRIVE_MANUFACTURER] = Constants.NOT_AVailABLE;
+ row[ANGLEDRIVE_MODEL] = Constants.NOT_AVailABLE;
+ row[ANGLEDRIVE_RATIO] = Constants.NOT_AVailABLE;
row[ANGLEDRIVE_CERTIFICATION_METHOD] = "";
+ row[ANGLEDRIVE_CERTIFICATION_NUMBER] = "";
}
}
@@ -831,8 +832,8 @@ namespace TUGraz.VectoCore.OutputData
? ""
: data.CertificationNumber;
} else {
- row[RETARDER_MANUFACTURER] = "n.a.";
- row[RETARDER_MODEL] = "n.a.";
+ row[RETARDER_MANUFACTURER] = Constants.NOT_AVailABLE;
+ row[RETARDER_MODEL] = Constants.NOT_AVailABLE;
row[RETARDER_CERTIFICATION_METHOD] = "";
row[RETARDER_CERTIFICATION_NUMBER] = "";
}
@@ -870,8 +871,8 @@ namespace TUGraz.VectoCore.OutputData
row[GEAR_RATIO_LAST_GEAR] = data.Gears.Count > 0
? (ConvertedSI)data.Gears.Last().Value.Ratio.SI<Scalar>()
: (ConvertedSI)0.SI<Scalar>();
- row[TORQUECONVERTER_MANUFACTURER] = "n.a.";
- row[TORQUECONVERTER_MODEL] = "n.a.";
+ row[TORQUECONVERTER_MANUFACTURER] = Constants.NOT_AVailABLE;
+ row[TORQUECONVERTER_MODEL] = Constants.NOT_AVailABLE;
row[TORQUE_CONVERTER_CERTIFICATION_METHOD] = "";
row[TORQUE_CONVERTER_CERTIFICATION_NUMBER] = "";
}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
index 9acbedb193ee41a0478cc73c6b774c431687c9e5..d6194189b8e7048c76cec5b075e7fdd24cd69a24 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
@@ -42,6 +42,7 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
@@ -128,7 +129,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, "N.A."),
+ 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 +300,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, "N.A."),
+ 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 +375,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, "N.A."),
+ 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))),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLEngineeringWriter.cs b/VectoCore/VectoCore/OutputData/XML/XMLEngineeringWriter.cs
index c4c18a2cd5ba5a0f4b30ca5228b973ac5f1d0b29..114590f1f1e747144c3538ec166d82cdbfc0d5d8 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLEngineeringWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLEngineeringWriter.cs
@@ -407,7 +407,7 @@ namespace TUGraz.VectoCore.OutputData.XML
var typeId = string.Format("AXLGEAR-{0:0.000}", data.Ratio);
var axl = new XElement(tns + XMLNames.Component_Axlegear,
new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, typeId),
- GetDefaultComponentElements("N.A."),
+ GetDefaultComponentElements(Constants.NOT_AVailABLE),
new XElement(tns + XMLNames.Axlegear_Ratio, data.Ratio.ToXMLFormat(3)),
data.LossMap == null
? new XElement(tns + XMLNames.Axlegear_TorqueLossMap,
@@ -540,7 +540,7 @@ namespace TUGraz.VectoCore.OutputData.XML
return new XElement(tns + XMLNames.Component_AirDrag,
new XElement(tns + XMLNames.ComponentDataWrapper,
new XAttribute(XMLNames.Component_ID_Attr, id),
- GetDefaultComponentElements("N.A."),
+ GetDefaultComponentElements(Constants.NOT_AVailABLE),
new XElement(tns + XMLNames.Vehicle_CrossWindCorrectionMode, data.CrossWindCorrectionMode.ToXMLFormat()),
new XElement(tns + XMLNames.Vehicle_AirDragArea, data.AirDragArea.Value().ToXMLFormat(2))),
GetCrossWindCorrectionData(data)
diff --git a/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs b/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
index 3c780b2bd7f258ba26265a1ff8a8af2c26d48aa8..9d5bc40ca6922429e60bc9c81c864a2d9a2fbc84 100644
--- a/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = new XMLEngineeringInputDataProvider(outFile, true);
Assert.IsNotNull(xml);
- Assert.AreEqual("VEH-N.A.", xml.JobInputData.JobName);
+ Assert.AreEqual("VEH-N/A", xml.JobInputData.JobName);
}
[Category("LongRunning")]
@@ -113,7 +113,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = new XMLEngineeringInputDataProvider(outFile, true);
Assert.IsNotNull(xml);
- Assert.AreEqual("VEH-N.A.", xml.JobInputData.JobName);
+ Assert.AreEqual("VEH-N/A", xml.JobInputData.JobName);
}
[Category("LongRunning")]
@@ -132,7 +132,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = new XMLEngineeringInputDataProvider(Path.Combine(outDir, outFile), true);
Assert.IsNotNull(xml);
- Assert.AreEqual("VEH-N.A.", xml.JobInputData.JobName);
+ Assert.AreEqual("VEH-N/A", xml.JobInputData.JobName);
}
[Category("LongRunning")]
@@ -171,7 +171,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = new XMLDeclarationInputDataProvider(reader, true);
Assert.IsNotNull(xml);
- Assert.AreEqual("VEH-N.A.", xml.JobInputData.JobName);
+ Assert.AreEqual("VEH-NA", xml.JobInputData.JobName);
}
[TestCase]
@@ -193,7 +193,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = new XMLDeclarationInputDataProvider(reader, true);
Assert.IsNotNull(xml);
- Assert.AreEqual("VEH-N.A.", xml.JobInputData.JobName);
+ Assert.AreEqual("VEH-NA", xml.JobInputData.JobName);
}
}
}