diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
index a2d1c3f6277aef830048a2c0f5b8fd90d8baa0c4..da193b47afd0a0f86998114d16ef4fb4a4fb4e76 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
@@ -22,8 +22,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
public const string XSD_TYPE = "AUX_Conventional_PrimaryBusType";
-
+ public const string XSD_HEV_P_TYPE = "AUX_HEV-P_PrimaryBusType";
+
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public static readonly string QUALIFIED_XSD_HEV_P_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_HEV_P_TYPE);
public XMLDeclarationPrimaryBusAuxiliariesDataProviderV210(
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index 13070dc55b22f8c83dfd14172a031e86e4630556..3481c4edcc488616c1e8e86944efa33a02f1c255 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -61,6 +61,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
protected ITorqueConverterDeclarationInputData _torqueconverterInputData;
protected IElectricMachinesDeclarationInputData _electricMachinesInputData;
protected IElectricStorageSystemDeclarationInputData _electricStorageSystemInputData;
+
public XMLDeclarationComponentsDataProviderV10(
@@ -292,7 +293,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
-
+ // ---------------------------------------------------------------------------------------
public class XMLDeclarationHEVPxLorryComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10
{
@@ -306,4 +307,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationHEVPxPrimaryBusComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new const string XSD_TYPE = "Components_HEV-Px_PrimaryBusType";
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ protected IBusAuxiliariesDeclarationData _busAuxiliariesDeclarationInputData;
+
+ public XMLDeclarationHEVPxPrimaryBusComponentsDataProviderV210(IXMLDeclarationVehicleData vehicle,
+ XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliariesDeclarationInputData ??
+ (_busAuxiliariesDeclarationInputData = ComponentReader.BusAuxiliariesInputData);
+
+ #region Overrides of XMLDeclarationComponentsDataProviderV10
+
+ public override IPTOTransmissionInputData PTOTransmissionInputData => null;
+ public override IAirdragDeclarationInputData AirdragInputData => null;
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index cd7af8cb81a9299fe852b0dd4e00df3ba3e2d2ef..f0fab34b60f3228485825db304e543552da83c44 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -1223,4 +1223,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
}
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationHEVPrimaryBusAMTPxDataProviderV210 : XMLDeclarationHEVPxHeavyLorryDataProviderV210
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new const string XSD_TYPE = "Vehicle_HEV-Px_PrimaryBusDeclarationType";
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+
+ 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
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+
}
\ 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 936290bbbd9354d6d8e2a7c6483b76995a0ac943..3b5bfc0ef8d5eda484fcda779b2adbdf83e14044 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
@@ -31,16 +31,26 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationHEVPxMediumLorryDataProviderV210>()
.Named(XMLDeclarationHEVPxMediumLorryDataProviderV210.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationHEVPrimaryBusAMTPxDataProviderV210>()
+ .Named(XMLDeclarationHEVPrimaryBusAMTPxDataProviderV210.QUALIFIED_XSD_TYPE);
+
+
Bind<IXMLVehicleComponentsDeclaration>().To<XMLDeclarationCompletedBusComponentsDataProviderV210>()
.Named(XMLDeclarationCompletedBusComponentsDataProviderV210.QUALIFIED_XSD_TYPE);
Bind<IXMLVehicleComponentsDeclaration>().To<XMLDeclarationHEVPxLorryComponentsDataProviderV210>()
.Named(XMLDeclarationHEVPxLorryComponentsDataProviderV210.QUALIFIED_XSD_TYPE);
-
+ Bind<IXMLVehicleComponentsDeclaration>().To<XMLDeclarationHEVPxPrimaryBusComponentsDataProviderV210>()
+ .Named(XMLDeclarationHEVPxPrimaryBusComponentsDataProviderV210.QUALIFIED_XSD_TYPE);
+
Bind<IXMLComponentReader>().To<XMLComponentReaderV210_CompletedBus>().Named(XMLComponentReaderV210_CompletedBus.QUALIFIED_XSD_TYPE);
Bind<IXMLComponentReader>().To<XMLComponentReaderV210_HEV_PxHeavyLorry>().Named(XMLComponentReaderV210_HEV_PxHeavyLorry.QUALIFIED_XSD_TYPE);
+
+
+ Bind<IXMLComponentReader>().To<XMLPrimaryBusDeclarationComponentReaderV201>().Named(XMLPrimaryBusDeclarationComponentReaderV201.QUALIFIED_XSD_TYPE);
Bind<IXMLElectricMachineSystemReader>().To<XMLElectricMachineSystemReaderV210>().Named(XMLElectricMachineSystemReaderV210.QUALIFIED_XSD_TYPE);
@@ -77,6 +87,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLDeclarationPrimaryBusAuxiliariesDataProviderV210>()
.Named(XMLDeclarationPrimaryBusAuxiliariesDataProviderV210.QUALIFIED_XSD_TYPE);
+ Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLDeclarationPrimaryBusAuxiliariesDataProviderV210>()
+ .Named(XMLDeclarationPrimaryBusAuxiliariesDataProviderV210.QUALIFIED_XSD_HEV_P_TYPE);
+
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMediumLorryVehicleDataProviderV210>()
.Named(XMLDeclarationMediumLorryVehicleDataProviderV210.QUALIFIED_XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
index 814c0e9a27c4c4ac7cf0dfe82c788cc4767d622f..bfabe682e33df651e1f07cc955eb527f1e03841b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
@@ -628,6 +628,30 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
}
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLPrimaryBusDeclarationComponentReaderV201 : XMLComponentReaderV10
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new const string XSD_TYPE = "Components_HEV-Px_PrimaryBusType";
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ protected IBusAuxiliariesDeclarationData _busAuxInputData;
+
+ public XMLPrimaryBusDeclarationComponentReaderV201(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode)
+ : base(vehicle, componentsNode)
+ {
+ }
+
+ public override IAuxiliariesDeclarationInputData AuxiliaryData => null;
+
+
+ public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData => _busAuxInputData ??
+ (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator));
-
+ protected virtual IBusAuxiliariesDeclarationData BusAuxCreator(string version, XmlNode componentNode, string sourceFile)
+ {
+ return Factory.CreateBusAuxiliaires(version, Vehicle, componentNode, sourceFile);
+ }
+ }
}
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_Capacitor.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_heavyLorry_AMT_Px_Capacitor.xml
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_Capacitor.xml
rename to VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_heavyLorry_AMT_Px_Capacitor.xml
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index 2cecac000c8368414d4c5a548810ba9f1032942a..017b5181b870a099340cdbfaa7f9268f42cd1662 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -34,6 +34,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
private const string BASE_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\";
+ private const string SCHEMA_FOLDER_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\";
[TestCase(@"HeavyLorry\Conventional_heavyLorry_AMT.xml"),
@@ -227,11 +228,11 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.MaxPropulsionTorque);//Vehicle Max Prop. Limit
}
- [TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px.xml")]
- [TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px_Capacitor.xml")]
- public void TestHEVHeaveyLorry(string jobfile)
+ [TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px.xml", BASE_DIR)]
+ [TestCase(@"HEV_heavyLorry_AMT_Px_Capacitor.xml", SCHEMA_FOLDER_DIR)]
+ public void TestHEVHeaveyLorry(string jobfile, string dir)
{
- var filename = Path.Combine(BASE_DIR, jobfile);
+ var filename = Path.Combine(dir, jobfile);
var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
Assert.NotNull(dataProvider);
@@ -545,11 +546,43 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
Assert.IsNotNull(vehicle.MaxPropulsionTorque);//Vehicle Max Prop. Limit
}
+
+
+ [TestCase(@"PrimaryBus\HEV_primaryBus_AMT_Px.xml")]
+ public void TestHEVPrimaryBusAMTPx(string jobfile)
+ {
+ var filename = Path.Combine(BASE_DIR, jobfile);
+ var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
+ Assert.NotNull(dataProvider);
+ 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.IsNotNull(vehicle.Components.GearboxInputData);
+ TestTorqueConverter(vehicle);
+ Assert.IsNotNull(vehicle.Components.AngledriveInputData);//optional
+ Assert.IsNotNull(vehicle.Components.RetarderInputData);//optional
+ Assert.IsNotNull(vehicle.Components.AxleGearInputData);
+ Assert.IsNotNull(vehicle.Components.AxleWheels);
+ Assert.IsNull(vehicle.Components.AuxiliaryInputData);
+ Assert.IsNotNull(vehicle.Components.BusAuxiliaries);
+ Assert.IsNull(vehicle.Components.AirdragInputData);
+ Assert.IsNotNull(vehicle.Components.ElectricStorage);
+ Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
+ Assert.IsNull(vehicle.CargoVolume);
+ Assert.IsNotNull(vehicle.TorqueLimits);
+ Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
+ Assert.IsNotNull(vehicle.MaxPropulsionTorque);//Vehicle Max Prop. Limit
+ }
+
+
#region Test existence of torque converter
- private void TestTorqueConverter(IVehicleDeclarationInputData vehicle)
+ private void TestTorqueConverter(IVehicleDeclarationInputData vehicle)
{
var torqueConverter = vehicle.Components.TorqueConverterInputData;
switch (vehicle.Components?.GearboxInputData?.Type)