fix: forbid downshift to locked gear in APT-S if it generates direct upshift...

fix: forbid downshift to locked gear in APT-S if it generates direct upshift condition (vecto!307)

mr: vecto!307

issue: #883

VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/ATShiftStrategy.cs

@@ -448,9 +448,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl.Shiftstrategies
 			var shiftTimeReached = (absTime - lastShiftTime).IsGreaterOrEqual(GearshiftParams.TimeBetweenGearshifts);
 
 			if (shiftTimeReached && IsBelowDownShiftCurve(gear, inTorque, inAngularVelocity)) {
+				var next_gear = Gears.Predecessor(gear);
+
+				if (!(next_gear.TorqueConverterLocked.Equals(true)) || !(IsAboveUpShiftCurve(next_gear, outTorque / GearboxModelData.Gears[next_gear.Gear].Ratio, outAngularVelocity * GearboxModelData.Gears[next_gear.Gear].Ratio, true)))
+				{
 					Downshift(absTime, gear);
 					return true;
 				}
+			}
 
 			if (shiftTimeReached && DataBus.DriverInfo.DrivingAction == DrivingAction.Accelerate) {
 				if (DataBus.VehicleInfo.VehicleSpeed < DataBus.DrivingCycleInfo.CycleData.LeftSample.VehicleTargetSpeed - 10.KMPHtoMeterPerSecond() &&

VectoCore/VectoCoreTest/Integration/GenericVehicles/GenericVehiclesDeclarationTest.cs

@@ -188,9 +188,9 @@ namespace TUGraz.VectoCore.Tests.Integration.GenericVehicles
 
 		[Category("Integration")]
 		[
-			TestCase(SINGLEBUS_31B_FM, "Coach", 863.7357),
-			TestCase(SINGLEBUS_31B_FM, "HeavyUrban", 1829.8008),
-			TestCase(SINGLEBUS_31B_FM, "Interurban", 1039.5712),
+			TestCase(SINGLEBUS_31B_FM, "Coach", 863.6492),
+			TestCase(SINGLEBUS_31B_FM, "HeavyUrban", 1829.2873),
+			TestCase(SINGLEBUS_31B_FM, "Interurban", 1039.4657),
 
 			TestCase(SINGLEBUS_34F_FM, "Coach", 686.0818),
 			TestCase(SINGLEBUS_34F_FM, "HeavyUrban", 1860.2187),