shifting debugging, cross product for test of upshift/downshift

VectoCore/FileIO/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -189,7 +189,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 					? engine.FullLoadCurve
 					: FullLoadCurve.ReadFromFile(Path.Combine(gearbox.BasePath, gear.FullLoadCurve));
 
-				var fullLoadCurve = IntersectFullLoadCurves(gearFullLoad, engine.FullLoadCurve);
+				var fullLoadCurve = IntersectFullLoadCurves(engine.FullLoadCurve, gearFullLoad);
 				var shiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(fullLoadCurve, engine.IdleSpeed);
 				return new KeyValuePair<uint, GearData>((uint)i + 1,
 					new GearData {
@@ -208,18 +208,23 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 		/// </summary>
 		/// <param name="curves">full load curves</param>
 		/// <returns>A combined EngineFullLoadCurve with the minimum full load torque over all inputs curves.</returns>
-		private static EngineFullLoadCurve IntersectFullLoadCurves(params FullLoadCurve[] curves)
+		private static EngineFullLoadCurve IntersectFullLoadCurves(EngineFullLoadCurve engineCurve, FullLoadCurve gearCurve)
 		{
-			var entries = curves.SelectMany(curve => curve.FullLoadEntries, (curve, entry) => entry.EngineSpeed)
+			var entries = gearCurve.FullLoadEntries.Concat(engineCurve.FullLoadEntries)
+				.Select(entry => entry.EngineSpeed)
 				.OrderBy(engineSpeed => engineSpeed)
 				.Distinct()
 				.Select(engineSpeed => new FullLoadCurve.FullLoadCurveEntry {
 					EngineSpeed = engineSpeed,
-					TorqueFullLoad = curves.Select(c => c.FullLoadStationaryTorque(engineSpeed)).Min()
+					TorqueFullLoad =
+						VectoMath.Min(engineCurve.FullLoadStationaryTorque(engineSpeed), gearCurve.FullLoadStationaryTorque(engineSpeed))
 				});
 
-			var flc = new EngineFullLoadCurve();
-			flc.FullLoadEntries.AddRange(entries);
+			var flc = new EngineFullLoadCurve {
+				FullLoadEntries = entries.ToList(),
+				EngineData = engineCurve.EngineData,
+				PT1Data = engineCurve.PT1Data
+			};
 			return flc;
 		}
 

VectoCore/Models/SimulationComponent/Impl/Gearbox.cs

@@ -84,9 +84,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				// check if GearBox should shift up
 				if (_gear < Data.Gears.Count) {
 					var upSection = CurrentGear.ShiftPolygon.Upshift.GetSection(entry => entry.AngularSpeed < inEngineSpeed);
-					if (inEngineSpeed > upSection.Item2.AngularSpeed ||
-						(inEngineSpeed > upSection.Item1.AngularSpeed &&
-						(inTorque < upSection.Item1.Torque || inTorque < upSection.Item2.Torque))) {
+					if (IsRight(inEngineSpeed, inTorque, upSection.Item1, upSection.Item2)) {
 						_gear++;
 						gearChanged = true;
 						continue;
@@ -96,9 +94,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				// check if GearBox should shift down
 				if (_gear > 1) {
 					var downSection = CurrentGear.ShiftPolygon.Downshift.GetSection(entry => entry.AngularSpeed < inEngineSpeed);
-					if (inEngineSpeed < downSection.Item1.AngularSpeed ||
-						(inEngineSpeed < downSection.Item2.AngularSpeed &&
-						(inTorque > downSection.Item1.Torque || inTorque > downSection.Item2.Torque))) {
+					if (IsLeft(inEngineSpeed, inTorque, downSection.Item1, downSection.Item2)) {
 						_gear--;
 						gearChanged = true;
 					}
@@ -121,6 +117,39 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			return Next.Request(absTime, dt, inTorque, inEngineSpeed);
 		}
 
+		/// <summary>
+		/// Determines whether the given point is left or right from the line given by (from, to)
+		/// </summary>
+		/// <remarks>Calculates the 2d cross product (from, to) x (from, [angularSpeed, torque]) and checks if the z-component is positive or negative.</remarks>
+		/// <param name="angularSpeed">The angular speed.</param>
+		/// <param name="torque">The torque.</param>
+		/// <param name="from">From.</param>
+		/// <param name="to">To.</param>
+		/// <returns></returns>
+		private static bool IsLeft(PerSecond angularSpeed, NewtonMeter torque, ShiftPolygon.ShiftPolygonEntry from,
+			ShiftPolygon.ShiftPolygonEntry to)
+		{
+			return ((to.AngularSpeed - from.AngularSpeed) * (torque - from.Torque) -
+					(to.Torque - from.Torque) * (angularSpeed - from.AngularSpeed)) >= 0;
+		}
+
+		/// <summary>
+		/// Determines whether the given point is left or right from the line given by (from, to)
+		/// </summary>
+		/// <remarks>Calculates the 2d cross product (from, to) x (from, [angularSpeed, torque]) and checks if the z-component is positive or negative.</remarks>
+		/// <param name="angularSpeed">The angular speed.</param>
+		/// <param name="torque">The torque.</param>
+		/// <param name="from">From.</param>
+		/// <param name="to">To.</param>
+		/// <returns></returns>
+		private static bool IsRight(PerSecond angularSpeed, NewtonMeter torque, ShiftPolygon.ShiftPolygonEntry from,
+			ShiftPolygon.ShiftPolygonEntry to)
+		{
+			return ((to.AngularSpeed - from.AngularSpeed) * (torque - from.Torque) -
+					(to.Torque - from.Torque) * (angularSpeed - from.AngularSpeed)) <= 0;
+		}
+
+
 		public IResponse Initialize(NewtonMeter torque, PerSecond engineSpeed)
 		{
 			_gear = 1;

VectoCoreTest/Models/SimulationComponent/GearboxTest.cs

 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NLog.Targets;
 using TUGraz.VectoCore.Exceptions;
 using TUGraz.VectoCore.FileIO.Reader.Impl;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
@@ -147,7 +148,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				new { gear = 7, t = 2450, n = 2000, loss = 27.43 },
 			};
 
-			foreach (var exp in expected) {
+			for (var i = 0; i < expected.Length; i++) {
+				var exp = expected[i];
 				var expectedT = exp.t.SI<NewtonMeter>();
 				var expectedN = exp.n.RPMtoRad();
 				var expectedLoss = exp.loss.SI<NewtonMeter>();
@@ -157,10 +159,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 
 				gearbox.Gear = (uint)exp.gear;
 				gearbox.OutPort().Request(0.SI<Second>(), 1.SI<Second>(), torque, angularVelocity);
-				AssertHelper.AreRelativeEqual(0.SI<Second>(), port.AbsTime);
-				AssertHelper.AreRelativeEqual(1.SI<Second>(), port.Dt);
-				AssertHelper.AreRelativeEqual(expectedN, port.AngularVelocity);
-				AssertHelper.AreRelativeEqual(expectedT, port.Torque);
+				AssertHelper.AreRelativeEqual(0.SI<Second>(), port.AbsTime, message: i.ToString());
+				AssertHelper.AreRelativeEqual(1.SI<Second>(), port.Dt, message: i.ToString());
+				AssertHelper.AreRelativeEqual(expectedN, port.AngularVelocity, message: i.ToString());
+				AssertHelper.AreRelativeEqual(expectedT, port.Torque, message: i.ToString());
 			}
 		}
 

VectoCoreTest/Utils/AssertHelper.cs

@@ -26,11 +26,11 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		[DebuggerHidden]
 		public static void AreRelativeEqual(SI expected, SI actual,
-			double toleranceFactor = DoubleExtensionMethods.ToleranceFactor)
+			double toleranceFactor = DoubleExtensionMethods.ToleranceFactor, string message = null)
 		{
 			Assert.IsTrue(actual.HasEqualUnit(expected),
 				string.Format("Wrong SI Units: expected: {0}, actual: {1}", expected.ToBasicUnits(), actual.ToBasicUnits()));
-			AreRelativeEqual(expected.Value(), actual.Value(), toleranceFactor: toleranceFactor);
+			AreRelativeEqual(expected.Value(), actual.Value(), toleranceFactor: toleranceFactor, message: message);
 		}
 
 		[DebuggerHidden]