refactoring PEV shift strategy: simplify required methods, prohibit...

refactoring PEV shift strategy: simplify required methods, prohibit eff-gearshift when at max recuperation, prevent gearshift on drive-off (until target speed reached, em-speed above n_P80low, or operating point at full-load)

VectoCommon/VectoCommon/Models/IResponse.cs

@@ -166,6 +166,7 @@ namespace TUGraz.VectoCommon.Models
 		public NewtonMeter InertiaTorque { get; set; }
 		public PerSecond AvgDrivetrainSpeed { get; set; }
 		public NewtonMeter MaxDriveTorqueEM { get; set; }
+		public NewtonMeter MaxRecuperationTorqueEM { get; set; }
 		public NewtonMeter TorqueRequestEmMap { get; set; }
 	}
 

VectoCore/VectoCore/Models/Simulation/Data/ShiftStrategyParameters.cs

@@ -8,6 +8,11 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data.ShiftStrategy;
 namespace TUGraz.VectoCore.Models.Simulation.Data {
 	public class ShiftStrategyParameters
 	{
+		public ShiftStrategyParameters()
+		{
+			TargetSpeedBrakeNorm = 0.7;
+		}
+
 		public MeterPerSecond StartVelocity { get; internal set; }
 
 		//public MeterPerSquareSecond StartAcceleration { get; internal set; }
@@ -101,5 +106,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Data {
 		public double[] LoadStageThresoldsUp { get; set; }
 		public double[] LoadStageThresoldsDown { get; set; }
 		public double[][] ShiftSpeedsTCToLocked { get; set; }
+		public double TargetSpeedBrakeNorm { get; set; }
 	}
 }
\ No newline at end of file

VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs

@@ -341,6 +341,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			retVal.ElectricMotor.MaxDriveTorque = maxDriveTorqueDt;
 			retVal.ElectricMotor.MaxDriveTorqueEM = maxDriveTorqueEm;
 			retVal.ElectricMotor.MaxRecuperationTorque = maxRecuperationTorqueDt;
+			retVal.ElectricMotor.MaxRecuperationTorqueEM = maxRecuperationTorqueEm;
 			retVal.ElectricMotor.AngularVelocity = avgEmSpeed;
 			retVal.ElectricMotor.AvgDrivetrainSpeed = avgDtSpeed;