From f660aa0d498fb31cdc5734d505c2eb8193865728 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 25 Feb 2020 13:51:34 +0100
Subject: [PATCH] adapt torque converter testcases due to changes in the tc
 drag characteristics automatically appended (see commit b5ad883f ,
 19.12.2019)

---
 .../Data/Gearbox/TorqueConverterData.cs       |  2 ++
 .../TorqueConverterDataTest.cs                | 22 +++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
index c522c2aecd..ed33192f0f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
@@ -32,6 +32,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics;
 using System.Linq;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.Utils;
@@ -365,6 +366,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
 		}
 	}
 
+	[DebuggerDisplay("nu: {SpeedRatio}, mu: {TorqueRatio}, T_ref: {Torque}")]
 	public class TorqueConverterEntry
 	{
 		public double SpeedRatio;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs
index 287b141c1e..1af2071a3f 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/TorqueConverterDataTest.cs
@@ -85,9 +85,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 
 			// check appended data
 			
-			Assert.AreEqual(0.959, tqData.TorqueConverterEntries[19].TorqueRatio, 1e-9);
-			Assert.AreEqual(-2290, tqData.TorqueConverterEntries[19].Torque.Value(), 1e-9);
-			Assert.AreEqual(5, tqData.TorqueConverterEntries[19].SpeedRatio, 1e-9);
+			Assert.AreEqual(0.9, tqData.TorqueConverterEntries.Last().TorqueRatio, 1e-9);
+			Assert.AreEqual(-1511.2, tqData.TorqueConverterEntries.Last().Torque.Value(), 1e-9);
+			Assert.AreEqual(5, tqData.TorqueConverterEntries.Last().SpeedRatio, 1e-9);
 		}
 
 		[Test]
@@ -133,9 +133,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 
 			// check appended data
 			
-			Assert.AreEqual(0.959 / ratio, tqData.TorqueConverterEntries[18].TorqueRatio, 1e-9);
-			Assert.AreEqual(-2290, tqData.TorqueConverterEntries[18].Torque.Value(), 1e-9);
-			Assert.AreEqual(5 * ratio, tqData.TorqueConverterEntries[18].SpeedRatio, 1e-9);
+			Assert.AreEqual(0.9 / ratio, tqData.TorqueConverterEntries.Last().TorqueRatio, 1e-9);
+			Assert.AreEqual(-1511.2, tqData.TorqueConverterEntries.Last().Torque.Value(), 1e-9);
+			Assert.AreEqual(5 * ratio, tqData.TorqueConverterEntries.Last().SpeedRatio, 1e-9);
 		}
 
 		[Test]
@@ -168,13 +168,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 			Assert.AreEqual(0.9, tqData.TorqueConverterEntries[9].SpeedRatio, 1e-9);
 
 			// check appended data
-			Assert.AreEqual(0.999, tqData.TorqueConverterEntries[10].TorqueRatio, 1e-9);
+			Assert.AreEqual(0.95 * 0.99, tqData.TorqueConverterEntries[10].TorqueRatio, 1e-9);
 			Assert.AreEqual(0, tqData.TorqueConverterEntries[10].Torque.Value(), 1e-9);
 			Assert.AreEqual(1, tqData.TorqueConverterEntries[10].SpeedRatio, 1e-9);
 
-			Assert.AreEqual(0.959, tqData.TorqueConverterEntries[50].TorqueRatio, 1e-9);
-			Assert.AreEqual(-2290, tqData.TorqueConverterEntries[50].Torque.Value(), 1e-9);
-			Assert.AreEqual(5, tqData.TorqueConverterEntries[50].SpeedRatio, 1e-9);
+			Assert.AreEqual(0.9, tqData.TorqueConverterEntries.Last().TorqueRatio, 1e-9);
+			Assert.AreEqual(-1511.2, tqData.TorqueConverterEntries.Last().Torque.Value(), 1e-9);
+			Assert.AreEqual(5, tqData.TorqueConverterEntries.Last().SpeedRatio, 1e-9);
 		}
 
 		[Test]
@@ -239,7 +239,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 		TestCase(190, 30, 164.3260, 892.7507),
 		TestCase(190, 50, 209.6016, 1465.6611),
 		TestCase(190, 70, 246.4829, 2036.7399),
-		TestCase(530.517, 1.930, 59.0758, 35.8217),
+		TestCase(530.517, 1.930, 59.1582, 36.7119),
 		]
 		public void TestTorqueConverterOperatingPoint(double nOut, double Pout, double nInExpected, double tqInExpected)
 		{
-- 
GitLab