Merge branch 'amdm2/bug/34-retrycount-exceeded' into 'amdm2/develop'

Amdm2/bug/34 retrycount exceeded

See merge request vecto!16

VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs

@@ -36,12 +36,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		private HybridStrategyResponse CurrentStrategySettings;
 
 		protected DebugData DebugData = new DebugData();
+		private readonly IVehicleContainer _vehicleContainer;
 
 
 		public HybridController(IVehicleContainer container, IHybridControlStrategy strategy, IElectricSystem es) : base(container)
 		{
 			_electricMotorCtl = new Dictionary<PowertrainPosition, ElectricMotorController>();
-
+			_vehicleContainer = container;
 			switch (container.RunData.GearboxData.Type) {
 				case GearboxType.ATPowerSplit:
 				case GearboxType.ATSerial:
@@ -148,11 +149,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					CurrentState.StrategyResponse = strategySettings;
 				}
 
-				var gearShiftResponse = ShiftGear(strategySettings, dryRun, absTime, dt);
+				var gearShiftResponse = ShiftGear(strategySettings, dryRun, absTime, dt, out var retryAfterGearshift);
 				if (gearShiftResponse != null) {
 					return gearShiftResponse; 
                 }
 
+				retry = retryAfterGearshift;
+
 				if (!dryRun /*&& DataBus.VehicleInfo.VehicleStopped*/) {
 					SelectedGear = GetNextGear(strategySettings);
 				}
@@ -228,17 +231,26 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			return modifiedResponse;
         }
 
-        protected virtual AbstractResponse ShiftGear(HybridStrategyResponse strategySettings, bool dryRun, Second absTime, Second dt)
+        protected virtual AbstractResponse ShiftGear(HybridStrategyResponse strategySettings, bool dryRun, Second absTime, Second dt, out bool retry)
         {
+			retry = false;
             if (!dryRun && strategySettings.ShiftRequired) {
+				var oldGear = DataBus.GearboxInfo.Gear;
                 DataBus.GearboxCtl.TriggerGearshift(absTime, dt);
 
 				_shiftStrategy.SetNextGear(strategySettings.NextGear);
 				SelectedGear = strategySettings.NextGear;
 
 				if (!DataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
+		
 					return new ResponseGearShift(this);
 				}
+				else if (_vehicleContainer.RunData.HybridStrategyParameters.MaxPropulsionTorque
+							?.GetVECTOValueOrDefault(oldGear) != null)
+				{
+					retry = true;
+				}
+
             }
 
 			return null;

VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedGearHybridController.cs

@@ -39,8 +39,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			}
         }
 
-        protected override AbstractResponse ShiftGear(HybridStrategyResponse strategySettings, bool dryRun, Second absTime, Second dt)
+        protected override AbstractResponse ShiftGear(HybridStrategyResponse strategySettings, bool dryRun, Second absTime, Second dt, out bool retry)
 		{
+			retry = false;
 			return null;
         }
 

VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs

@@ -92,6 +92,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 				TestPowertrain.CombustionEngine.UpdateFrom(DataBus.EngineInfo);
 				TestPowertrain.Gearbox.UpdateFrom(DataBus.GearboxInfo);
 				TestPowertrain.Clutch.UpdateFrom(DataBus.ClutchInfo);
+				TestPowertrain.Brakes.UpdateFrom(DataBus.Brakes);
 				var pos = ModelData.ElectricMachinesData.FirstOrDefault().Item1;
 				TestPowertrain.ElectricMotor.UpdateFrom(DataBus.ElectricMotorInfo(pos));
 				foreach (var emPos in TestPowertrain.ElectricMotorsUpstreamTransmission.Keys) {
@@ -851,7 +852,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			var disengageSpeedThreshold = ModelData.GearboxData.DisengageWhenHaltingSpeed;
 
             // hint: only check for halting speed if vehicle is actually braking to halt.
-			var vehiclespeedBelowThreshold = DataBus.VehicleInfo.VehicleSpeed.IsSmaller(disengageSpeedThreshold)
+			var vehicleEndSpeed = DataBus.VehicleInfo.VehicleSpeed +
+							DataBus.DriverInfo.DriverAcceleration * ModelData.GearboxData.TractionInterruption; 
+            var vehiclespeedBelowThreshold = vehicleEndSpeed.IsSmaller(disengageSpeedThreshold)
 											&& (DataBus.DriverInfo.NextBrakeTriggerSpeed?.IsEqual(0) ?? false);
 
 			if (!ElectricMotorCanPropellDuringTractionInterruption && !DataBus.GearboxInfo.GearEngaged(absTime)) {