From 46bc6172f49650a64befa688a86a66bcc70fdaf9 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Wed, 15 Sep 2021 11:59:54 +0200
Subject: [PATCH] fixed airdrag reading behaviour for PEV primary bus E2, E3
and E4
---
.../XML/Declaration/Reader/Impl/XMLComponentReader.cs | 6 +++++-
VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs | 9 +++------
2 files changed, 8 insertions(+), 7 deletions(-)
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 37165096ab..afb0359a0b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
@@ -920,6 +920,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
{
return Factory.CreateBusAuxiliaires(version, Vehicle, componentNode, sourceFile);
}
+
+ public override IAirdragDeclarationInputData AirdragInputData => null;
+
#endregion
}
@@ -939,7 +942,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public override IGearboxDeclarationInputData GearboxInputData => null;
public override ITorqueConverterDeclarationInputData TorqueConverterInputData => null;
public override IAngledriveInputData AngledriveInputData => null;
-
+ public override IAirdragDeclarationInputData AirdragInputData => null;
+
#endregion
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index 45753222fb..b3fab82f07 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -1699,8 +1699,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.AxleWheels);
Assert.IsNull(vehicle.Components.AuxiliaryInputData);
Assert.IsNotNull(vehicle.Components.BusAuxiliaries);
- // ToDo Airdrag not allowed at PEV primary bus as defined within the related xsd
- // Assert.IsNotNull(vehicle.Components.AirdragInputData);
+ Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.Components.ElectricStorage);
Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
Assert.IsNull(vehicle.CargoVolume);
@@ -1741,8 +1740,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.AxleWheels);
Assert.IsNull(vehicle.Components.AuxiliaryInputData);
Assert.IsNotNull(vehicle.Components.BusAuxiliaries);
- // ToDo Airdrag not allowed at PEV primary bus as defined within the related xsd
- //Assert.IsNotNull(vehicle.Components.AirdragInputData);
+ Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.Components.ElectricStorage);
Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
Assert.IsNull(vehicle.CargoVolume);
@@ -1785,8 +1783,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.AxleWheels);
Assert.IsNull(vehicle.Components.AuxiliaryInputData);
Assert.IsNotNull(vehicle.Components.BusAuxiliaries);
- // ToDo Airdrag not allowed at PEV primary bus as defined within the related xsd
- // Assert.IsNotNull(vehicle.Components.AirdragInputData);
+ Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.Components.ElectricStorage);
Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
Assert.IsNull(vehicle.CargoVolume);
--
GitLab