diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml index f077353554565f54c7656051d74e6e2466ad98ea..3c74a0f74e59e34a68aba279f2b5532cad63ccb4 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml @@ -30,11 +30,7 @@ <EngineStopStart>true</EngineStopStart> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> </ADAS> - <TorqueLimits xsi:type="v2.0:TorqueLimitsType"> - <!-- optional --> - <v2.0:Entry gear="9" maxTorque="2000"/> - </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>2</Position> @@ -53,9 +49,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> - <!-- optional --> <ElectricMachine> <Position>GEN</Position> <VoltageLevel> diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs index c60501883abea18c4b376bb9aa5a4dcd24988067..64ecf91f45da8df09019ae117714957b8225533a 100644 --- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs +++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs @@ -811,7 +811,7 @@ namespace TUGraz.VectoCore.Tests.XML Assert.IsNotNull(vehicle.Components.AngledriveInputData); Assert.IsNotNull(vehicle.Components.RetarderInputData); Assert.IsNotNull(vehicle.Components.AirdragInputData); - Assert.IsNotNull(vehicle.TorqueLimits); + Assert.IsNull(vehicle.TorqueLimits); Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits } diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp index de9c77311f2e6bfa08645d9eb6f9498311712e70..63654d13bd1e2f71b696b97a0a58ce762b4635dc 100644 --- a/VectoCore/VectoXML.spp +++ b/VectoCore/VectoXML.spp @@ -257,6 +257,7 @@ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\WithoutOptionalEntries\PEV_primaryBus_E4_n_opt.xml" HomeFolder="Yes"/> </Folder> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\exempted_primary_heavyBus.xml" HomeFolder="Yes"/> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\HEV-S_heavyLorry_AMT_S2_ADC.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-completed_heavyBus-sample.xml"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-exempted_input_completewithoutTMPLM.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-exempted_input_full-sample.xml"/>