Merge pull request #849 in VECTO/vecto-sim from develop to master

* commit '7e3cdbde':
  adding release report
  create new build: update version number, update changelog, update release notes
  introduce new field with CdxA from input. required to write correct CdxA value to MRF
  set correct engine correction factor for VTP simulation,write CO2 values in VTP report (fix)
  remove testcase which is no longer applicable: steering pump power demand on LH cycle for group1 vehicles is provided for VTP missions
  adapt testcases for parallel execution
  format of driving cycle for better readability
  fix cycle gearbox for VTP with TC in 1st and 2nd gear
  fix startgear preprocessing for vtp cycle with TC in 1st and 2nd gear
  adding testcase for VTP on a vehicle with TC in 1st and 2nd gear
  adding missing file, updating build script to new visual stuio version
  use first mission as reference for VTP simulation
  adding files to project
  add SP power demand for group1 and group3 vehicles on long haul cycle (for VTP simulations)
  adding testcase for group 3 vehicle vtp simulation
  adapt testcase VTP with PTO declaration mode
  adding pto consumer and pto transmission losses in VTP simulations
  adding PTO columns to mod container in VTP simulation
  adding testcase Declaration VTP simulation run with PTO
  adding annotations to allow parallel execution of nunig tests where possible

Build/TextPreProcessing.targets

@@ -5,6 +5,7 @@
 			<VersionTemplates Include="$(ProjectDir)**\*.tt"/>
 		</ItemGroup>
 		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
-		<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
+		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
+		<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
 	</Target>
 </Project>
\ No newline at end of file

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

 #Changelog
 
+**VECTO-3.3.9**
+
+***Build 2147 (2020-11-17) RELEASE CANDIDATE***
+
+- Bugfixes
+    * [VECTO-1331] - VTP Mode does not function for vehicles of group 3
+    * [VECTO-1355] - VTP Simulation Abort
+    * [VECTO-1356] - PTO Losses not considered in VTP simulation
+    * [VECTO-1361] - Torque Converter in use for the First and Second Gear VTP file does not allow for this
+    * [VECTO-1372] - Deviation of CdxA Input vs. Output for HDV16
+    * [VECTO-1374] - VECTO VTP error
+
+- Improvements
+    * [VECTO-1360] - make unit tests execute in parallel
+
+
 **VECTO-3.3.8**
 
 ***Build 2052 (2020-08-14) OFFICIAL RELEASE***

Documentation/User Manual/help.html

@@ -7621,6 +7621,23 @@ CycleTime,UnknownCycleName,3600</code></pre>
 </div>
 <div id="changelog" class="section level1">
 <h1>Changelog</h1>
+<p><strong>VECTO-3.3.9</strong></p>
+<p><strong><em>Build 2147 (2020-11-17) RELEASE CANDIDATE</em></strong></p>
+<ul>
+<li>Bugfixes
+<ul>
+<li>[VECTO-1331] - VTP Mode does not function for vehicles of group 3</li>
+<li>[VECTO-1355] - VTP Simulation Abort</li>
+<li>[VECTO-1356] - PTO Losses not considered in VTP simulation</li>
+<li>[VECTO-1361] - Torque Converter in use for the First and Second Gear VTP file does not allow for this</li>
+<li>[VECTO-1372] - Deviation of CdxA Input vs. Output for HDV16</li>
+<li>[VECTO-1374] - VECTO VTP error</li>
+</ul></li>
+<li>Improvements
+<ul>
+<li>[VECTO-1360] - make unit tests execute in parallel</li>
+</ul></li>
+</ul>
 <p><strong>VECTO-3.3.8</strong></p>
 <p><strong><em>Build 2052 (2020-08-14) OFFICIAL RELEASE</em></strong></p>
 <ul>

HashingTool/Properties/Version.cs

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

README.txt

