electric motor efficiency map: adding fallback search when interpolate search...

electric motor efficiency map: adding fallback search when interpolate search leads to an operating point beyond the limits. issue line-search in this case

VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs

@@ -150,42 +150,50 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
 			}
 
 			try {
-				var retVal = SearchAlgorithm.Search(
-					maxEmTorque, elPowerMaxEM.ElectricalPower - batPower,
-					-maxEmTorque * 0.1 * (maxEmTorque > 0 ? -1 : 1),
-					getYValue: x => {
-						var myX = (EfficiencyResult)x;
-						return myX.ElectricalPower - batPower;
-					},
-					evaluateFunction: x => LookupElectricPower(avgSpeed, x, true),
-					criterion: x => {
-						var myX = (EfficiencyResult)x;
-						return (myX.ElectricalPower - batPower).Value();
-					},
-					searcher: this);
+				var retVal = SearchTorqueForElectricPower(batPower, avgSpeed, maxEmTorque, elPowerMaxEM);
 				var tmp = LookupElectricPower(avgSpeed, retVal, true);
 				if (VectoMath.Abs(tmp.ElectricalPower - batPower).IsGreater(Constants.SimulationSettings.InterpolateSearchTolerance)) {
 					// searched operating point is not accurate enough...
-					retVal = SearchAlgorithm.Search(
+					retVal = SearchTorqueForElectricPower(batPower, avgSpeed, maxEmTorque, elPowerMaxEM, 1e3);
+				}
+
+				if (maxEmTorque < 0) {
+					// propelling
+					if (retVal.IsSmaller(maxEmTorque)) {
+						retVal = SearchTorqueForElectricPower(batPower, avgSpeed, maxEmTorque, elPowerMaxEM, 1e3, true);
+					}
+				} else {
+					// recuperating
+					if (retVal.IsGreater(maxEmTorque)) {
+						retVal = SearchTorqueForElectricPower(batPower, avgSpeed, maxEmTorque, elPowerMaxEM, 1e3, true);
+					}
+				}
+				return retVal;
+			} catch (VectoSearchFailedException vsfe) {
+				Log.Error("Failed to find mechanic power for given electric power! n_avg: {0} P_el: {1}; {2}", avgSpeed.AsRPM, batPower, vsfe.Message);
+			}
+
+			return null;
+		}
+
+		private NewtonMeter SearchTorqueForElectricPower(Watt batPower, PerSecond avgSpeed, NewtonMeter maxEmTorque,
+			EfficiencyResult elPowerMaxEM, double factor = 1.0, bool forceLinesearch = false)
+		{
+			var retVal = SearchAlgorithm.Search(
 				maxEmTorque, elPowerMaxEM.ElectricalPower - batPower,
 				-maxEmTorque * 0.1 * (maxEmTorque > 0 ? -1 : 1),
 				getYValue: x => {
 					var myX = (EfficiencyResult)x;
-							return (myX.ElectricalPower - batPower) * 1e3;
+					return (myX.ElectricalPower - batPower) * factor;
 				},
 				evaluateFunction: x => LookupElectricPower(avgSpeed, x, true),
 				criterion: x => {
 					var myX = (EfficiencyResult)x;
-							return (myX.ElectricalPower - batPower).Value() * 1e3;
+					return (myX.ElectricalPower - batPower).Value() * factor;
 				},
-						searcher: this);
-				}
+				searcher: this,
+				forceLineSearch: forceLinesearch);
 			return retVal;
-			} catch (VectoSearchFailedException vsfe) {
-				Log.Error("Failed to find mechanic power for given electric power! n_avg: {0} P_el: {1}; {2}", avgSpeed.AsRPM, batPower, vsfe.Message);
-			}
-
-			return null;
 		}
 
 		public PerSecond MaxSpeed