From 806c95fe388550200779e15da26c927fdf6a034e Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Mon, 6 Sep 2021 14:57:48 +0200
Subject: [PATCH] added HEV-S medium lorry s2 to reader
---
.../XMLDeclarationVehicleDataProvider.cs | 25 +++++++++------
...XMLDeclarationInputDataV210InjectModule.cs | 2 ++
.../XML/XMLDeclarationInputv210.cs | 31 +++++++++++++++++++
3 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 9a3f1d5adf..4146356a6b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -1228,7 +1228,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationHEVPrimaryBusAMTPxDataProviderV210 : XMLDeclarationHEVPxHeavyLorryDataProviderV210
+ public class XMLDeclarationHEVPrimaryBusAMTPxDataProviderV210 : XMLDeclarationHEVPxMediumLorryDataProviderV210
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
public new const string XSD_TYPE = "Vehicle_HEV-Px_PrimaryBusDeclarationType";
@@ -1237,14 +1237,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationHEVPrimaryBusAMTPxDataProviderV210(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile)
: base(jobData, xmlNode, sourceFile) { }
-
-
- #region Overrides of XMLDeclarationVehicleDataProviderV10
-
- public override IPTOTransmissionInputData PTOTransmissionInputData => null;
- public override XmlElement PTONode => null;
-
- #endregion
}
// ---------------------------------------------------------------------------------------
@@ -1272,4 +1264,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
}
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationHEVSxMediumLorryDataProviderV210 : XMLDeclarationHEVPxMediumLorryDataProviderV210
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new const string XSD_TYPE = "Vehicle_HEV-Sx_MediumLorryDeclarationType";
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationHEVSxMediumLorryDataProviderV210(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile)
+ : base(jobData, xmlNode, sourceFile) { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
index d427f91082..7f632cf271 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
@@ -31,6 +31,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationHEVSxHeavyLorryDataProviderV210>()
.Named(XMLDeclarationHEVSxHeavyLorryDataProviderV210.QUALIFIED_XSD_TYPE);
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationHEVSxMediumLorryDataProviderV210>()
+ .Named(XMLDeclarationHEVSxMediumLorryDataProviderV210.QUALIFIED_XSD_TYPE);
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationHEVPxMediumLorryDataProviderV210>()
.Named(XMLDeclarationHEVPxMediumLorryDataProviderV210.QUALIFIED_XSD_TYPE);
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index bc38bad6ac..468a02318e 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -731,7 +731,38 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.MaxPropulsionTorque);
}
+ [TestCase(@"MediumLorry\HEV-S_mediumLorry_AMT_S2.xml")]
+ public void TestMediumLorryS3(string jobfile)
+ {
+ var filename = Path.Combine(BASE_DIR, jobfile);
+ var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
+ Assert.NotNull(dataProvider.JobInputData);
+ var vehicle = dataProvider.JobInputData.Vehicle;
+ Assert.NotNull(vehicle);
+ Assert.IsNotNull(vehicle.Components);
+ Assert.IsNotNull(vehicle.Components.EngineInputData);
+ Assert.IsNotNull(vehicle.Components.ElectricMachines);
+ Assert.AreEqual(2, vehicle.Components.ElectricMachines.Entries.Count);
+ Assert.AreEqual(PowertrainPosition.BatteryElectricE2, vehicle.Components.ElectricMachines.Entries[0].Position);
+ Assert.AreEqual(PowertrainPosition.GEN, vehicle.Components.ElectricMachines.Entries[1].Position);
+ Assert.IsNotNull(vehicle.Components.GearboxInputData);
+ TestTorqueConverter(vehicle);
+ Assert.IsNotNull(vehicle.Components.AngledriveInputData);
+ Assert.IsNotNull(vehicle.Components.RetarderInputData);
+ Assert.IsNotNull(vehicle.Components.AxleGearInputData);
+ Assert.IsNotNull(vehicle.Components.AxleWheels);
+ Assert.IsNotNull(vehicle.Components.AuxiliaryInputData);
+ Assert.IsNull(vehicle.Components.BusAuxiliaries);
+ Assert.IsNotNull(vehicle.Components.AirdragInputData);
+ Assert.IsNotNull(vehicle.Components.ElectricStorage);
+ Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
+ Assert.IsNotNull(vehicle.CargoVolume);
+ Assert.IsNotNull(vehicle.TorqueLimits);
+ Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
+ Assert.IsNull(vehicle.MaxPropulsionTorque);
+ }
+
#region Test existence of torque converter
private void TestTorqueConverter(IVehicleDeclarationInputData vehicle)
--
GitLab