@@ -14,6 +14,7 @@ or
 
 "c:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" Vecto.sln /t:Build /p:Configuration=Debug
 
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\amd64\MSBuild.exe"
 
 Option 2: Load the solution file in Visual Studio and compile VECTO.
 

Tools/GraphDrawer/Program.cs

@@ -29,42 +29,43 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
-using System;
-using System.Linq;
-using TUGraz.VectoCore.Tests.Utils;
-
-namespace GraphDrawer
-{
-    internal class Program
-    {
-        private const string HELP = @"
-Tool for plotting graphs comparing Vecto 2.2 and Vecto 3
-
---split <leng> ... split input into parts of length <len> (in m), only distance output
-
-";
-
-        private static void Main(string[] args)
-        {
-            if (args.Contains("--split")) {
+using System;
+using System.Linq;
+using TUGraz.VectoCore.Tests.Utils;
+
+namespace GraphDrawer
+{
+    internal class Program
+    {
+        private const string HELP = @"
+Tool for plotting graphs comparing Vecto 2.2 and Vecto 3
+
+--split <leng> ... split input into parts of length <len> (in m), only distance output
+
+";
+
+        private static void Main(string[] args)
+        {
+            var graphWriter = new GraphWriter();
+			if (args.Contains("--split")) {
 				Console.Error.WriteLine("plotting graphs splitted by distance");
-                var idx = Array.FindIndex(args, x => x == "--split");
-                var lenght = int.Parse(args[idx + 1]);
-                var success = true;
-                var start = 0;
-                do {
+                var idx = Array.FindIndex(args, x => x == "--split");
+                var lenght = int.Parse(args[idx + 1]);
+                var success = true;
+                var start = 0;
+                do {
 					Console.Error.WriteLine("plotting {0} - {1}", start / 1000, (start + lenght) / 1000);
-                    success = GraphWriter.WriteDistanceSlice(args[0], args[1], start, start + lenght);
-                    start += lenght;
-                } while (success);
+                    success = graphWriter.WriteDistanceSlice(args[0], args[1], start, start + lenght);
+                    start += lenght;
+                } while (success);
 				Console.Error.WriteLine("plotting full cycle");
-                GraphWriter.Write(args[0], args[1]);
+                graphWriter.Write(args[0], args[1]);
 				Console.Error.WriteLine("done");
-                return;
-            }
+                return;
+            }
 			Console.Error.WriteLine("plotting graphs...");
-            GraphWriter.Write(args[0], args[1]);
+            graphWriter.Write(args[0], args[1]);
 			Console.Error.WriteLine("done");
-        }
-    }
+        }
+    }
 }
\ No newline at end of file

VECTO/VECTO.vbproj

@@ -58,7 +58,7 @@
     <WarningLevel>1</WarningLevel>
     <UseVSHostingProcess>true</UseVSHostingProcess>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-    <DefineConstants>CERTIFICATION_RELEASE</DefineConstants>
+    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>None</DebugType>

VECTO/install.ini

+###
+### In case you want to run VECTO as 'installed' Application
+### remove the comment character (#) at the beginning of the line
+### starting with 'ExecutionMode'. 
+### As installed Application VECTO will not write configuration files
+### nor log files to the application's folder.
+###
+#ExecutionMode = install
\ No newline at end of file

VectoCommon/VectoCommon/Properties/Version.cs

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

VectoCommon/VectoHashing/Properties/Version.cs

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

VectoCommon/VectoHashingTest/BasicHasingTests.cs

@@ -40,6 +40,7 @@ using NUnit.Framework;
 namespace VectoHashingTest
 {
 	[TestFixture]
+	//[Parallelizable(ParallelScope.All)]
 	public class BasicHasingTests
 	{
 		public const string SimpleXML = @"Testdata\XML\simple_document.xml";

VectoCommon/VectoHashingTest/VectoHashTest.cs

@@ -48,6 +48,7 @@ namespace VectoHashingTest
 	
 
 	[TestFixture]
+	//[Parallelizable(ParallelScope.All)]
 	public class VectoHashTest
 	{
 		public const string ReferenceXMLEngine = @"Testdata\XML\Reference\vecto_engine-sample.xml";

VectoConsole/Properties/Version.cs

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

VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs

@@ -43,23 +43,27 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 	public class CoastingTests
 	{
 		[OneTimeSetUp]
-		public void DisableLogging()
+		public void DisableLogging() { }
+
+		public GraphWriter GetGraphWriter() 
 		{
+			var graphWriter = new GraphWriter();
 			//LogManager.DisableLogging();
 #if TRACE
-			GraphWriter.Enable();
+			graphWriter.Enable();
 #else
 			GraphWriter.Disable();
 #endif
 
-			GraphWriter.Xfields = new[] { ModalResultField.dist };
+			graphWriter.Xfields = new[] { ModalResultField.dist };
 
-			GraphWriter.Yfields = new[] {
+			graphWriter.Yfields = new[] {
 				ModalResultField.v_act, ModalResultField.acc, ModalResultField.n_eng_avg, ModalResultField.Gear,
 				ModalResultField.P_eng_out, /*ModalResultField.T_eng_fcmap, */ ModalResultField.FCMap,
 			};
 			GraphWriter.PlotDrivingMode = true;
-			GraphWriter.Series1Label = "Vecto 3";
+			graphWriter.Series1Label = "Vecto 3";
+			return graphWriter;
 		}
 
 		[Test,
@@ -101,7 +105,7 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 			run.Run();
 			Assert.IsTrue(run.FinishedWithoutErrors);
 
-			GraphWriter.Write(modFile);
+			GetGraphWriter().Write(modFile);
 		}
 
 		[Ignore("no longer relevant"), Test,

VectoCore/ModelbasedTests/DriverStrategy/SimpleCycles.cs

@@ -46,18 +46,24 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 		public void Init()
 		{
 			//LogManager.DisableLogging();
+		}
+
+		public GraphWriter GetGraphWriter() 
+		{
+			var graphWriter = new GraphWriter();
 #if TRACE
-			GraphWriter.Enable();
+			graphWriter.Enable();
 #else
 			GraphWriter.Disable();
 #endif
-			GraphWriter.Xfields = new[] { ModalResultField.time, ModalResultField.dist };
+			graphWriter.Xfields = new[] { ModalResultField.time, ModalResultField.dist };
 
-			GraphWriter.Yfields = new[] {
+			graphWriter.Yfields = new[] {
 				ModalResultField.v_act, ModalResultField.acc, ModalResultField.n_eng_avg, ModalResultField.Gear,
 				ModalResultField.P_eng_out, ModalResultField.T_eng_fcmap, ModalResultField.FCMap
 			};
-			GraphWriter.Series1Label = "Vecto 3";
+			graphWriter.Series1Label = "Vecto 3";
+			return graphWriter;
 		}
 
 		private static string GetSlopeString(double slope)
@@ -93,7 +99,7 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 					run.Run();
 
 					Assert.IsTrue(run.FinishedWithoutErrors, "Truck Run (v1: {0}, v2: {1}, slope: {2}) failed.", v1, v2, slope);
-					GraphWriter.Write(modFileName);
+					GetGraphWriter().Write(modFileName);
 				} catch (Exception ex) {
 					Assert.Fail("Truck Run (v1: {0}, v2: {1}, slope: {2}) failed: {3}", v1, v2, slope, ex);
 				}
@@ -123,7 +129,7 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 					run.Run();
 
 					Assert.IsTrue(run.FinishedWithoutErrors, "Truck Run (v1: {0}, v2: {1}, slope: {2}) failed.", v1, v2, slope);
-					GraphWriter.Write(modFileName);
+					GetGraphWriter().Write(modFileName);
 				} catch (Exception ex) {
 					Assert.Fail("Truck Run (v1: {0}, v2: {1}, slope: {2}) failed: {3}", v1, v2, slope, ex);
 				}