diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
index 93c56ca53171dc9d231feb55d80ad716d1c4f447..ee84f947479af7eb7fea34b342feffba1d1a8b2d 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
@@ -15,6 +15,11 @@
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00" />
+ <Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00" />
+ <Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
@@ -29,7 +34,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>NiyH2Xp0rQswwXIOf52Jm0wvK4Yc2/PL/T+zQCWQGFo=</di:DigestValue>
+ <di:DigestValue>HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ADC>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
index f9c91c4285a019e147bb4d17f17dbc26381c25e3..39e854c73a4f805265452c6eaf14a11773fccc4a 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
@@ -13,6 +13,9 @@
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
+ <Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />
+ <Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
+ <Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
@@ -25,7 +28,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>FGaItzPcx1qGytVlroFp+PU9rzsaQWRWnxmIspkqCRM=</di:DigestValue>
+ <di:DigestValue>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Angledrive>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
index 0e1d5a8c4d921cdf12225012334e79ca66364bf1..da6c0722817013f93a94fb13a8a5a9aef403edb5 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
@@ -16,6 +16,11 @@
<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="4000.00" inputTorque="-60000.10" torqueLoss="2000.10" />
+ <Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10" />
+ <Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10" />
+ <Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10" />
+ <Entry inputSpeed="4000.00" inputTorque="60000.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" />
@@ -30,7 +35,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>og41nROicUT1OoesUTZ9/uoroCUbqlTo7nKmCRYQap4=</di:DigestValue>
+ <di:DigestValue>MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Axlegear>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
index 97211aa82824477550f5fe7227216c2c94b7c6ff..3fd85377df73ddd37d788c1d608fa5c3bf7d1483 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
@@ -15,14 +15,20 @@
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00" />
+ <Entry SoC="88" OCV="640.00" />
+ <Entry SoC="89" OCV="641.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="88" R_2="13.00" R_10="14.00" R_20="16.00" />
+ <Entry SoC="88" R_2="14.00" R_10="14.00" R_20="16.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="88" maxChargingCurrent="20.00" maxDischargingCurrent="50.00" />
+ <Entry SoC="88" maxChargingCurrent="21.00" maxDischargingCurrent="50.00" />
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
</CurrentLimits>
</Data>
@@ -33,7 +39,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>tam1LGpdznHGFGo+rp0WVr0/6+F2yU2Kv4G4tYvAe+Y=</di:DigestValue>
+ <di:DigestValue>MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:BatterySystem>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
index 699aa9d06faedf6d84fb2d788c03592b37fdd78f..104df07c85e55e4d5fd0bf40b7fa78dc7ac1cc93 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
@@ -23,21 +23,71 @@
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<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"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
</PowerMap>
<PowerMap gear="2">
<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"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
</PowerMap>
+ <PowerMap gear="3">
+ <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"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
</VoltageLevel>
- <VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="5000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <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"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <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"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+ <PowerMap gear="3">
+ <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"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
@@ -47,27 +97,42 @@
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<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"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
</PowerMap>
<PowerMap gear="2">
<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"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
</PowerMap>
+ <PowerMap gear="3">
+ <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"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00" />
<Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+ <Entry outShaftSpeed="5000.00" dragTorque="30.00" />
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000" />
<Entry coolantTempInlet="50" coolingPower="5000" />
+ <Entry coolantTempInlet="60" coolingPower="5000" />
</Conditioning>
</Data>
<v2.10.1:Signature>
@@ -77,7 +142,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>6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ElectricMachineSystem>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
index 436db23720b845b5b061908bccfa9c5e14b143ae..f6bcf41ea7a785c369f4d58ef9034128fc0d9e89 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
@@ -22,6 +22,7 @@
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="101.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
@@ -42,7 +43,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>CunnDxsiE9kciX+v9oeEGADZpEc88NtfMtmrHyJkCQ0=</di:DigestValue>
+ <di:DigestValue>qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ElectricMachineSystem>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml
index e119418c20bfc96933fefb603840e552d35a2d1a..ee055d98ca83acb122acceb45b09cc2123ccd9cf 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml
@@ -158,128 +158,6 @@
<Entry engineSpeed="2100.10" torque="1100.00" fuelConsumption="50653.00" />
</FuelConsumptionMap>
</Fuel>
- <Fuel type="Ethanol CI">
- <WHTCUrban>2.0097</WHTCUrban>
- <WHTCRural>2.0035</WHTCRural>
- <WHTCMotorway>2.0200</WHTCMotorway>
- <BFColdHot>2.0000</BFColdHot>
- <CFRegPer>2.0000</CFRegPer>
- <CFNCV>2.0000</CFNCV>
- <FuelConsumptionMap>
- <Entry engineSpeed="560.20" torque="-149.00" fuelConsumption="0.00" />
- <Entry engineSpeed="560.20" torque="0.00" fuelConsumption="1256.00" />
- <Entry engineSpeed="560.20" torque="200.00" fuelConsumption="3197.00" />
- <Entry engineSpeed="560.20" torque="400.00" fuelConsumption="5295.00" />
- <Entry engineSpeed="560.20" torque="600.00" fuelConsumption="7615.00" />
- <Entry engineSpeed="560.20" torque="800.00" fuelConsumption="9375.00" />
- <Entry engineSpeed="560.20" torque="1000.00" fuelConsumption="11239.00" />
- <Entry engineSpeed="560.20" torque="1180.00" fuelConsumption="12869.00" />
- <Entry engineSpeed="600.20" torque="-148.00" fuelConsumption="0.00" />
- <Entry engineSpeed="600.20" torque="0.00" fuelConsumption="1459.00" />
- <Entry engineSpeed="600.20" torque="200.00" fuelConsumption="3358.00" />
- <Entry engineSpeed="600.20" torque="400.00" fuelConsumption="5498.00" />
- <Entry engineSpeed="600.20" torque="600.00" fuelConsumption="8101.00" />
- <Entry engineSpeed="600.20" torque="800.00" fuelConsumption="10014.00" />
- <Entry engineSpeed="600.20" torque="1000.00" fuelConsumption="12071.00" />
- <Entry engineSpeed="600.20" torque="1200.00" fuelConsumption="14201.00" />
- <Entry engineSpeed="600.20" torque="1282.00" fuelConsumption="15304.00" />
- <Entry engineSpeed="800.20" torque="-149.00" fuelConsumption="0.00" />
- <Entry engineSpeed="800.20" torque="0.00" fuelConsumption="1879.00" />
- <Entry engineSpeed="800.20" torque="200.00" fuelConsumption="4286.00" />
- <Entry engineSpeed="800.20" torque="400.00" fuelConsumption="7021.00" />
- <Entry engineSpeed="800.20" torque="600.00" fuelConsumption="10059.00" />
- <Entry engineSpeed="800.20" torque="800.00" fuelConsumption="13086.00" />
- <Entry engineSpeed="800.20" torque="1000.00" fuelConsumption="16015.00" />
- <Entry engineSpeed="800.20" torque="1200.00" fuelConsumption="19239.00" />
- <Entry engineSpeed="800.20" torque="1400.00" fuelConsumption="22426.00" />
- <Entry engineSpeed="800.20" torque="1600.00" fuelConsumption="25483.00" />
- <Entry engineSpeed="800.20" torque="1791.00" fuelConsumption="28905.00" />
- <Entry engineSpeed="1000.20" torque="-160.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1000.20" torque="0.00" fuelConsumption="2865.00" />
- <Entry engineSpeed="1000.20" torque="200.00" fuelConsumption="5963.00" />
- <Entry engineSpeed="1000.20" torque="400.00" fuelConsumption="9198.00" />
- <Entry engineSpeed="1000.20" torque="600.00" fuelConsumption="12354.00" />
- <Entry engineSpeed="1000.20" torque="800.00" fuelConsumption="15965.00" />
- <Entry engineSpeed="1000.20" torque="1000.00" fuelConsumption="19864.00" />
- <Entry engineSpeed="1000.20" torque="1200.00" fuelConsumption="23530.00" />
- <Entry engineSpeed="1000.20" torque="1400.00" fuelConsumption="27202.00" />
- <Entry engineSpeed="1000.20" torque="1600.00" fuelConsumption="31165.00" />
- <Entry engineSpeed="1000.20" torque="1800.00" fuelConsumption="35103.00" />
- <Entry engineSpeed="1000.20" torque="2000.00" fuelConsumption="39360.00" />
- <Entry engineSpeed="1000.20" torque="2200.00" fuelConsumption="44120.00" />
- <Entry engineSpeed="1000.20" torque="2300.00" fuelConsumption="46836.00" />
- <Entry engineSpeed="1200.20" torque="-179.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1200.20" torque="0.00" fuelConsumption="3307.00" />
- <Entry engineSpeed="1200.20" torque="200.00" fuelConsumption="6897.00" />
- <Entry engineSpeed="1200.20" torque="400.00" fuelConsumption="10651.00" />
- <Entry engineSpeed="1200.20" torque="600.00" fuelConsumption="14645.00" />
- <Entry engineSpeed="1200.20" torque="800.00" fuelConsumption="19115.00" />
- <Entry engineSpeed="1200.20" torque="1000.00" fuelConsumption="23677.00" />
- <Entry engineSpeed="1200.20" torque="1200.00" fuelConsumption="28180.00" />
- <Entry engineSpeed="1200.20" torque="1400.00" fuelConsumption="32431.00" />
- <Entry engineSpeed="1200.20" torque="1600.00" fuelConsumption="36698.00" />
- <Entry engineSpeed="1200.20" torque="1800.00" fuelConsumption="41691.00" />
- <Entry engineSpeed="1200.20" torque="2000.00" fuelConsumption="46915.00" />
- <Entry engineSpeed="1200.20" torque="2200.00" fuelConsumption="51783.00" />
- <Entry engineSpeed="1200.20" torque="2300.00" fuelConsumption="54932.00" />
- <Entry engineSpeed="1400.20" torque="-203.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1400.20" torque="0.00" fuelConsumption="4306.00" />
- <Entry engineSpeed="1400.20" torque="200.00" fuelConsumption="8143.00" />
- <Entry engineSpeed="1400.20" torque="400.00" fuelConsumption="12723.00" />
- <Entry engineSpeed="1400.20" torque="600.00" fuelConsumption="17523.00" />
- <Entry engineSpeed="1400.20" torque="800.00" fuelConsumption="22288.00" />
- <Entry engineSpeed="1400.20" torque="1000.00" fuelConsumption="27093.00" />
- <Entry engineSpeed="1400.20" torque="1200.00" fuelConsumption="32536.00" />
- <Entry engineSpeed="1400.20" torque="1400.00" fuelConsumption="37746.00" />
- <Entry engineSpeed="1400.20" torque="1600.00" fuelConsumption="43194.00" />
- <Entry engineSpeed="1400.20" torque="1800.00" fuelConsumption="49453.00" />
- <Entry engineSpeed="1400.20" torque="2000.00" fuelConsumption="55830.00" />
- <Entry engineSpeed="1400.20" torque="2200.00" fuelConsumption="61072.00" />
- <Entry engineSpeed="1400.20" torque="2300.00" fuelConsumption="64377.00" />
- <Entry engineSpeed="1600.20" torque="-235.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1600.20" torque="0.00" fuelConsumption="5209.00" />
- <Entry engineSpeed="1600.20" torque="200.00" fuelConsumption="9669.00" />
- <Entry engineSpeed="1600.20" torque="400.00" fuelConsumption="14838.00" />
- <Entry engineSpeed="1600.20" torque="600.00" fuelConsumption="20127.00" />
- <Entry engineSpeed="1600.20" torque="800.00" fuelConsumption="25894.00" />
- <Entry engineSpeed="1600.20" torque="1000.00" fuelConsumption="31631.00" />
- <Entry engineSpeed="1600.20" torque="1200.00" fuelConsumption="37248.00" />
- <Entry engineSpeed="1600.20" torque="1400.00" fuelConsumption="42826.00" />
- <Entry engineSpeed="1600.20" torque="1600.00" fuelConsumption="49752.00" />
- <Entry engineSpeed="1600.20" torque="1800.00" fuelConsumption="57020.00" />
- <Entry engineSpeed="1600.20" torque="2000.00" fuelConsumption="63914.00" />
- <Entry engineSpeed="1600.20" torque="2079.00" fuelConsumption="66520.00" />
- <Entry engineSpeed="1800.20" torque="-264.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1800.20" torque="0.00" fuelConsumption="6409.00" />
- <Entry engineSpeed="1800.20" torque="200.00" fuelConsumption="11777.00" />
- <Entry engineSpeed="1800.20" torque="400.00" fuelConsumption="17320.00" />
- <Entry engineSpeed="1800.20" torque="600.00" fuelConsumption="23394.00" />
- <Entry engineSpeed="1800.20" torque="800.00" fuelConsumption="30501.00" />
- <Entry engineSpeed="1800.20" torque="1000.00" fuelConsumption="36378.00" />
- <Entry engineSpeed="1800.20" torque="1200.00" fuelConsumption="43079.00" />
- <Entry engineSpeed="1800.20" torque="1400.00" fuelConsumption="49796.00" />
- <Entry engineSpeed="1800.20" torque="1600.00" fuelConsumption="57436.00" />
- <Entry engineSpeed="1800.20" torque="1800.00" fuelConsumption="65157.00" />
- <Entry engineSpeed="1800.20" torque="1857.00" fuelConsumption="67574.00" />
- <Entry engineSpeed="2000.20" torque="-301.00" fuelConsumption="0.00" />
- <Entry engineSpeed="2000.20" torque="0.00" fuelConsumption="9127.00" />
- <Entry engineSpeed="2000.20" torque="200.00" fuelConsumption="14822.00" />
- <Entry engineSpeed="2000.20" torque="400.00" fuelConsumption="20655.00" />
- <Entry engineSpeed="2000.20" torque="600.00" fuelConsumption="27076.00" />
- <Entry engineSpeed="2000.20" torque="800.00" fuelConsumption="34188.00" />
- <Entry engineSpeed="2000.20" torque="1000.00" fuelConsumption="42837.00" />
- <Entry engineSpeed="2000.20" torque="1200.00" fuelConsumption="51018.00" />
- <Entry engineSpeed="2000.20" torque="1352.00" fuelConsumption="56618.00" />
- <Entry engineSpeed="2100.20" torque="-320.00" fuelConsumption="0.00" />
- <Entry engineSpeed="2100.20" torque="0.00" fuelConsumption="10470.00" />
- <Entry engineSpeed="2100.20" torque="200.00" fuelConsumption="16332.00" />
- <Entry engineSpeed="2100.20" torque="400.00" fuelConsumption="22396.00" />
- <Entry engineSpeed="2100.20" torque="600.00" fuelConsumption="28914.00" />
- <Entry engineSpeed="2100.20" torque="800.00" fuelConsumption="35717.00" />
- <Entry engineSpeed="2100.20" torque="1000.00" fuelConsumption="45643.00" />
- <Entry engineSpeed="2100.20" torque="1100.00" fuelConsumption="50653.00" />
- </FuelConsumptionMap>
- </Fuel>
</Mode>
<Mode>
<IdlingSpeed>570</IdlingSpeed>
@@ -548,7 +426,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>ttvMnXYdQrEAu47QEO2AKyfzOdPSlcdsR/MrmH/mX+k=</di:DigestValue>
+ <di:DigestValue>sYOwPn3VlMw71bjQFfACuekdAjZ8QRT3S8c71w7810A=</di:DigestValue>
</di:Reference>
</Signature>
</tns:Engine>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml
index 04dce1e72e46ad3c52035803f832366ac6550e09..d1e371dbad53cede20f9a2be6db66711313be49f 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml
@@ -23,6 +23,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="2">
@@ -38,6 +43,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="3">
@@ -53,6 +63,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
</v2.10.1:Gears>
@@ -64,7 +79,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>hRzWfx3/El/LwEtP86Utm3dgBAF6CagrpEREsca7+/0=</di:DigestValue>
+ <di:DigestValue>lYoUAB6Xob1azFaCPJBLK1HIT5Jr0K24H2jJec3r5BM=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
index 997f5129c027bb62005b67202d72ba43c54eef3a..0a7b582ec002a94f4de5cd406282f242e97b6cc9 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
@@ -27,6 +27,11 @@
<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" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="2">
@@ -44,6 +49,11 @@
<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" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="3">
@@ -61,6 +71,11 @@
<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="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
</v2.10.1:Gears>
@@ -72,7 +87,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>LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=</di:DigestValue>
+ <di:DigestValue>BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml
index 3f696ad69a424b413028c5248320c30240eb339e..39a56cce349f34ec90c3f384d5bb6a29636e0510 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml
@@ -23,6 +23,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="2">
@@ -38,6 +43,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="3">
@@ -53,6 +63,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="4">
@@ -68,6 +83,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="5">
@@ -83,6 +103,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="6">
@@ -98,6 +123,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="7">
@@ -113,6 +143,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="8">
@@ -128,6 +163,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="9">
@@ -143,6 +183,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="10">
@@ -158,6 +203,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="11">
@@ -173,6 +223,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
<Gear number="12">
@@ -188,6 +243,11 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
<Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
</v2.10.1:Gears>
@@ -199,7 +259,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>XZCluPiG05mOAj5rTjTllCWbhCTEYVxCbE940ck3XsA=</di:DigestValue>
+ <di:DigestValue>QVPf1HhUClM3JoxJHTVqcp2gPXMiqaZ5vFTVyjnG1Co=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml
index d5ec1612f22d0c03a906eb75548be6451d3e95da..8169afd3133db18f51a4cf0cef0ce9cccda8b547 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml
@@ -10,9 +10,9 @@
<CertificationMethod>Measured</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00" />
- <Entry retarderSpeed="0.00" torqueLoss="100.00" />
<Entry retarderSpeed="1000.00" torqueLoss="10.00" />
- <Entry retarderSpeed="1000.00" torqueLoss="100.00" />
+ <Entry retarderSpeed="1001.00" torqueLoss="10.00" />
+ <Entry retarderSpeed="1005.00" torqueLoss="100.00" />
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
@@ -22,7 +22,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>uMH8HJlAtm/SNaj8QOhuX/cBNXTHAZ1la3oEXI42bls=</di:DigestValue>
+ <di:DigestValue>fo5vyZY6IeQgfFpGmNV49YdfJlcEsGycJoNa3qqVChM=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Retarder>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml
index 184bbd9d056f778e2cd12aa2c119f8ab9ec88773..53ad316a1e2e998cf3e77d7664b7c00b805b43fa 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml
@@ -9,11 +9,10 @@
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<Characteristics>
- <Entry speedRatio='0.1000' torqueRatio='1.71' inputTorqueRef='355.43'/>
- <Entry speedRatio='0.0000' torqueRatio='1.75' inputTorqueRef='367.68'/>
- <Entry speedRatio='0.1000' torqueRatio='1.72' inputTorqueRef='355.42'/>
<Entry speedRatio='0.0000' torqueRatio='1.80' inputTorqueRef='367.65'/>
-
+ <Entry speedRatio='0.0001' torqueRatio='1.75' inputTorqueRef='367.68'/>
+ <Entry speedRatio='0.1002' torqueRatio='1.72' inputTorqueRef='355.42'/>
+ <Entry speedRatio='0.1003' torqueRatio='1.71' inputTorqueRef='355.43'/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
@@ -23,7 +22,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>fw0SEYiGgZbq0YvrICrfQYgsDJTbz/s66w7EM2kezio=</di:DigestValue>
+ <di:DigestValue>mxPXYmGbF6eUzjxqAp9KXjy96DzMCGm5Xq9WLvNHwVA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:TorqueConverter>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml
index 10a700031cfd2be34b6b69003ca400280d5e9fcc..8329c44b0b6407951ea861a4fffdfcfc64451229 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml
@@ -10,16 +10,23 @@
<Ratio>0.035</Ratio>
<CertificationMethod>Option 1</CertificationMethod>
<TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00" />
+ <Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00" />
+ <Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00" />
+
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+
</TorqueLossMap>
</Data>
<v2.10.1:Signature>
@@ -29,7 +36,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>NiyH2Xp0rQswwXIOf52Jm0wvK4Yc2/PL/T+zQCWQGFo=</di:DigestValue>
+ <di:DigestValue>HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ADC>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
index a86d8cb6f7634878344c9655208d83ec76f46172..49b50bef46c0bf077b52411ddf467a4bbbc8ca7f 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
@@ -10,12 +10,17 @@
<Ratio>1.123</Ratio>
<CertificationMethod>Option 1</CertificationMethod>
<TorqueLossMap>
+ <Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
+ <Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
- <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
- <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
+ <Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />
+
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />
+
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
@@ -25,7 +30,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>FGaItzPcx1qGytVlroFp+PU9rzsaQWRWnxmIspkqCRM=</di:DigestValue>
+ <di:DigestValue>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Angledrive>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml
index 594370654f3c9c0e9d2ed6c35258b4bcf1f3c12d..b62817b034ce29705f1b1ee28df405a635a04114 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml
@@ -11,16 +11,21 @@
<Ratio>1.000</Ratio>
<CertificationMethod>Measured</CertificationMethod>
<TorqueLossMap>
+ <Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10" />
+ <Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
<Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
+ <Entry inputSpeed="4000.00" inputTorque="-60000.10" torqueLoss="2000.10" />
<Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
- <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
- <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
+ <Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10" />
<Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.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="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="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
+ <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
+ <Entry inputSpeed="4000.00" inputTorque="60000.10" torqueLoss="2000.10" />
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
@@ -30,7 +35,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>og41nROicUT1OoesUTZ9/uoroCUbqlTo7nKmCRYQap4=</di:DigestValue>
+ <di:DigestValue>MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Axlegear>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml
index 7d273adcfb5ac3387eb25a214a644b7496f85ae1..49a8f85063bb7353acc206cab2b6366bd4d81e93 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml
@@ -14,17 +14,24 @@
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
- <Entry SoC="100" OCV="640.00" />
- <Entry SoC="0" OCV="620.00" />
- </OCV>
+ <Entry SoC="88" OCV="640.00" />
+ <Entry SoC="89" OCV="641.00" />
+ <Entry SoC="0" OCV="620.00" />
+ <Entry SoC="100" OCV="640.00" />
+ </OCV>
<InternalResistance>
+ <Entry SoC="88" R_2="14.00" R_10="14.00" R_20="16.00" />
+ <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" />
- <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00" />
- </InternalResistance>
+ <Entry SoC="88" R_2="13.00" R_10="14.00" R_20="16.00" />
+ </InternalResistance>
<CurrentLimits>
- <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
- <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
- </CurrentLimits>
+ <Entry SoC="88" maxChargingCurrent="21.00" maxDischargingCurrent="50.00" />
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+ <Entry SoC="88" maxChargingCurrent="20.00" maxDischargingCurrent="50.00" />
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+
+ </CurrentLimits>
</Data>
<v2.10.1:Signature>
<di:Reference URI="#BAT-asdf">
@@ -33,7 +40,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>tam1LGpdznHGFGo+rp0WVr0/6+F2yU2Kv4G4tYvAe+Y=</di:DigestValue>
+ <di:DigestValue>MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:BatterySystem>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml
index 2cc9e403a7f3a2a9c1bb2a8b1b8ffed339438639..b2b7884b82697022363475afeb2fbf3a37bbaf4b 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml
@@ -13,8 +13,9 @@
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>IHPC Type 1</IHPCType>
+
<VoltageLevel>
- <Voltage>600</Voltage>
+ <Voltage>500</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
@@ -22,20 +23,36 @@
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="5000.00" maxTorque="100.00" minTorque="-100.00"/>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+
</MaxTorqueCurve>
- <PowerMap gear="2">
+ <PowerMap gear="1">
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.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="5000.00" torque="5000.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 gear="3">
<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="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <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"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
</PowerMap>
+
</VoltageLevel>
<VoltageLevel>
<Voltage>400</Voltage>
@@ -45,31 +62,93 @@
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<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="4001.00" maxTorque="101.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+
+ </MaxTorqueCurve>
+ <PowerMap gear="1">
+ <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="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+ <PowerMap gear="3">
<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="5000.00" torque="-5000.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="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.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"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+
+ </VoltageLevel>
+
+
+ <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>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
+
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+
+ </MaxTorqueCurve>
+
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.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"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ </PowerMap>
+ <PowerMap gear="1">
+ <Entry outShaftSpeed="5000.00" torque="5000.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"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+
+ </PowerMap>
+ <PowerMap gear="3">
<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>
+ <Entry outShaftSpeed="5000.00" torque="-5000.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="5000.00" torque="5000.00" electricPower="20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
<DragCurve>
- <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
- <Entry outShaftSpeed="0.00" dragTorque="10.00" />
- </DragCurve>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+ <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+
+ <Entry outShaftSpeed="5000.00" dragTorque="30.00" />
+ </DragCurve>
<Conditioning>
<Entry coolantTempInlet="50" coolingPower="5000" />
- <Entry coolantTempInlet="30" coolingPower="5000" />
- </Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000" />
+
+ <Entry coolantTempInlet="60" coolingPower="5000" />
+ </Conditioning>
</Data>
<v2.10.1:Signature>
<di:Reference URI="#EM-asdf">
@@ -78,7 +157,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>X5dgavua/V/jzBQeJ6SxZXsXm3i1jruL48LedzZ5IxU=</di:DigestValue>
+ <di:DigestValue>6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ElectricMachineSystem>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml
index 352fa54c78e088c4f1362d636526a3142a802f3b..78ed082cfd6afb596f2b8d5362e97ec61fd7d0c0 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml
@@ -25,12 +25,13 @@
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
</MaxTorqueCurve>
<PowerMap>
- <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="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>
+ </VoltageLevel>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
@@ -39,16 +40,17 @@
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
- <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
<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="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>
</VoltageLevel>
+
<DragCurve>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml
index 326ff58a2f78b9e8279b279bdafbd16290926549..3fa78fe52d7297e00d0d76b562ab19d9e76a2ca0 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml
@@ -21,12 +21,14 @@
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="101.00" minTorque="-100.00"/>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
</MaxTorqueCurve>
<PowerMap>
<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>
</VoltageLevel>
@@ -42,7 +44,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>CunnDxsiE9kciX+v9oeEGADZpEc88NtfMtmrHyJkCQ0=</di:DigestValue>
+ <di:DigestValue>qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=</di:DigestValue>
</di:Reference>
</v2.10.1:Signature>
</tns:ElectricMachineSystem>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml
index 3e2f3cd91fc547b80a072ac7b7ac348eb1ca0f40..bfdfe35bbce16aafecbb772680337567accbe563 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml
@@ -25,15 +25,16 @@
<Mode>
<IdlingSpeed>570</IdlingSpeed>
<FullLoadAndDragCurve>
- <Entry engineSpeed="1600.30" maxTorque="2079.00" dragTorque="-235.00" />
- <Entry engineSpeed="1800.30" maxTorque="1857.00" dragTorque="-264.00" />
<Entry engineSpeed="800.30" maxTorque="1791.00" dragTorque="-149.00" />
- <Entry engineSpeed="2000.30" maxTorque="1352.00" dragTorque="-301.00" />
- <Entry engineSpeed="560.30" maxTorque="1180.00" dragTorque="-149.00" />
- <Entry engineSpeed="600.30" maxTorque="1282.00" dragTorque="-148.00" />
<Entry engineSpeed="1000.30" maxTorque="2300.00" dragTorque="-160.00" />
<Entry engineSpeed="1200.30" maxTorque="2300.00" dragTorque="-179.00" />
<Entry engineSpeed="1400.30" maxTorque="2300.00" dragTorque="-203.00" />
+ <Entry engineSpeed="560.30" maxTorque="1180.00" dragTorque="-149.00" />
+ <Entry engineSpeed="600.30" maxTorque="1282.00" dragTorque="-148.00" />
+
+ <Entry engineSpeed="1600.30" maxTorque="2079.00" dragTorque="-235.00" />
+ <Entry engineSpeed="1800.30" maxTorque="1857.00" dragTorque="-264.00" />
+ <Entry engineSpeed="2000.30" maxTorque="1352.00" dragTorque="-301.00" />
<Entry engineSpeed="2100.30" maxTorque="1100.00" dragTorque="-320.00" />
</FullLoadAndDragCurve>
<Fuel type="Ethanol CI">
@@ -44,17 +45,16 @@
<CFRegPer>4.0000</CFRegPer>
<CFNCV>4.0000</CFNCV>
<FuelConsumptionMap>
- <Entry engineSpeed="560.40" torque="-149.00" fuelConsumption="0.00" />
- <Entry engineSpeed="560.40" torque="0.00" fuelConsumption="1256.00" />
<Entry engineSpeed="560.40" torque="200.00" fuelConsumption="3197.00" />
<Entry engineSpeed="560.40" torque="400.00" fuelConsumption="5295.00" />
<Entry engineSpeed="560.40" torque="600.00" fuelConsumption="7615.00" />
<Entry engineSpeed="560.40" torque="800.00" fuelConsumption="9375.00" />
<Entry engineSpeed="560.40" torque="1000.00" fuelConsumption="11239.00" />
+
+ <Entry engineSpeed="560.40" torque="-149.00" fuelConsumption="0.00" />
+ <Entry engineSpeed="560.40" torque="0.00" fuelConsumption="1256.00" />
+
<Entry engineSpeed="560.40" torque="1180.00" fuelConsumption="12869.00" />
- <Entry engineSpeed="800.40" torque="1400.00" fuelConsumption="22426.00" />
- <Entry engineSpeed="800.40" torque="1600.00" fuelConsumption="25483.00" />
- <Entry engineSpeed="800.40" torque="1791.00" fuelConsumption="28905.00" />
<Entry engineSpeed="600.40" torque="-148.00" fuelConsumption="0.00" />
<Entry engineSpeed="600.40" torque="0.00" fuelConsumption="1459.00" />
<Entry engineSpeed="600.40" torque="200.00" fuelConsumption="3358.00" />
@@ -72,6 +72,9 @@
<Entry engineSpeed="800.40" torque="800.00" fuelConsumption="13086.00" />
<Entry engineSpeed="800.40" torque="1000.00" fuelConsumption="16015.00" />
<Entry engineSpeed="800.40" torque="1200.00" fuelConsumption="19239.00" />
+ <Entry engineSpeed="800.40" torque="1400.00" fuelConsumption="22426.00" />
+ <Entry engineSpeed="800.40" torque="1600.00" fuelConsumption="25483.00" />
+ <Entry engineSpeed="800.40" torque="1791.00" fuelConsumption="28905.00" />
<Entry engineSpeed="1000.40" torque="-160.00" fuelConsumption="0.00" />
<Entry engineSpeed="1000.40" torque="0.00" fuelConsumption="2865.00" />
<Entry engineSpeed="1000.40" torque="200.00" fuelConsumption="5963.00" />
@@ -80,10 +83,6 @@
<Entry engineSpeed="1000.40" torque="800.00" fuelConsumption="15965.00" />
<Entry engineSpeed="1000.40" torque="1000.00" fuelConsumption="19864.00" />
<Entry engineSpeed="1000.40" torque="1200.00" fuelConsumption="23530.00" />
- <Entry engineSpeed="1200.40" torque="800.00" fuelConsumption="19115.00" />
- <Entry engineSpeed="1200.40" torque="1000.00" fuelConsumption="23677.00" />
- <Entry engineSpeed="1200.40" torque="1200.00" fuelConsumption="28180.00" />
- <Entry engineSpeed="1200.40" torque="1400.00" fuelConsumption="32431.00" />
<Entry engineSpeed="1000.40" torque="1400.00" fuelConsumption="27202.00" />
<Entry engineSpeed="1000.40" torque="1600.00" fuelConsumption="31165.00" />
<Entry engineSpeed="1000.40" torque="1800.00" fuelConsumption="35103.00" />
@@ -95,6 +94,10 @@
<Entry engineSpeed="1200.40" torque="200.00" fuelConsumption="6897.00" />
<Entry engineSpeed="1200.40" torque="400.00" fuelConsumption="10651.00" />
<Entry engineSpeed="1200.40" torque="600.00" fuelConsumption="14645.00" />
+ <Entry engineSpeed="1200.40" torque="800.00" fuelConsumption="19115.00" />
+ <Entry engineSpeed="1200.40" torque="1000.00" fuelConsumption="23677.00" />
+ <Entry engineSpeed="1200.40" torque="1200.00" fuelConsumption="28180.00" />
+ <Entry engineSpeed="1200.40" torque="1400.00" fuelConsumption="32431.00" />
<Entry engineSpeed="1200.40" torque="1600.00" fuelConsumption="36698.00" />
<Entry engineSpeed="1200.40" torque="1800.00" fuelConsumption="41691.00" />
<Entry engineSpeed="1200.40" torque="2000.00" fuelConsumption="46915.00" />
@@ -118,13 +121,6 @@
<Entry engineSpeed="1600.40" torque="0.00" fuelConsumption="5209.00" />
<Entry engineSpeed="1600.40" torque="200.00" fuelConsumption="9669.00" />
<Entry engineSpeed="1600.40" torque="400.00" fuelConsumption="14838.00" />
- <Entry engineSpeed="1800.40" torque="800.00" fuelConsumption="30501.00" />
- <Entry engineSpeed="1800.40" torque="1000.00" fuelConsumption="36378.00" />
- <Entry engineSpeed="1800.40" torque="1200.00" fuelConsumption="43079.00" />
- <Entry engineSpeed="1800.40" torque="1400.00" fuelConsumption="49796.00" />
- <Entry engineSpeed="1800.40" torque="1600.00" fuelConsumption="57436.00" />
- <Entry engineSpeed="1800.40" torque="1800.00" fuelConsumption="65157.00" />
- <Entry engineSpeed="1800.40" torque="1857.00" fuelConsumption="67574.00" />
<Entry engineSpeed="1600.40" torque="600.00" fuelConsumption="20127.00" />
<Entry engineSpeed="1600.40" torque="800.00" fuelConsumption="25894.00" />
<Entry engineSpeed="1600.40" torque="1000.00" fuelConsumption="31631.00" />
@@ -139,6 +135,13 @@
<Entry engineSpeed="1800.40" torque="200.00" fuelConsumption="11777.00" />
<Entry engineSpeed="1800.40" torque="400.00" fuelConsumption="17320.00" />
<Entry engineSpeed="1800.40" torque="600.00" fuelConsumption="23394.00" />
+ <Entry engineSpeed="1800.40" torque="800.00" fuelConsumption="30501.00" />
+ <Entry engineSpeed="1800.40" torque="1000.00" fuelConsumption="36378.00" />
+ <Entry engineSpeed="1800.40" torque="1200.00" fuelConsumption="43079.00" />
+ <Entry engineSpeed="1800.40" torque="1400.00" fuelConsumption="49796.00" />
+ <Entry engineSpeed="1800.40" torque="1600.00" fuelConsumption="57436.00" />
+ <Entry engineSpeed="1800.40" torque="1800.00" fuelConsumption="65157.00" />
+ <Entry engineSpeed="1800.40" torque="1857.00" fuelConsumption="67574.00" />
<Entry engineSpeed="2000.40" torque="-301.00" fuelConsumption="0.00" />
<Entry engineSpeed="2000.40" torque="0.00" fuelConsumption="9127.00" />
<Entry engineSpeed="2000.40" torque="200.00" fuelConsumption="14822.00" />
@@ -166,6 +169,15 @@
<CFRegPer>3.0000</CFRegPer>
<CFNCV>3.0000</CFNCV>
<FuelConsumptionMap>
+ <Entry engineSpeed="800.30" torque="200.00" fuelConsumption="4286.00" />
+ <Entry engineSpeed="800.30" torque="400.00" fuelConsumption="7021.00" />
+ <Entry engineSpeed="800.30" torque="600.00" fuelConsumption="10059.00" />
+ <Entry engineSpeed="800.30" torque="800.00" fuelConsumption="13086.00" />
+ <Entry engineSpeed="800.30" torque="1000.00" fuelConsumption="16015.00" />
+ <Entry engineSpeed="800.30" torque="1200.00" fuelConsumption="19239.00" />
+ <Entry engineSpeed="800.30" torque="1400.00" fuelConsumption="22426.00" />
+ <Entry engineSpeed="800.30" torque="1600.00" fuelConsumption="25483.00" />
+ <Entry engineSpeed="800.30" torque="1791.00" fuelConsumption="28905.00" />
<Entry engineSpeed="560.30" torque="-149.00" fuelConsumption="0.00" />
<Entry engineSpeed="560.30" torque="0.00" fuelConsumption="1256.00" />
<Entry engineSpeed="560.30" torque="200.00" fuelConsumption="3197.00" />
@@ -185,35 +197,7 @@
<Entry engineSpeed="600.30" torque="1282.00" fuelConsumption="15304.00" />
<Entry engineSpeed="800.30" torque="-149.00" fuelConsumption="0.00" />
<Entry engineSpeed="800.30" torque="0.00" fuelConsumption="1879.00" />
- <Entry engineSpeed="800.30" torque="200.00" fuelConsumption="4286.00" />
- <Entry engineSpeed="800.30" torque="400.00" fuelConsumption="7021.00" />
- <Entry engineSpeed="1200.30" torque="2200.00" fuelConsumption="51783.00" />
- <Entry engineSpeed="1200.30" torque="2300.00" fuelConsumption="54932.00" />
- <Entry engineSpeed="1400.30" torque="-203.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1400.30" torque="0.00" fuelConsumption="4306.00" />
- <Entry engineSpeed="1400.30" torque="200.00" fuelConsumption="8143.00" />
- <Entry engineSpeed="1400.30" torque="400.00" fuelConsumption="12723.00" />
- <Entry engineSpeed="1400.30" torque="600.00" fuelConsumption="17523.00" />
- <Entry engineSpeed="1400.30" torque="800.00" fuelConsumption="22288.00" />
- <Entry engineSpeed="1400.30" torque="1000.00" fuelConsumption="27093.00" />
- <Entry engineSpeed="1400.30" torque="1200.00" fuelConsumption="32536.00" />
- <Entry engineSpeed="1400.30" torque="1400.00" fuelConsumption="37746.00" />
- <Entry engineSpeed="1400.30" torque="1600.00" fuelConsumption="43194.00" />
- <Entry engineSpeed="1400.30" torque="1800.00" fuelConsumption="49453.00" />
- <Entry engineSpeed="1400.30" torque="2000.00" fuelConsumption="55830.00" />
- <Entry engineSpeed="1400.30" torque="2200.00" fuelConsumption="61072.00" />
- <Entry engineSpeed="1400.30" torque="2300.00" fuelConsumption="64377.00" />
- <Entry engineSpeed="1600.30" torque="-235.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1600.30" torque="0.00" fuelConsumption="5209.00" />
- <Entry engineSpeed="1600.30" torque="200.00" fuelConsumption="9669.00" />
- <Entry engineSpeed="1600.30" torque="400.00" fuelConsumption="14838.00" />
- <Entry engineSpeed="800.30" torque="600.00" fuelConsumption="10059.00" />
- <Entry engineSpeed="800.30" torque="800.00" fuelConsumption="13086.00" />
- <Entry engineSpeed="800.30" torque="1000.00" fuelConsumption="16015.00" />
- <Entry engineSpeed="800.30" torque="1200.00" fuelConsumption="19239.00" />
- <Entry engineSpeed="800.30" torque="1400.00" fuelConsumption="22426.00" />
- <Entry engineSpeed="800.30" torque="1600.00" fuelConsumption="25483.00" />
- <Entry engineSpeed="800.30" torque="1791.00" fuelConsumption="28905.00" />
+
<Entry engineSpeed="1000.30" torque="-160.00" fuelConsumption="0.00" />
<Entry engineSpeed="1000.30" torque="0.00" fuelConsumption="2865.00" />
<Entry engineSpeed="1000.30" torque="200.00" fuelConsumption="5963.00" />
@@ -240,6 +224,26 @@
<Entry engineSpeed="1200.30" torque="1600.00" fuelConsumption="36698.00" />
<Entry engineSpeed="1200.30" torque="1800.00" fuelConsumption="41691.00" />
<Entry engineSpeed="1200.30" torque="2000.00" fuelConsumption="46915.00" />
+ <Entry engineSpeed="1200.30" torque="2200.00" fuelConsumption="51783.00" />
+ <Entry engineSpeed="1200.30" torque="2300.00" fuelConsumption="54932.00" />
+ <Entry engineSpeed="1400.30" torque="-203.00" fuelConsumption="0.00" />
+ <Entry engineSpeed="1400.30" torque="0.00" fuelConsumption="4306.00" />
+ <Entry engineSpeed="1400.30" torque="200.00" fuelConsumption="8143.00" />
+ <Entry engineSpeed="1400.30" torque="400.00" fuelConsumption="12723.00" />
+ <Entry engineSpeed="1400.30" torque="600.00" fuelConsumption="17523.00" />
+ <Entry engineSpeed="1400.30" torque="800.00" fuelConsumption="22288.00" />
+ <Entry engineSpeed="1400.30" torque="1000.00" fuelConsumption="27093.00" />
+ <Entry engineSpeed="1400.30" torque="1200.00" fuelConsumption="32536.00" />
+ <Entry engineSpeed="1400.30" torque="1400.00" fuelConsumption="37746.00" />
+ <Entry engineSpeed="1400.30" torque="1600.00" fuelConsumption="43194.00" />
+ <Entry engineSpeed="1400.30" torque="1800.00" fuelConsumption="49453.00" />
+ <Entry engineSpeed="1400.30" torque="2000.00" fuelConsumption="55830.00" />
+ <Entry engineSpeed="1400.30" torque="2200.00" fuelConsumption="61072.00" />
+ <Entry engineSpeed="1400.30" torque="2300.00" fuelConsumption="64377.00" />
+ <Entry engineSpeed="1600.30" torque="-235.00" fuelConsumption="0.00" />
+ <Entry engineSpeed="1600.30" torque="0.00" fuelConsumption="5209.00" />
+ <Entry engineSpeed="1600.30" torque="200.00" fuelConsumption="9669.00" />
+ <Entry engineSpeed="1600.30" torque="400.00" fuelConsumption="14838.00" />
<Entry engineSpeed="1600.30" torque="600.00" fuelConsumption="20127.00" />
<Entry engineSpeed="1600.30" torque="800.00" fuelConsumption="25894.00" />
<Entry engineSpeed="1600.30" torque="1000.00" fuelConsumption="31631.00" />
@@ -253,14 +257,6 @@
<Entry engineSpeed="1800.30" torque="0.00" fuelConsumption="6409.00" />
<Entry engineSpeed="1800.30" torque="200.00" fuelConsumption="11777.00" />
<Entry engineSpeed="1800.30" torque="400.00" fuelConsumption="17320.00" />
- <Entry engineSpeed="2000.30" torque="0.00" fuelConsumption="9127.00" />
- <Entry engineSpeed="2000.30" torque="200.00" fuelConsumption="14822.00" />
- <Entry engineSpeed="2000.30" torque="400.00" fuelConsumption="20655.00" />
- <Entry engineSpeed="2000.30" torque="600.00" fuelConsumption="27076.00" />
- <Entry engineSpeed="2000.30" torque="800.00" fuelConsumption="34188.00" />
- <Entry engineSpeed="2000.30" torque="1000.00" fuelConsumption="42837.00" />
- <Entry engineSpeed="2000.30" torque="1200.00" fuelConsumption="51018.00" />
- <Entry engineSpeed="2000.30" torque="1352.00" fuelConsumption="56618.00" />
<Entry engineSpeed="1800.30" torque="600.00" fuelConsumption="23394.00" />
<Entry engineSpeed="1800.30" torque="800.00" fuelConsumption="30501.00" />
<Entry engineSpeed="1800.30" torque="1000.00" fuelConsumption="36378.00" />
@@ -270,6 +266,14 @@
<Entry engineSpeed="1800.30" torque="1800.00" fuelConsumption="65157.00" />
<Entry engineSpeed="1800.30" torque="1857.00" fuelConsumption="67574.00" />
<Entry engineSpeed="2000.30" torque="-301.00" fuelConsumption="0.00" />
+ <Entry engineSpeed="2000.30" torque="0.00" fuelConsumption="9127.00" />
+ <Entry engineSpeed="2000.30" torque="200.00" fuelConsumption="14822.00" />
+ <Entry engineSpeed="2000.30" torque="400.00" fuelConsumption="20655.00" />
+ <Entry engineSpeed="2000.30" torque="600.00" fuelConsumption="27076.00" />
+ <Entry engineSpeed="2000.30" torque="800.00" fuelConsumption="34188.00" />
+ <Entry engineSpeed="2000.30" torque="1000.00" fuelConsumption="42837.00" />
+ <Entry engineSpeed="2000.30" torque="1200.00" fuelConsumption="51018.00" />
+ <Entry engineSpeed="2000.30" torque="1352.00" fuelConsumption="56618.00" />
<Entry engineSpeed="2100.30" torque="-320.00" fuelConsumption="0.00" />
<Entry engineSpeed="2100.30" torque="0.00" fuelConsumption="10470.00" />
<Entry engineSpeed="2100.30" torque="200.00" fuelConsumption="16332.00" />
@@ -280,143 +284,23 @@
<Entry engineSpeed="2100.30" torque="1100.00" fuelConsumption="50653.00" />
</FuelConsumptionMap>
</Fuel>
+
</Mode>
<Mode>
<IdlingSpeed>560</IdlingSpeed>
<FullLoadAndDragCurve>
<Entry engineSpeed="1000.10" maxTorque="2300.00" dragTorque="-160.00" />
<Entry engineSpeed="1200.10" maxTorque="2300.00" dragTorque="-179.00" />
+ <Entry engineSpeed="1400.10" maxTorque="2300.00" dragTorque="-203.00" />
+ <Entry engineSpeed="1600.10" maxTorque="2079.00" dragTorque="-235.00" />
<Entry engineSpeed="560.10" maxTorque="1180.00" dragTorque="-149.00" />
<Entry engineSpeed="600.10" maxTorque="1282.00" dragTorque="-148.00" />
<Entry engineSpeed="800.10" maxTorque="1791.00" dragTorque="-149.00" />
- <Entry engineSpeed="1800.10" maxTorque="1857.00" dragTorque="-264.00" />
<Entry engineSpeed="2000.10" maxTorque="1352.00" dragTorque="-301.00" />
- <Entry engineSpeed="1400.10" maxTorque="2300.00" dragTorque="-203.00" />
- <Entry engineSpeed="1600.10" maxTorque="2079.00" dragTorque="-235.00" />
<Entry engineSpeed="2100.10" maxTorque="1100.00" dragTorque="-320.00" />
+ <Entry engineSpeed="1800.10" maxTorque="1857.00" dragTorque="-264.00" />
+
</FullLoadAndDragCurve>
- <Fuel type="Ethanol CI">
- <WHTCUrban>2.0097</WHTCUrban>
- <WHTCRural>2.0035</WHTCRural>
- <WHTCMotorway>2.0200</WHTCMotorway>
- <BFColdHot>2.0000</BFColdHot>
- <CFRegPer>2.0000</CFRegPer>
- <CFNCV>2.0000</CFNCV>
- <FuelConsumptionMap>
- <Entry engineSpeed="560.20" torque="-149.00" fuelConsumption="0.00" />
- <Entry engineSpeed="560.20" torque="0.00" fuelConsumption="1256.00" />
- <Entry engineSpeed="560.20" torque="200.00" fuelConsumption="3197.00" />
- <Entry engineSpeed="560.20" torque="400.00" fuelConsumption="5295.00" />
- <Entry engineSpeed="560.20" torque="600.00" fuelConsumption="7615.00" />
- <Entry engineSpeed="560.20" torque="800.00" fuelConsumption="9375.00" />
- <Entry engineSpeed="560.20" torque="1000.00" fuelConsumption="11239.00" />
- <Entry engineSpeed="560.20" torque="1180.00" fuelConsumption="12869.00" />
- <Entry engineSpeed="600.20" torque="-148.00" fuelConsumption="0.00" />
- <Entry engineSpeed="600.20" torque="0.00" fuelConsumption="1459.00" />
- <Entry engineSpeed="600.20" torque="200.00" fuelConsumption="3358.00" />
- <Entry engineSpeed="600.20" torque="400.00" fuelConsumption="5498.00" />
- <Entry engineSpeed="600.20" torque="600.00" fuelConsumption="8101.00" />
- <Entry engineSpeed="600.20" torque="800.00" fuelConsumption="10014.00" />
- <Entry engineSpeed="600.20" torque="1000.00" fuelConsumption="12071.00" />
- <Entry engineSpeed="600.20" torque="1200.00" fuelConsumption="14201.00" />
- <Entry engineSpeed="600.20" torque="1282.00" fuelConsumption="15304.00" />
- <Entry engineSpeed="800.20" torque="-149.00" fuelConsumption="0.00" />
- <Entry engineSpeed="800.20" torque="0.00" fuelConsumption="1879.00" />
- <Entry engineSpeed="800.20" torque="200.00" fuelConsumption="4286.00" />
- <Entry engineSpeed="800.20" torque="400.00" fuelConsumption="7021.00" />
- <Entry engineSpeed="800.20" torque="600.00" fuelConsumption="10059.00" />
- <Entry engineSpeed="800.20" torque="800.00" fuelConsumption="13086.00" />
- <Entry engineSpeed="800.20" torque="1000.00" fuelConsumption="16015.00" />
- <Entry engineSpeed="800.20" torque="1200.00" fuelConsumption="19239.00" />
- <Entry engineSpeed="800.20" torque="1400.00" fuelConsumption="22426.00" />
- <Entry engineSpeed="800.20" torque="1600.00" fuelConsumption="25483.00" />
- <Entry engineSpeed="800.20" torque="1791.00" fuelConsumption="28905.00" />
- <Entry engineSpeed="1000.20" torque="-160.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1000.20" torque="0.00" fuelConsumption="2865.00" />
- <Entry engineSpeed="1000.20" torque="200.00" fuelConsumption="5963.00" />
- <Entry engineSpeed="1000.20" torque="400.00" fuelConsumption="9198.00" />
- <Entry engineSpeed="1000.20" torque="600.00" fuelConsumption="12354.00" />
- <Entry engineSpeed="1000.20" torque="800.00" fuelConsumption="15965.00" />
- <Entry engineSpeed="1000.20" torque="1000.00" fuelConsumption="19864.00" />
- <Entry engineSpeed="1000.20" torque="1200.00" fuelConsumption="23530.00" />
- <Entry engineSpeed="1000.20" torque="1400.00" fuelConsumption="27202.00" />
- <Entry engineSpeed="1000.20" torque="1600.00" fuelConsumption="31165.00" />
- <Entry engineSpeed="1000.20" torque="1800.00" fuelConsumption="35103.00" />
- <Entry engineSpeed="1000.20" torque="2000.00" fuelConsumption="39360.00" />
- <Entry engineSpeed="1000.20" torque="2200.00" fuelConsumption="44120.00" />
- <Entry engineSpeed="1000.20" torque="2300.00" fuelConsumption="46836.00" />
- <Entry engineSpeed="1200.20" torque="-179.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1200.20" torque="0.00" fuelConsumption="3307.00" />
- <Entry engineSpeed="1200.20" torque="200.00" fuelConsumption="6897.00" />
- <Entry engineSpeed="1200.20" torque="400.00" fuelConsumption="10651.00" />
- <Entry engineSpeed="1200.20" torque="600.00" fuelConsumption="14645.00" />
- <Entry engineSpeed="1200.20" torque="800.00" fuelConsumption="19115.00" />
- <Entry engineSpeed="1200.20" torque="1000.00" fuelConsumption="23677.00" />
- <Entry engineSpeed="1200.20" torque="1200.00" fuelConsumption="28180.00" />
- <Entry engineSpeed="1200.20" torque="1400.00" fuelConsumption="32431.00" />
- <Entry engineSpeed="1200.20" torque="1600.00" fuelConsumption="36698.00" />
- <Entry engineSpeed="1200.20" torque="1800.00" fuelConsumption="41691.00" />
- <Entry engineSpeed="1200.20" torque="2000.00" fuelConsumption="46915.00" />
- <Entry engineSpeed="1200.20" torque="2200.00" fuelConsumption="51783.00" />
- <Entry engineSpeed="1200.20" torque="2300.00" fuelConsumption="54932.00" />
- <Entry engineSpeed="1400.20" torque="-203.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1400.20" torque="0.00" fuelConsumption="4306.00" />
- <Entry engineSpeed="1400.20" torque="200.00" fuelConsumption="8143.00" />
- <Entry engineSpeed="1400.20" torque="400.00" fuelConsumption="12723.00" />
- <Entry engineSpeed="1400.20" torque="600.00" fuelConsumption="17523.00" />
- <Entry engineSpeed="1400.20" torque="800.00" fuelConsumption="22288.00" />
- <Entry engineSpeed="1400.20" torque="1000.00" fuelConsumption="27093.00" />
- <Entry engineSpeed="1400.20" torque="1200.00" fuelConsumption="32536.00" />
- <Entry engineSpeed="1400.20" torque="1400.00" fuelConsumption="37746.00" />
- <Entry engineSpeed="1400.20" torque="1600.00" fuelConsumption="43194.00" />
- <Entry engineSpeed="1400.20" torque="1800.00" fuelConsumption="49453.00" />
- <Entry engineSpeed="1400.20" torque="2000.00" fuelConsumption="55830.00" />
- <Entry engineSpeed="1400.20" torque="2200.00" fuelConsumption="61072.00" />
- <Entry engineSpeed="1400.20" torque="2300.00" fuelConsumption="64377.00" />
- <Entry engineSpeed="1600.20" torque="-235.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1600.20" torque="0.00" fuelConsumption="5209.00" />
- <Entry engineSpeed="1600.20" torque="200.00" fuelConsumption="9669.00" />
- <Entry engineSpeed="1600.20" torque="400.00" fuelConsumption="14838.00" />
- <Entry engineSpeed="1600.20" torque="600.00" fuelConsumption="20127.00" />
- <Entry engineSpeed="1600.20" torque="800.00" fuelConsumption="25894.00" />
- <Entry engineSpeed="1600.20" torque="1000.00" fuelConsumption="31631.00" />
- <Entry engineSpeed="1600.20" torque="1200.00" fuelConsumption="37248.00" />
- <Entry engineSpeed="1600.20" torque="1400.00" fuelConsumption="42826.00" />
- <Entry engineSpeed="1600.20" torque="1600.00" fuelConsumption="49752.00" />
- <Entry engineSpeed="1600.20" torque="1800.00" fuelConsumption="57020.00" />
- <Entry engineSpeed="1600.20" torque="2000.00" fuelConsumption="63914.00" />
- <Entry engineSpeed="1600.20" torque="2079.00" fuelConsumption="66520.00" />
- <Entry engineSpeed="1800.20" torque="-264.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1800.20" torque="0.00" fuelConsumption="6409.00" />
- <Entry engineSpeed="1800.20" torque="200.00" fuelConsumption="11777.00" />
- <Entry engineSpeed="1800.20" torque="400.00" fuelConsumption="17320.00" />
- <Entry engineSpeed="1800.20" torque="600.00" fuelConsumption="23394.00" />
- <Entry engineSpeed="1800.20" torque="800.00" fuelConsumption="30501.00" />
- <Entry engineSpeed="1800.20" torque="1000.00" fuelConsumption="36378.00" />
- <Entry engineSpeed="1800.20" torque="1200.00" fuelConsumption="43079.00" />
- <Entry engineSpeed="1800.20" torque="1400.00" fuelConsumption="49796.00" />
- <Entry engineSpeed="1800.20" torque="1600.00" fuelConsumption="57436.00" />
- <Entry engineSpeed="1800.20" torque="1800.00" fuelConsumption="65157.00" />
- <Entry engineSpeed="1800.20" torque="1857.00" fuelConsumption="67574.00" />
- <Entry engineSpeed="2000.20" torque="-301.00" fuelConsumption="0.00" />
- <Entry engineSpeed="2000.20" torque="0.00" fuelConsumption="9127.00" />
- <Entry engineSpeed="2000.20" torque="200.00" fuelConsumption="14822.00" />
- <Entry engineSpeed="2000.20" torque="400.00" fuelConsumption="20655.00" />
- <Entry engineSpeed="2000.20" torque="600.00" fuelConsumption="27076.00" />
- <Entry engineSpeed="2000.20" torque="800.00" fuelConsumption="34188.00" />
- <Entry engineSpeed="2000.20" torque="1000.00" fuelConsumption="42837.00" />
- <Entry engineSpeed="2000.20" torque="1200.00" fuelConsumption="51018.00" />
- <Entry engineSpeed="2000.20" torque="1352.00" fuelConsumption="56618.00" />
- <Entry engineSpeed="2100.20" torque="-320.00" fuelConsumption="0.00" />
- <Entry engineSpeed="2100.20" torque="0.00" fuelConsumption="10470.00" />
- <Entry engineSpeed="2100.20" torque="200.00" fuelConsumption="16332.00" />
- <Entry engineSpeed="2100.20" torque="400.00" fuelConsumption="22396.00" />
- <Entry engineSpeed="2100.20" torque="600.00" fuelConsumption="28914.00" />
- <Entry engineSpeed="2100.20" torque="800.00" fuelConsumption="35717.00" />
- <Entry engineSpeed="2100.20" torque="1000.00" fuelConsumption="45643.00" />
- <Entry engineSpeed="2100.20" torque="1100.00" fuelConsumption="50653.00" />
- </FuelConsumptionMap>
- </Fuel>
<Fuel type="Diesel CI">
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
@@ -425,22 +309,23 @@
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelConsumptionMap>
- <Entry engineSpeed="600.10" torque="200.00" fuelConsumption="3358.00" />
- <Entry engineSpeed="600.10" torque="400.00" fuelConsumption="5498.00" />
- <Entry engineSpeed="600.10" torque="600.00" fuelConsumption="8101.00" />
- <Entry engineSpeed="600.10" torque="800.00" fuelConsumption="10014.00" />
- <Entry engineSpeed="600.10" torque="1000.00" fuelConsumption="12071.00" />
- <Entry engineSpeed="600.10" torque="1200.00" fuelConsumption="14201.00" />
- <Entry engineSpeed="560.10" torque="-149.00" fuelConsumption="0.00" />
- <Entry engineSpeed="560.10" torque="0.00" fuelConsumption="1256.00" />
- <Entry engineSpeed="560.10" torque="200.00" fuelConsumption="3197.00" />
- <Entry engineSpeed="560.10" torque="400.00" fuelConsumption="5295.00" />
<Entry engineSpeed="560.10" torque="600.00" fuelConsumption="7615.00" />
<Entry engineSpeed="560.10" torque="800.00" fuelConsumption="9375.00" />
<Entry engineSpeed="560.10" torque="1000.00" fuelConsumption="11239.00" />
<Entry engineSpeed="560.10" torque="1180.00" fuelConsumption="12869.00" />
+ <Entry engineSpeed="560.10" torque="-149.00" fuelConsumption="0.00" />
+ <Entry engineSpeed="560.10" torque="0.00" fuelConsumption="1256.00" />
+ <Entry engineSpeed="560.10" torque="200.00" fuelConsumption="3197.00" />
+ <Entry engineSpeed="560.10" torque="400.00" fuelConsumption="5295.00" />
+
<Entry engineSpeed="600.10" torque="-148.00" fuelConsumption="0.00" />
<Entry engineSpeed="600.10" torque="0.00" fuelConsumption="1459.00" />
+ <Entry engineSpeed="600.10" torque="200.00" fuelConsumption="3358.00" />
+ <Entry engineSpeed="600.10" torque="400.00" fuelConsumption="5498.00" />
+ <Entry engineSpeed="600.10" torque="600.00" fuelConsumption="8101.00" />
+ <Entry engineSpeed="600.10" torque="800.00" fuelConsumption="10014.00" />
+ <Entry engineSpeed="600.10" torque="1000.00" fuelConsumption="12071.00" />
+ <Entry engineSpeed="600.10" torque="1200.00" fuelConsumption="14201.00" />
<Entry engineSpeed="600.10" torque="1282.00" fuelConsumption="15304.00" />
<Entry engineSpeed="800.10" torque="-149.00" fuelConsumption="0.00" />
<Entry engineSpeed="800.10" torque="0.00" fuelConsumption="1879.00" />
@@ -449,8 +334,18 @@
<Entry engineSpeed="800.10" torque="600.00" fuelConsumption="10059.00" />
<Entry engineSpeed="800.10" torque="800.00" fuelConsumption="13086.00" />
<Entry engineSpeed="800.10" torque="1000.00" fuelConsumption="16015.00" />
- <Entry engineSpeed="1000.10" torque="2200.00" fuelConsumption="44120.00" />
- <Entry engineSpeed="1000.10" torque="2300.00" fuelConsumption="46836.00" />
+ <Entry engineSpeed="800.10" torque="1200.00" fuelConsumption="19239.00" />
+ <Entry engineSpeed="800.10" torque="1400.00" fuelConsumption="22426.00" />
+ <Entry engineSpeed="800.10" torque="1600.00" fuelConsumption="25483.00" />
+ <Entry engineSpeed="800.10" torque="1791.00" fuelConsumption="28905.00" />
+ <Entry engineSpeed="1000.10" torque="-160.00" fuelConsumption="0.00" />
+ <Entry engineSpeed="1000.10" torque="0.00" fuelConsumption="2865.00" />
+ <Entry engineSpeed="1000.10" torque="200.00" fuelConsumption="5963.00" />
+ <Entry engineSpeed="1000.10" torque="400.00" fuelConsumption="9198.00" />
+ <Entry engineSpeed="1000.10" torque="600.00" fuelConsumption="12354.00" />
+ <Entry engineSpeed="1000.10" torque="800.00" fuelConsumption="15965.00" />
+ <Entry engineSpeed="1000.10" torque="1000.00" fuelConsumption="19864.00" />
+
<Entry engineSpeed="1200.10" torque="-179.00" fuelConsumption="0.00" />
<Entry engineSpeed="1200.10" torque="0.00" fuelConsumption="3307.00" />
<Entry engineSpeed="1200.10" torque="200.00" fuelConsumption="6897.00" />
@@ -474,22 +369,6 @@
<Entry engineSpeed="1400.10" torque="1000.00" fuelConsumption="27093.00" />
<Entry engineSpeed="1400.10" torque="1200.00" fuelConsumption="32536.00" />
<Entry engineSpeed="1400.10" torque="1400.00" fuelConsumption="37746.00" />
- <Entry engineSpeed="800.10" torque="1200.00" fuelConsumption="19239.00" />
- <Entry engineSpeed="800.10" torque="1400.00" fuelConsumption="22426.00" />
- <Entry engineSpeed="800.10" torque="1600.00" fuelConsumption="25483.00" />
- <Entry engineSpeed="800.10" torque="1791.00" fuelConsumption="28905.00" />
- <Entry engineSpeed="1000.10" torque="-160.00" fuelConsumption="0.00" />
- <Entry engineSpeed="1000.10" torque="0.00" fuelConsumption="2865.00" />
- <Entry engineSpeed="1000.10" torque="200.00" fuelConsumption="5963.00" />
- <Entry engineSpeed="1000.10" torque="400.00" fuelConsumption="9198.00" />
- <Entry engineSpeed="1000.10" torque="600.00" fuelConsumption="12354.00" />
- <Entry engineSpeed="1000.10" torque="800.00" fuelConsumption="15965.00" />
- <Entry engineSpeed="1000.10" torque="1000.00" fuelConsumption="19864.00" />
- <Entry engineSpeed="1000.10" torque="1200.00" fuelConsumption="23530.00" />
- <Entry engineSpeed="1000.10" torque="1400.00" fuelConsumption="27202.00" />
- <Entry engineSpeed="1000.10" torque="1600.00" fuelConsumption="31165.00" />
- <Entry engineSpeed="1000.10" torque="1800.00" fuelConsumption="35103.00" />
- <Entry engineSpeed="1000.10" torque="2000.00" fuelConsumption="39360.00" />
<Entry engineSpeed="1400.10" torque="1600.00" fuelConsumption="43194.00" />
<Entry engineSpeed="1400.10" torque="1800.00" fuelConsumption="49453.00" />
<Entry engineSpeed="1400.10" torque="2000.00" fuelConsumption="55830.00" />
@@ -537,9 +416,17 @@
<Entry engineSpeed="2100.10" torque="800.00" fuelConsumption="35717.00" />
<Entry engineSpeed="2100.10" torque="1000.00" fuelConsumption="45643.00" />
<Entry engineSpeed="2100.10" torque="1100.00" fuelConsumption="50653.00" />
+ <Entry engineSpeed="1000.10" torque="1200.00" fuelConsumption="23530.00" />
+ <Entry engineSpeed="1000.10" torque="1400.00" fuelConsumption="27202.00" />
+ <Entry engineSpeed="1000.10" torque="1600.00" fuelConsumption="31165.00" />
+ <Entry engineSpeed="1000.10" torque="1800.00" fuelConsumption="35103.00" />
+ <Entry engineSpeed="1000.10" torque="2000.00" fuelConsumption="39360.00" />
+ <Entry engineSpeed="1000.10" torque="2200.00" fuelConsumption="44120.00" />
+ <Entry engineSpeed="1000.10" torque="2300.00" fuelConsumption="46836.00" />
</FuelConsumptionMap>
</Fuel>
</Mode>
+
</v2.0:Data>
<Signature>
<di:Reference URI="#ENG-gooZah3D">
@@ -548,7 +435,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>ttvMnXYdQrEAu47QEO2AKyfzOdPSlcdsR/MrmH/mX+k=</di:DigestValue>
+ <di:DigestValue>sYOwPn3VlMw71bjQFfACuekdAjZ8QRT3S8c71w7810A=</di:DigestValue>
</di:Reference>
</Signature>
</tns:Engine>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml
index 2695fd8d6f9fb0ae8f870559546a01d9130e9b29..0f8d9961b6baee6a048624f48c01be2efc672c03 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml
@@ -10,52 +10,68 @@
<TransmissionType>APT-N</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Gear number="2">
- <Ratio>11.640</Ratio>
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
<TorqueLossMap>
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
</TorqueLossMap>
</Gear>
- <Gear number="1">
- <Ratio>14.930</Ratio>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- </TorqueLossMap>
- </Gear>
<Gear number="3">
<Ratio>9.020</Ratio>
<TorqueLossMap>
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
-
- </TorqueLossMap>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
</Gear>
+
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
+ </Gear>
+
</v2.10.1:Gears>
</v2.0:Data>
<v2.0:Signature>
@@ -65,7 +81,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>hRzWfx3/El/LwEtP86Utm3dgBAF6CagrpEREsca7+/0=</di:DigestValue>
+ <di:DigestValue>lYoUAB6Xob1azFaCPJBLK1HIT5Jr0K24H2jJec3r5BM=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
index e80620ce06ccf0a909f75e19fd8b2c69dcedfa37..c253040d7f5666bba59dd5324bca290fd5dd13d8 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
@@ -12,56 +12,77 @@
<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">
+ <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="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="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <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="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="0.00" inputTorque="0.30" torqueLoss="5.30" />
- <Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
- </TorqueLossMap>
+
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1200</MaxTorque>
+ <MaxSpeed>110</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+
+ <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="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" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.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="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+ <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <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="780.10" torqueLoss="31.10" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+
+ </TorqueLossMap>
</Gear>
</v2.10.1:Gears>
</v2.0:Data>
@@ -72,7 +93,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>LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=</di:DigestValue>
+ <di:DigestValue>BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml
index 1f6f28a11c8d2005bc10dc7b342c84ca6d90a867..300c2a12b459fd9f905728a38d50309a9accd054 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml
@@ -10,38 +10,30 @@
<TransmissionType>IHPC Type 1</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Gear number="5">
- <Ratio>5.640</Ratio>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- </TorqueLossMap>
- </Gear>
- <Gear number="3">
- <Ratio>9.020</Ratio>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- </TorqueLossMap>
- </Gear>
- <Gear number="1">
+ <Gear number="1">
<Ratio>14.930</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
@@ -51,58 +43,151 @@
<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
+
<Gear number="4">
<Ratio>7.040</Ratio>
<TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
- <Gear number="2">
- <Ratio>11.640</Ratio>
+
+ <Gear number="10">
+ <Ratio>1.600</Ratio>
<TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
+
+ <Gear number="7">
+ <Ratio>3.390</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="5">
+ <Ratio>5.640</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="12">
+ <Ratio>1.000</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00" />
+
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
+ <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
+ </Gear>
<Gear number="6">
<Ratio>4.400</Ratio>
<TorqueLossMap>
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- </TorqueLossMap>
+
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ </TorqueLossMap>
</Gear>
- <Gear number="7">
- <Ratio>3.390</Ratio>
+
+ <Gear number="8">
+ <Ratio>2.650</Ratio>
<TorqueLossMap>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
@@ -111,28 +196,42 @@
<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
- <Gear number="9">
- <Ratio>2.050</Ratio>
+ <Gear number="3">
+ <Ratio>9.020</Ratio>
<TorqueLossMap>
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
</TorqueLossMap>
</Gear>
- <Gear number="10">
- <Ratio>1.600</Ratio>
+
+
+ <Gear number="9">
+ <Ratio>2.050</Ratio>
<TorqueLossMap>
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
@@ -143,53 +242,35 @@
<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
- <Gear number="8">
- <Ratio>2.650</Ratio>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- </TorqueLossMap>
- </Gear>
- <Gear number="12">
- <Ratio>1.000</Ratio>
+
+ <Gear number="11">
+ <Ratio>1.280</Ratio>
<TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00" />
- <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
- <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00" />
+
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+ <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
- <Gear number="11">
- <Ratio>1.280</Ratio>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- </TorqueLossMap>
- </Gear>
+
+
+
</v2.10.1:Gears>
</v2.0:Data>
<v2.0:Signature>
@@ -199,7 +280,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>XZCluPiG05mOAj5rTjTllCWbhCTEYVxCbE940ck3XsA=</di:DigestValue>
+ <di:DigestValue>QVPf1HhUClM3JoxJHTVqcp2gPXMiqaZ5vFTVyjnG1Co=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Gearbox>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml
index a4056e8ab9370705823644303c37c67c954654de..db417aa85235533baba6e91f5923dfc4e788234f 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml
@@ -9,10 +9,10 @@
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<RetarderLossMap>
+ <Entry retarderSpeed="1001.00" torqueLoss="10.00" />
<Entry retarderSpeed="1000.00" torqueLoss="10.00" />
+ <Entry retarderSpeed="1005.00" torqueLoss="100.00" />
<Entry retarderSpeed="0.00" torqueLoss="10.00" />
- <Entry retarderSpeed="1000.00" torqueLoss="100.00" />
- <Entry retarderSpeed="0.00" torqueLoss="100.00" />
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
@@ -22,7 +22,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>uMH8HJlAtm/SNaj8QOhuX/cBNXTHAZ1la3oEXI42bls=</di:DigestValue>
+ <di:DigestValue>fo5vyZY6IeQgfFpGmNV49YdfJlcEsGycJoNa3qqVChM=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:Retarder>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml
index cbd0891abc562d21c301b15a4a910845878dff8b..43c7c70df419a90943f7a51ae09a0d2d2c6fd313 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml
@@ -9,10 +9,10 @@
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<Characteristics>
- <Entry speedRatio='0.0000' torqueRatio='1.75' inputTorqueRef='367.68'/>
+ <Entry speedRatio='0.0001' torqueRatio='1.75' inputTorqueRef='367.68'/>
+ <Entry speedRatio='0.1003' torqueRatio='1.71' inputTorqueRef='355.43'/>
<Entry speedRatio='0.0000' torqueRatio='1.80' inputTorqueRef='367.65'/>
- <Entry speedRatio='0.1000' torqueRatio='1.71' inputTorqueRef='355.43'/>
- <Entry speedRatio='0.1000' torqueRatio='1.72' inputTorqueRef='355.42'/>
+ <Entry speedRatio='0.1002' torqueRatio='1.72' inputTorqueRef='355.42'/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
@@ -22,7 +22,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>fw0SEYiGgZbq0YvrICrfQYgsDJTbz/s66w7EM2kezio=</di:DigestValue>
+ <di:DigestValue>mxPXYmGbF6eUzjxqAp9KXjy96DzMCGm5Xq9WLvNHwVA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</tns:TorqueConverter>
diff --git a/VectoCommon/VectoHashingTest/VectoHashSortTest.cs b/VectoCommon/VectoHashingTest/VectoHashSortTest.cs
index 8e0c36bbb9d3d87d6042970e546e1e05ee8ae4db..769de14614f016bc73063b2f5c31ae68543d7f34 100644
--- a/VectoCommon/VectoHashingTest/VectoHashSortTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoHashSortTest.cs
@@ -1,103 +1,79 @@
using System.IO;
-using Ninject;
using NUnit.Framework;
using TUGraz.VectoCommon.Hashing;
-using TUGraz.VectoCore;
-using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoHashing;
namespace VectoHashingTest
{
public class VectoHashSortTest
{
- private IXMLInputDataReader xmlInputReader;
- private IKernel _kernel;
private const string UnsortedComponentPath = @"Testdata\XML\Sort\Component\Unsorted\";
- private const string SortedComponentPath = @"Testdata\XML\Sort\Component\Sorted\";
+ private const string SortedComponentPath = @"Testdata\XML\Sort\Component\Sorted\";
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
-
- _kernel = new StandardKernel(new VectoNinjectModule());
- xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
-
- [TestCase(SortedComponentPath + "TrailerAerodynamicDevice.xml")]
- public void TestHash(string filePath)
- {
- var loadedFile = VectoHash.Load(filePath);
- var hash = loadedFile.ComputeHash(VectoComponents.CertifiedAeroReduction);
- }
-
- [TestCase("ttvMnXYdQrEAu47QEO2AKyfzOdPSlcdsR/MrmH/mX+k=", SortedComponentPath + "Engine.xml"),
- TestCase("ttvMnXYdQrEAu47QEO2AKyfzOdPSlcdsR/MrmH/mX+k=", UnsortedComponentPath + "Engine.xml")]
+
+ [TestCase("sYOwPn3VlMw71bjQFfACuekdAjZ8QRT3S8c71w7810A=", SortedComponentPath + "Engine.xml"),
+ TestCase("sYOwPn3VlMw71bjQFfACuekdAjZ8QRT3S8c71w7810A=", UnsortedComponentPath + "Engine.xml")]
public void TestEngineHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Engine));
}
-
- [TestCase("LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=", SortedComponentPath + "Gearbox_FWD.xml"),
- TestCase("LrsR3WfAkFia53dMiwGEIeAiA+9bdWvaS6x7dIL9yiQ=", UnsortedComponentPath + "Gearbox_FWD.xml"),
- TestCase("hRzWfx3/El/LwEtP86Utm3dgBAF6CagrpEREsca7+/0=", SortedComponentPath + "Gearbox_APT-N.xml"),
- TestCase("hRzWfx3/El/LwEtP86Utm3dgBAF6CagrpEREsca7+/0=", UnsortedComponentPath + "Gearbox_APT-N.xml"),
- TestCase("XZCluPiG05mOAj5rTjTllCWbhCTEYVxCbE940ck3XsA=", SortedComponentPath + "Gearbox_IHPC.xml"),
- TestCase("XZCluPiG05mOAj5rTjTllCWbhCTEYVxCbE940ck3XsA=", UnsortedComponentPath + "Gearbox_IHPC.xml")]
- public void TestGearboxComponentHashSort(string expectedHash, string filePath)
+ [TestCase("lYoUAB6Xob1azFaCPJBLK1HIT5Jr0K24H2jJec3r5BM=", SortedComponentPath + "Gearbox_APT-N.xml"),
+ TestCase("lYoUAB6Xob1azFaCPJBLK1HIT5Jr0K24H2jJec3r5BM=", UnsortedComponentPath + "Gearbox_APT-N.xml")]
+ public void TestGearboxAPT_NComponentHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Gearbox));
}
- [TestCase("og41nROicUT1OoesUTZ9/uoroCUbqlTo7nKmCRYQap4=", SortedComponentPath + "Axlegear.xml"),
- TestCase("og41nROicUT1OoesUTZ9/uoroCUbqlTo7nKmCRYQap4=", UnsortedComponentPath + "Axlegear.xml")]
- public void TestAxlegearComponentHashSort(string expectedHash, string filePath)
+ [TestCase("BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=", SortedComponentPath + "Gearbox_FWD.xml"),
+ TestCase("BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=", UnsortedComponentPath + "Gearbox_FWD.xml")]
+ public void TestGearboxFWDComponentHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
- Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Axlegear));
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Gearbox));
}
-
- [TestCase("uMH8HJlAtm/SNaj8QOhuX/cBNXTHAZ1la3oEXI42bls=", SortedComponentPath + "Retarder.xml"),
- TestCase("uMH8HJlAtm/SNaj8QOhuX/cBNXTHAZ1la3oEXI42bls=", UnsortedComponentPath + "Retarder.xml")]
- public void TestRetarderComponentHashSort(string expectedHash, string filePath)
+ [TestCase("QVPf1HhUClM3JoxJHTVqcp2gPXMiqaZ5vFTVyjnG1Co=", SortedComponentPath + "Gearbox_IHPC.xml"),
+ TestCase("QVPf1HhUClM3JoxJHTVqcp2gPXMiqaZ5vFTVyjnG1Co=", UnsortedComponentPath + "Gearbox_IHPC.xml")]
+ public void TestGearboxIHPCComponentHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
- Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Retarder));
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Gearbox));
}
-
-
- [TestCase("o5/ZtRQ8nAui3rhM6adKiHVU9jRync6f1cDlBcnyOg4=", SortedComponentPath + "TorqueConverter.xml"),
- TestCase("o5/ZtRQ8nAui3rhM6adKiHVU9jRync6f1cDlBcnyOg4=", UnsortedComponentPath + "TorqueConverter.xml")]
- public void TestTorqueConverterComponentHashSort(string expectedHash, string filePath)
+
+ [TestCase("MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=", SortedComponentPath + "Axlegear.xml"),
+ TestCase("MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=", UnsortedComponentPath + "Axlegear.xml")]
+ public void TestAxlegearComponentHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
- Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.TorqueConverter));
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Axlegear));
}
-
-
- [TestCase("FGaItzPcx1qGytVlroFp+PU9rzsaQWRWnxmIspkqCRM=", SortedComponentPath + "Angledrive.xml"),
- TestCase("FGaItzPcx1qGytVlroFp+PU9rzsaQWRWnxmIspkqCRM=", UnsortedComponentPath + "Angledrive.xml")]
+
+ [TestCase("lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=", SortedComponentPath + "Angledrive.xml"),
+ TestCase("lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=", UnsortedComponentPath + "Angledrive.xml")]
public void TestAngledriveComponentHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Angledrive));
}
-
-
- [TestCase("NiyH2Xp0rQswwXIOf52Jm0wvK4Yc2/PL/T+zQCWQGFo=", SortedComponentPath + "ADC.xml"),
- TestCase("NiyH2Xp0rQswwXIOf52Jm0wvK4Yc2/PL/T+zQCWQGFo=", UnsortedComponentPath + "ADC.xml")]
+
+ [TestCase("HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=", SortedComponentPath + "ADC.xml"),
+ TestCase("HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=", UnsortedComponentPath + "ADC.xml")]
public void TestADCHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ADC));
}
- [TestCase("tam1LGpdznHGFGo+rp0WVr0/6+F2yU2Kv4G4tYvAe+Y=", SortedComponentPath + "BatterySystem_1.xml"),
- TestCase("tam1LGpdznHGFGo+rp0WVr0/6+F2yU2Kv4G4tYvAe+Y=", UnsortedComponentPath + "BatterySystem_1.xml")]
+ [TestCase("MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=", SortedComponentPath + "BatterySystem_1.xml"),
+ TestCase("MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=", UnsortedComponentPath + "BatterySystem_1.xml")]
public void TestBatterySystemHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
@@ -112,29 +88,62 @@ namespace VectoHashingTest
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.CapacitorSystem));
}
- [TestCase("X5dgavua/V/jzBQeJ6SxZXsXm3i1jruL48LedzZ5IxU=", SortedComponentPath + "ElectricMachineSystem-IHPC_1.xml"),
- TestCase("X5dgavua/V/jzBQeJ6SxZXsXm3i1jruL48LedzZ5IxU=", UnsortedComponentPath + "ElectricMachineSystem-IHPC_1.xml"),
- TestCase("wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=", SortedComponentPath + "ElectricMachineSystem_1.xml"),
- TestCase("wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=", UnsortedComponentPath + "ElectricMachineSystem_1.xml"),
- TestCase("CunnDxsiE9kciX+v9oeEGADZpEc88NtfMtmrHyJkCQ0=", SortedComponentPath + "ElectricMachineSystem_StdValues.xml"),
- TestCase("CunnDxsiE9kciX+v9oeEGADZpEc88NtfMtmrHyJkCQ0=", UnsortedComponentPath + "ElectricMachineSystem_StdValues.xml")]
+ [TestCase("6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=", SortedComponentPath + "ElectricMachineSystem-IHPC_1.xml"),
+ TestCase("6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=", UnsortedComponentPath + "ElectricMachineSystem-IHPC_1.xml")]
+ public void TestElectricMachineIHPCHashSort(string expectedHash, string filePath)
+ {
+ var loadedFile = VectoHash.Load(filePath);
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ElectricMachineSystem));
+ }
+
+ [TestCase("wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=", SortedComponentPath + "ElectricMachineSystem_1.xml"),
+ TestCase("wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=", UnsortedComponentPath + "ElectricMachineSystem_1.xml")]
public void TestElectricMachineHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ElectricMachineSystem));
}
+ [TestCase("qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=", SortedComponentPath + "ElectricMachineSystem_StdValues.xml"),
+ TestCase("qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=", UnsortedComponentPath + "ElectricMachineSystem_StdValues.xml")]
+ public void TestElectricMachineStdValuesHashSort(string expectedHash, string filePath)
+ {
+ var loadedFile = VectoHash.Load(filePath);
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ElectricMachineSystem));
+ }
[TestCase("3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=", SortedComponentPath + "IEPC_1.xml"),
- TestCase("3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=", UnsortedComponentPath + "IEPC_1.xml"),
- TestCase("BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=", SortedComponentPath + "IEPC_StdValues.xml"),
- TestCase("BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=", UnsortedComponentPath + "IEPC_StdValues.xml")]
+ TestCase("3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=", UnsortedComponentPath + "IEPC_1.xml")]
public void TestIEPCHashSort(string expectedHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.IEPC));
}
+
+ [TestCase("BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=", SortedComponentPath + "IEPC_StdValues.xml"),
+ TestCase("BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=", UnsortedComponentPath + "IEPC_StdValues.xml")]
+ public void TestIEPCStdHashSort(string expectedHash, string filePath)
+ {
+ var loadedFile = VectoHash.Load(filePath);
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.IEPC));
+ }
+ [TestCase("fo5vyZY6IeQgfFpGmNV49YdfJlcEsGycJoNa3qqVChM=", SortedComponentPath + "Retarder.xml"),
+ TestCase("fo5vyZY6IeQgfFpGmNV49YdfJlcEsGycJoNa3qqVChM=", UnsortedComponentPath + "Retarder.xml")]
+ public void TestRetarderComponentHashSort(string expectedHash, string filePath)
+ {
+ var loadedFile = VectoHash.Load(filePath);
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Retarder));
+ }
+
+ [TestCase("mxPXYmGbF6eUzjxqAp9KXjy96DzMCGm5Xq9WLvNHwVA=", SortedComponentPath + "TorqueConverter.xml"),
+ TestCase("mxPXYmGbF6eUzjxqAp9KXjy96DzMCGm5Xq9WLvNHwVA=", UnsortedComponentPath + "TorqueConverter.xml")]
+ public void TestTorqueConverterComponentHashSort(string expectedHash, string filePath)
+ {
+ var loadedFile = VectoHash.Load(filePath);
+ Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.TorqueConverter));
+ }
+
[TestCase("3YVNlu+1souB/4IwePLPoBwhiJormfqMNRxQaZ75wvM=", SortedComponentPath + "TrailerAerodynamicDevice.xml"),
TestCase("3YVNlu+1souB/4IwePLPoBwhiJormfqMNRxQaZ75wvM=", UnsortedComponentPath + "TrailerAerodynamicDevice.xml")]
public void TestTrailerAerodynamicDeviceSort(string expectedHash, string filePath)
@@ -142,6 +151,5 @@ namespace VectoHashingTest
var loadedFile = VectoHash.Load(filePath);
Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.CertifiedAeroReduction));
}
-
}
}