Merge pull request #683 in VECTO/vecto-sim from...

Merge pull request #683 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-797-vecto-abort-with-at-transmission-and-tc-table-value to develop

* commit '7a9a8e2f':
  adding info about TC state to the databus; force line-search for search braking power because interpolate search jumps to a very unreasonable operating point and the whole search and driving action screws up

VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs

@@ -49,6 +49,8 @@ namespace TUGraz.VectoCore.Models.Simulation.DataBus
 		/// <returns></returns>
 		uint Gear { get; }
 
+		bool TCLocked { get; }
+
 		MeterPerSecond StartSpeed { get; }
 
 		MeterPerSquareSecond StartAcceleration { get; }

VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs

@@ -93,6 +93,16 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			}
 		}
 
+		public bool TCLocked
+		{
+			get {
+				if (Gearbox == null) {
+					return true;
+				}
+				return  Gearbox.TCLocked;
+			}
+		}
+
 		public MeterPerSecond StartSpeed
 		{
 			[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",

VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs

@@ -144,6 +144,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			return response;
 		}
 
+		public override bool TCLocked { get { return PreviousState.TorqueConverterLocked; } }
+
 		internal ResponseDryRun Initialize(uint gear, bool torqueConverterLocked, NewtonMeter outTorque,
 			PerSecond outAngularVelocity)
 		{

VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs

@@ -78,6 +78,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		/// </summary>
 		public uint Gear { get; protected internal set; }
 
+		public abstract bool TCLocked { get; }
+
 		[DebuggerHidden]
 		public MeterPerSecond StartSpeed
 		{

VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs

@@ -126,6 +126,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			return response;
 		}
 
+		public override bool TCLocked { get { return !TorqueConverterActive ?? false; } }
+
 		/// <summary>
 		/// Requests the Gearbox to deliver torque and angularVelocity
 		/// </summary>

VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs

@@ -732,7 +732,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 							? response.DeltaDragLoad
 							: response.GearboxPowerRequest;
 						return delta.Value();
-					});
+					},
+					forceLineSearch: DataBus.GearboxType.AutomaticTransmission() && !DataBus.TCLocked);
 
 				return operatingPoint;
 			} catch (Exception) {

VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs

@@ -110,6 +110,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			return response;
 		}
 
+		public override bool TCLocked { get { return true; } }
+
 		internal ResponseDryRun Initialize(uint gear, NewtonMeter outTorque, PerSecond outAngularVelocity)
 		{
 			var oldGear = Gear;

VectoCore/VectoCore/Utils/SearchAlgorithm.cs

@@ -55,10 +55,10 @@ namespace TUGraz.VectoCore.Utils
 		/// </code>
 		/// </summary>
 		public static T Search<T>(T x, SI y, T interval, Func<object, SI> getYValue, Func<T, object> evaluateFunction,
-			Func<object, double> criterion) where T : SIBase<T>
+			Func<object, double> criterion, bool forceLineSearch = false) where T : SIBase<T>
 		{
 			var iterationCount = 0;
-			return Search(x, y, interval, getYValue, evaluateFunction, criterion, null, ref iterationCount);
+			return Search(x, y, interval, getYValue, evaluateFunction, criterion, null, ref iterationCount, forceLineSearch);
 		}
 
 		/// <summary>
@@ -72,10 +72,10 @@ namespace TUGraz.VectoCore.Utils
 		/// </code>
 		/// </summary>
 		public static T Search<T>(T x, SI y, T interval, Func<object, SI> getYValue, Func<T, object> evaluateFunction,
-			Func<object, double> criterion, Func<object, int, bool> abortCriterion) where T : SIBase<T>
+			Func<object, double> criterion, Func<object, int, bool> abortCriterion, bool forceLineSearch = false) where T : SIBase<T>
 		{
 			var iterationCount = 0;
-			return Search(x, y, interval, getYValue, evaluateFunction, criterion, abortCriterion, ref iterationCount);
+			return Search(x, y, interval, getYValue, evaluateFunction, criterion, abortCriterion, ref iterationCount, forceLineSearch);
 		}
 
 		/// <summary>
@@ -89,12 +89,18 @@ namespace TUGraz.VectoCore.Utils
 		/// </code>
 		/// </summary>
 		public static T Search<T>(T x, SI y, T interval, Func<object, SI> getYValue, Func<T, object> evaluateFunction,
-			Func<object, double> criterion, Func<object, int, bool> abortCriterion, ref int iterationCount) where T : SIBase<T>
+			Func<object, double> criterion, Func<object, int, bool> abortCriterion, ref int iterationCount, bool forceLineSearch) where T : SIBase<T>
 		{
 			T result;
 			try {
-				result = InterpolateSearch(x, y, interval, getYValue, evaluateFunction, criterion, abortCriterion,
+				if (forceLineSearch) {
+					result = LineSearch(x, y, interval, getYValue, evaluateFunction, criterion, abortCriterion, ref iterationCount); 
+					
+				} else {
+					result = InterpolateSearch(
+						x, y, interval, getYValue, evaluateFunction, criterion, abortCriterion,
 						ref iterationCount);
+				}
 			} catch (VectoException ex) {
 				var log = LogManager.GetLogger(typeof(SearchAlgorithm).FullName);
 				log.Debug("Falling back to InterpolationSearch in reverse. Normal InterpolationSearch failed: " + ex.Message);

VectoCore/VectoCoreTest/Utils/MockGearbox.cs

@@ -63,6 +63,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public GearboxType GearboxType { get; set; }
 		public uint Gear { get; set; }
+		public bool TCLocked { get; set; }
 		public GearInfo NextGear { get; private set; }
 
 		public Second TractionInterruption

VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs

@@ -61,6 +61,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 		public GearboxType GearboxType { get; set; }
 
 		public uint Gear { get; set; }
+		public bool TCLocked { get; set; }
 		public GearInfo NextGear { get; private set; }
 
 		public Second TractionInterruption