Code development platform for open source projects from the European Union institutions

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

added additional test for xEV components

parent a9106aaf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 196 additions and 27 deletions
VectoCommon/VectoHashing/Resources/XSLT/SortInputData.xslt
+ 3
− 3
View file @ d730c870
......@@ -24,7 +24,7 @@
- sort dragcurve entries
- sort conditioning entries
- sort powermaps by gear attribute
- sort voltage entries by voltage element value
- sort voltagelevel entries by voltage element value
- sort ovc entries
- sort internalresistance entries
- sort currentlimits entries
......@@ -116,7 +116,7 @@
</xsl:element>
</xsl:template>
<xsl:template match="*[local-name()='MaxTorqueCurve']">
<xsl:element name="{local-name()}">
<xsl:apply-templates select="@*"/>
......@@ -224,6 +224,6 @@
<xsl:apply-templates select="."/>
</xsl:for-each>
</xsl:element>
</xsl:template>
</xsl:template>
</xsl:transform>
VectoCommon/VectoHashingTest/Testdata/XML/Sort/ElectricMachineSystem-IHPC_1_unsorted.xml
+ 22
− 20
View file @ d730c870
......@@ -13,32 +13,32 @@
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>IHPC Type 1</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<MaxTorqueCurve>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
</MaxTorqueCurve>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
</PowerMap>
<PowerMap gear="1">
<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"/>
</PowerMap>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
</PowerMap>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
......@@ -49,25 +49,27 @@
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
</MaxTorqueCurve>
<PowerMap gear="2">
<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"/>
<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"/>
</PowerMap>
<PowerMap gear="1">
<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"/>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="4000.00" dragTorque="30.00" />
<Entry outShaftSpeed="0.00" dragTorque="10.00" />
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000" />
</Conditioning>
<Entry coolantTempInlet="50" coolingPower="5000" />
<Entry coolantTempInlet="30" coolingPower="5000" />
</Conditioning>
</Data>
<v2.10.1:Signature>
<di:Reference URI="#EM-asdf">
......@@ -76,7 +78,7 @@
<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>vvxJmw6PIWC5lHtnDAYVoxy6sF97g24Ti/QDlUq09tc=</di:DigestValue>
<di:DigestValue>X5dgavua/V/jzBQeJ6SxZXsXm3i1jruL48LedzZ5IxU=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ElectricMachineSystem>
......
VectoCommon/VectoHashingTest/Testdata/XML/Sort/ElectricMachineSystem_1_unsorted.xml
+ 2
− 1
View file @ d730c870
......@@ -54,6 +54,7 @@
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="60" coolingPower="6000"/>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</Data>
......@@ -64,7 +65,7 @@
<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>TilK8FUXim9VK3Jy2qTIdogjpWvSF0cj/Ny1fyuoajk=</di:DigestValue>
<di:DigestValue>wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ElectricMachineSystem>
......
VectoCommon/VectoHashingTest/Testdata/XML/Sort/Gearbox_FWD.xml 0 → 100644
+ 79
− 0
View file @ d730c870
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
<Date>2021-11-18T14:23:31.4958567Z</Date>
<AppVersion>VectoCore</AppVersion>
<TransmissionType>APT-P</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<DifferentialIncluded>true</DifferentialIncluded>
<AxlegearRatio>1.000</AxlegearRatio>
<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1000</MaxTorque>
<MaxSpeed>100</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
<Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
<Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
<Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
<Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
<Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1200</MaxTorque>
<MaxSpeed>110</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
<Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
<Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
<Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />
<Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
<Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
<Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
<Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
<Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
<Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
</TorqueLossMap>
</Gear>
<Gear number="3">
<Ratio>9.020</Ratio>
<MaxTorque>1300</MaxTorque>
<MaxSpeed>112</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
<Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
<Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
<Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
<Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
<Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
<Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />
<Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
<Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
<Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
</TorqueLossMap>
</Gear>
</v2.10.1:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
<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>LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
</tns:VectoInputDeclaration>
\ No newline at end of file
VectoCommon/VectoHashingTest/Testdata/XML/Sort/Gearbox_FWD_unsorted.xml 0 → 100644
+ 79
− 0
View file @ d730c870
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
<Date>2021-11-18T14:23:31.4958567Z</Date>
<AppVersion>VectoCore</AppVersion>
<TransmissionType>APT-P</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<DifferentialIncluded>true</DifferentialIncluded>
<AxlegearRatio>1.000</AxlegearRatio>
<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1200</MaxTorque>
<MaxSpeed>110</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
<Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
<Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
<Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
<Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
<Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />
<Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
<Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
<Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
<Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
</TorqueLossMap>
</Gear>
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1000</MaxTorque>
<MaxSpeed>100</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
<Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
<Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
<Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
<Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
</TorqueLossMap>
</Gear>
<Gear number="3">
<Ratio>9.020</Ratio>
<MaxTorque>1300</MaxTorque>
<MaxSpeed>112</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
<Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
<Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
<Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
<Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
<Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
<Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
<Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />
<Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
<Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
</TorqueLossMap>
</Gear>
</v2.10.1:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
<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>LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
</tns:VectoInputDeclaration>
\ No newline at end of file
VectoCommon/VectoHashingTest/VectoHashSortTest.cs
+ 5
− 3
View file @ d730c870
......@@ -44,8 +44,8 @@ namespace VectoHashingTest
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.CapacitorSystem));
}
[TestCase("vvxJmw6PIWC5lHtnDAYVoxy6sF97g24Ti/QDlUq09tc=", @"Testdata\XML\Sort\ElectricMachineSystem-IHPC_1_unsorted.xml"),
TestCase("TilK8FUXim9VK3Jy2qTIdogjpWvSF0cj/Ny1fyuoajk=", @"Testdata\XML\Sort\ElectricMachineSystem_1_unsorted.xml"),
[TestCase("X5dgavua/V/jzBQeJ6SxZXsXm3i1jruL48LedzZ5IxU=", @"Testdata\XML\Sort\ElectricMachineSystem-IHPC_1_unsorted.xml"),
TestCase("wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=", @"Testdata\XML\Sort\ElectricMachineSystem_1_unsorted.xml"),
TestCase("CunnDxsiE9kciX+v9oeEGADZpEc88NtfMtmrHyJkCQ0=", @"Testdata\XML\Sort\ElectricMachineSystem_StdValues_unsorted.xml")]
public void TestElectricMachineHashSort(string expectedHash, string filePath)
{
......@@ -55,7 +55,9 @@ namespace VectoHashingTest
[TestCase("hRzWfx3/El/LwEtP86Utm3dgBAF6CagrpEREsca7+/0=", @"Testdata\XML\Sort\Gearbox_APT-N_unsorted.xml"),
TestCase("XZCluPiG05mOAj5rTjTllCWbhCTEYVxCbE940ck3XsA=", @"Testdata\XML\Sort\Gearbox_IHPC_unsorted.xml")]
TestCase("XZCluPiG05mOAj5rTjTllCWbhCTEYVxCbE940ck3XsA=", @"Testdata\XML\Sort\Gearbox_IHPC_unsorted.xml"),
TestCase("LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=", @"Testdata\XML\Sort\Gearbox_FWD.xml"),
TestCase("LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=", @"Testdata\XML\Sort\Gearbox_FWD_unsorted.xml")]
public void TestGearboxComponentHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
......
VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+ 6
− 0
View file @ d730c870
......@@ -108,6 +108,12 @@
<Content Include="Testdata\XML\Sort\Gearbox_APT-N_unsorted.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Testdata\XML\Sort\Gearbox_FWD.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Testdata\XML\Sort\Gearbox_FWD_unsorted.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Testdata\XML\Sort\Gearbox_IHPC_unsorted.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

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