Merge pull request #830 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:master to master

* commit 'f38fda7a':
  Compiling new VECTO Release (3.3.7.1964)
  adapt expected values in testcase
  adapt testcase so that all runs are created
  fix typo

Documentation/User Manual/6-changelog/changelog.md

 #Changelog
 
+**VECTO 3.3.7**
+
+*** Build 1964 (2020-05-18) OFFICIAL RELEASE***
+
+- Bugfixes
+    * [VECTO-1254] - Hashing method does not ignore certain XML attributes
+    * [VECTO-1259] - Mission profile weighting factors for vehicles of group 16 are not correct
+
+
 **VECTO 3.3.6**
 
 ***Build 1916 (2020-03-31) OFFICIAL RELEASE***

HashingTool/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.1916")]
-[assembly: AssemblyFileVersion("0.2.0.1916")]
+[assembly: AssemblyVersion("0.2.0.1964")]
+[assembly: AssemblyFileVersion("0.2.0.1964")]

VectoCommon/VectoCommon/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.6.1916")]
-[assembly: AssemblyFileVersion("3.3.6.1916")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.7.1964")]
+[assembly: AssemblyFileVersion("3.3.7.1964")]
\ No newline at end of file

VectoCommon/VectoHashing/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("1.2.0.1916")]
-[assembly: AssemblyFileVersion("1.2.0.1916")]
+[assembly: AssemblyVersion("1.2.0.1964")]
+[assembly: AssemblyFileVersion("1.2.0.1964")]

VectoConsole/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.6.1916")]
-[assembly: AssemblyFileVersion("3.3.6.1916")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.7.1964")]
+[assembly: AssemblyFileVersion("3.3.7.1964")]
\ No newline at end of file

VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs

@@ -200,7 +200,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 		protected internal override void DoWriteReport()
 		{
 			var sumWeightinFactors = Missions.Values.Sum(x => x.ResultEntry.Values.Sum(y => y.WeightingFactor));
-			if (!sumWeightinFactors.IsEqual(0) || !sumWeightinFactors.IsEqual(1)) {
+			if (!sumWeightinFactors.IsEqual(0) && !sumWeightinFactors.IsEqual(1)) {
 				throw new VectoException("Mission Profile Weighting factors do not sum up to 1!");
 			}
 			foreach (var result in Missions.OrderBy(m => m.Key)) {

VectoCore/VectoCore/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.6.1916")]
-[assembly: AssemblyFileVersion("3.3.6.1916")]
+[assembly: AssemblyVersion("3.3.7.1964")]
+[assembly: AssemblyFileVersion("3.3.7.1964")]

VectoCore/VectoCore/Utils/VectoVersionCore.cs

@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Utils
 		public static string VersionNumber
 		{
 			get {
-				return "3.3.6.1916" + SUFFIX;
+				return "3.3.7.1964" + SUFFIX;
 			}
 		}
 

VectoCore/VectoCore/VersionNumber.t4

@@ -6,6 +6,6 @@ int GetBuildNumber()
 
 string GetVectoCoreVersionNumber()
 {
-	return "3.3.6." + GetBuildNumber();
+	return "3.3.7." + GetBuildNumber();
 }
 #>
\ No newline at end of file

VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs

@@ -95,7 +95,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 			var inputDataProvider = xmlInputReader.CreateDeclaration(modified);
 			
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputDataProvider, null, validate: false);
-			var first = factory.SimulationRuns().First();
+			var first = factory.SimulationRuns().ToArray().First();
 
 			var modData = ((ModalDataContainer)first.GetContainer().ModalData).Data;
 			first.Run();

VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs

@@ -2154,7 +2154,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 
 			TestCase(WeightingGroup.Group11, 0, 0, 0.15, 0.35, 0, 0, 0, 0, 0.15, 0.35, TestName = "TestMissionProfileWeights Grp 11"),
 			TestCase(WeightingGroup.Group12, 0, 0, 0.21, 0.49, 0, 0, 0, 0, 0.09, 0.21, TestName = "TestMissionProfileWeights Grp 12"),
-			TestCase(WeightingGroup.Group16, 0, 0, 0.15, 0.35, 0, 0, 0, 0, 0.15, 0.35, TestName = "TestMissionProfileWeights Grp 16"),
+			TestCase(WeightingGroup.Group16, 0, 0, 0, 0, 0, 0, 0, 0, 0.3, 0.7, TestName = "TestMissionProfileWeights Grp 16"),
 
 		]
 		public void TestMissionProfileWeights(WeightingGroup group, double eLhLow, double eLhRef, double eRdLow, double eRdRef, double eUdLow, double eUdRef, double eMuLow = 0, double eMuRef = 0, double eCoLow = 0, double eCoRef = 0, double elhEmsLow = 0, double eLhEmsRef = 0, double eRdEmsLow = 0, double eRdEmsRef = 0)