added sort method for engine input data

VectoCommon/VectoHashing/Resources/XSLT/SortInputData.xslt

@@ -116,7 +116,6 @@
 		</xsl:element>
 	</xsl:template>
 	
-
 	<xsl:template match="*[local-name()='MaxTorqueCurve']">
 		<xsl:element name="{local-name()}">
 			<xsl:apply-templates select="@*"/>
@@ -168,7 +167,15 @@
 		<xsl:element name="{local-name()}">
 			<xsl:apply-templates select="@*"/>
 			
-			<xsl:apply-templates select="./*[not(local-name()='DragCurve') and not(local-name()='Conditioning') and not(local-name()='VoltageLevel')]"/>
+			<xsl:apply-templates select="./*[not(local-name()='DragCurve') 
+			and not(local-name()='Conditioning') 
+			and not(local-name()='VoltageLevel')
+			and not(local-name()='Mode')]"/>
+	
+			<xsl:for-each select="*[local-name()='Mode']">
+				<xsl:sort data-type="number" select="*[local-name() = 'IdlingSpeed']/text()" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>		
 			
 			<xsl:for-each select="*[local-name()='VoltageLevel']">
 				<xsl:sort data-type="number" select="*[local-name() = 'Voltage']/text()" order="ascending"/>
@@ -184,7 +191,8 @@
 				<xsl:apply-templates select="."/>
 			</xsl:for-each>			
 		</xsl:element>
-	</xsl:template>	
+	</xsl:template>
+				
 	<xsl:template match="*[local-name()='OCV']">
 		<xsl:element name="{local-name()}">
 			<xsl:apply-templates select="@*"/>
@@ -224,6 +232,15 @@
 				<xsl:apply-templates select="."/>
 			</xsl:for-each>
 		</xsl:element>
+	</xsl:template>	
+	<xsl:template match="*[local-name()='Mode']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="text" select="@type" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
 	</xsl:template>
 	
 </xsl:transform>

VectoCommon/VectoHashingTest/VectoHashSortTest.cs

@@ -22,6 +22,15 @@ namespace VectoHashingTest
 			xmlInputReader = _kernel.Get<IXMLInputDataReader>();
 		}
 
+
+		[TestCase("ttvMnXYdQrEAu47QEO2AKyfzOdPSlcdsR/MrmH/mX+k=", @"Testdata\XML\Sort\Engine.xml"),
+		TestCase("ttvMnXYdQrEAu47QEO2AKyfzOdPSlcdsR/MrmH/mX+k=", @"Testdata\XML\Sort\Engine_unsorted.xml")]
+		public void TestEngineHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Engine));
+		}
+		
 		
 		[TestCase("NiyH2Xp0rQswwXIOf52Jm0wvK4Yc2/PL/T+zQCWQGFo=", @"Testdata\XML\Sort\ADC_unsorted.xml")]
 		public void TestADCHashSort(string expectedHash, string filePath)

VectoCommon/VectoHashingTest/VectoHashingTest.csproj

@@ -105,6 +105,12 @@
     <Content Include="Testdata\XML\Sort\ElectricMachineSystem_StdValues_unsorted.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Testdata\XML\Sort\Engine.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Testdata\XML\Sort\Engine_unsorted.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Testdata\XML\Sort\Gearbox_APT-N_unsorted.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>