This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit fc3bbf23 authored by Franz KOBER josef's avatar Franz KOBER josef
Browse files

added for HEV-S heavy lorry S3 optional tests

parent f3d769da
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+ 12
− 0
View file @ fc3bbf23
...@@ -373,6 +373,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -373,6 +373,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationHEVSXLorryComponentsDataProviderV210(IXMLDeclarationVehicleData vehicle, public XMLDeclarationHEVSXLorryComponentsDataProviderV210(IXMLDeclarationVehicleData vehicle,
XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { } XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
#region Overrides of XMLDeclarationComponentsDataProviderV10
public override IIEPCDeclarationInputData IEPC => null;
public override IRetarderInputData RetarderInputData =>
ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
public override IAirdragDeclarationInputData AirdragInputData =>
ElementExists(XMLNames.Component_AirDrag) ? base.AirdragInputData : null;
#endregion
} }
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml 0 → 100644
+ 393
− 0
View file @ fc3bbf23
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChasisConfiguration>Rigid Lorry</ChasisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:PTOType">
<v2.0:PTOShaftsGearWheels>none</v2.0:PTOShaftsGearWheels>
<v2.0:PTOOtherElements>none</v2.0:PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem><!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>S3</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<Components xsi:type="Components_HEV-S3_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachineGEN>
<PowertrainPosition>GEN</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<TestVoltageOverload>483</TestVoltageOverload>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning circuitId="0">
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.10.1:Data>
<v2.10.1:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.10.1:Signature>
</ElectricMachineSystem>
</ElectricMachineGEN>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.10.2:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.10.2:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<TestVoltageOverload>483</TestVoltageOverload>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning circuitId="0">
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.10.1:Data>
<v2.10.1:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.10.1:Signature>
</ElectricMachineSystem>
<P2.5GearRatios><!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-S_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Full electric steering gear</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
VectoCore/VectoCoreTest/VectoCoreTest.csproj
+ 3
− 0
View file @ fc3bbf23
...@@ -6034,6 +6034,9 @@ ...@@ -6034,6 +6034,9 @@
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\HEV-S_heavyLorry_AMT_S2_n_opt.xml"> <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\HEV-S_heavyLorry_AMT_S2_n_opt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\HEV-S_heavyLorry_S3_n_opt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\HEV_heavyLorry_AMT_Px_n_opt.xml"> <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\HEV_heavyLorry_AMT_Px_n_opt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+ 21
− 6
View file @ fc3bbf23
...@@ -794,35 +794,50 @@ namespace TUGraz.VectoCore.Tests.XML ...@@ -794,35 +794,50 @@ namespace TUGraz.VectoCore.Tests.XML
} }
[TestCase(@"HeavyLorry\HEV-S_heavyLorry_S3.xml")] [TestCase(@"HeavyLorry\HEV-S_heavyLorry_S3.xml", BASE_DIR)]
public void TestHEVHeavyLorryS3(string jobfile) [TestCase(@"HEV-S_heavyLorry_S3_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVHeavyLorryS3(string jobfile, string testDir)
{ {
var filename = Path.Combine(BASE_DIR, jobfile); var filename = Path.Combine(testDir, jobfile);
var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename)); var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
Assert.NotNull(dataProvider.JobInputData); Assert.NotNull(dataProvider.JobInputData);
var vehicle = dataProvider.JobInputData.Vehicle; var vehicle = dataProvider.JobInputData.Vehicle;
Assert.NotNull(vehicle); Assert.NotNull(vehicle);
Assert.IsNotNull(vehicle.Components); Assert.IsNotNull(vehicle.Components);
Assert.IsNotNull(vehicle.ADAS);
Assert.IsNotNull(vehicle.Components.EngineInputData); Assert.IsNotNull(vehicle.Components.EngineInputData);
Assert.IsNotNull(vehicle.Components.ElectricMachines); Assert.IsNotNull(vehicle.Components.ElectricMachines);
Assert.AreEqual(2 ,vehicle.Components.ElectricMachines.Entries.Count); Assert.AreEqual(2 ,vehicle.Components.ElectricMachines.Entries.Count);
Assert.AreEqual(PowertrainPosition.BatteryElectricE2, vehicle.Components.ElectricMachines.Entries[0].Position); Assert.AreEqual(PowertrainPosition.BatteryElectricE2, vehicle.Components.ElectricMachines.Entries[0].Position);
Assert.AreEqual(PowertrainPosition.GEN,vehicle.Components.ElectricMachines.Entries[1].Position); Assert.AreEqual(PowertrainPosition.GEN,vehicle.Components.ElectricMachines.Entries[1].Position);
Assert.IsNull(vehicle.Components.IEPC);
Assert.IsNull(vehicle.Components.GearboxInputData); Assert.IsNull(vehicle.Components.GearboxInputData);
Assert.IsNull(vehicle.Components.TorqueConverterInputData); Assert.IsNull(vehicle.Components.TorqueConverterInputData);
Assert.IsNull(vehicle.Components.AngledriveInputData);
if (testDir == Optional_TESTS_DIR)
{
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
}
else
{
Assert.IsNotNull(vehicle.Components.RetarderInputData); Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
}
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNotNull(vehicle.Components.AxleGearInputData); Assert.IsNotNull(vehicle.Components.AxleGearInputData);
Assert.IsNotNull(vehicle.Components.AxleWheels); Assert.IsNotNull(vehicle.Components.AxleWheels);
Assert.IsNotNull(vehicle.Components.AuxiliaryInputData); Assert.IsNotNull(vehicle.Components.AuxiliaryInputData);
Assert.IsNotNull(vehicle.Components.AuxiliaryInputData.Auxiliaries);
Assert.IsNull(vehicle.Components.BusAuxiliaries); Assert.IsNull(vehicle.Components.BusAuxiliaries);
Assert.IsNotNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.Components.ElectricStorage); Assert.IsNotNull(vehicle.Components.ElectricStorage);
Assert.IsNotNull(vehicle.Components.PTOTransmissionInputData); Assert.IsNotNull(vehicle.Components.PTOTransmissionInputData);
Assert.IsNull(vehicle.CargoVolume); Assert.IsNull(vehicle.CargoVolume);
Assert.IsNull(vehicle.TorqueLimits); Assert.IsNull(vehicle.TorqueLimits);
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
Assert.IsNull(vehicle.MaxPropulsionTorque); Assert.IsNull(vehicle.MaxPropulsionTorque);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about