FC-based gearshift: consider axlegear ratio for gear-ratio limits

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs

@@ -552,7 +552,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			};
 		}
 
-		public ShiftStrategyParameters CreateGearshiftData()
+		public ShiftStrategyParameters CreateGearshiftData(double axleRatio)
 		{
 			var retVal = new ShiftStrategyParameters {
 				StartVelocity = DeclarationData.GearboxTCU.StartSpeed,
@@ -590,8 +590,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 						DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareEngineSpeedHigh.csv")
 				),
 				//--------------------
-				RatioEarlyUpshiftFC = 5,
-				RatioEarlyDownshiftFC = 10,
+				RatioEarlyUpshiftFC = 8.0 / axleRatio,
+				RatioEarlyDownshiftFC = 21.0 / axleRatio,
 			};
 
 			return retVal;

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs

@@ -405,7 +405,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			};
 		}
 
-		public ShiftStrategyParameters CreateGearshiftData(IGearshiftEngineeringInputData gsInputData)
+		public ShiftStrategyParameters CreateGearshiftData(IGearshiftEngineeringInputData gsInputData, double axleRatio)
 		{
 			if (gsInputData == null) {
 				return null;
@@ -453,8 +453,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 										DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareEngineSpeedHigh.csv")
 								),
 				//---------------
-				RatioEarlyUpshiftFC = gsInputData.RatioEarlyUpshiftFC ?? 0,
-				RatioEarlyDownshiftFC = gsInputData.RatioEarlyDownshiftFC ?? 0,
+				RatioEarlyUpshiftFC = gsInputData.RatioEarlyUpshiftFC / axleRatio ?? 0,
+				RatioEarlyDownshiftFC = gsInputData.RatioEarlyDownshiftFC / axleRatio ?? 0,
 
 				// voith gs parameters
 

VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs

@@ -124,7 +124,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 
 			_municipalPtoTransmissionData = CreateDefaultPTOData();
 
-			_gearshiftData = _dao.CreateGearshiftData();
+			_gearshiftData = _dao.CreateGearshiftData(_axlegearData.AxleGear.Ratio * (_angledriveData?.Angledrive.Ratio ?? 1.0));
 		}
 
 		

VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs

@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 					Cycle = new DrivingCycleProxy(drivingCycle, cycle.Name),
 					ExecutionMode = ExecutionMode.Engineering,
 					SimulationType = SimulationType.DistanceCycle | SimulationType.MeasuredSpeedCycle | SimulationType.PWheel,
-					GearshiftParameters = dao.CreateGearshiftData(InputDataProvider.DriverInputData.GearshiftInputData),
+					GearshiftParameters = dao.CreateGearshiftData(InputDataProvider.DriverInputData.GearshiftInputData, axlegearData.AxleGear.Ratio * (angledriveData?.Angledrive.Ratio ?? 1.0)),
 					ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy
 				};
 			});