From 3693f172bbb0b06bf2cc7e44d044430c21f4e4c4 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 15 Nov 2021 14:31:35 +0100
Subject: [PATCH] remove no longer used shift parameters (scania logic, voith
logic)
---
.../DeclarationDataAdapter.cs | 15 +----
.../EngineeringDataAdapter.cs | 57 +------------------
.../EngineeringModeVectoRunDataFactory.cs | 47 +--------------
.../Models/Declaration/DeclarationData.cs | 22 +------
.../Data/ShiftStrategyParameters.cs | 43 +-------------
5 files changed, 10 insertions(+), 174 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index c8548ecf51..0bfa1e7061 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -592,20 +592,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration,
StartVelocity = DeclarationData.GearboxTCU.StartSpeed,
- GearResidenceTime = DeclarationData.GearboxTCU.GearResidenceTime,
- DnT99L_highMin1 = DeclarationData.GearboxTCU.DnT99L_highMin1,
- DnT99L_highMin2 = DeclarationData.GearboxTCU.DnT99L_highMin2,
- AllowedGearRangeUp = DeclarationData.GearboxTCU.AllowedGearRangeUp,
- AllowedGearRangeDown = DeclarationData.GearboxTCU.AllowedGearRangeDown,
- LookBackInterval = DeclarationData.GearboxTCU.LookBackInterval,
- DriverAccelerationLookBackInterval = DeclarationData.GearboxTCU.DriverAccelerationLookBackInterval,
- DriverAccelerationThresholdLow = DeclarationData.GearboxTCU.DriverAccelerationThresholdLow,
- AverageCardanPowerThresholdPropulsion = DeclarationData.GearboxTCU.AverageCardanPowerThresholdPropulsion,
- CurrentCardanPowerThresholdPropulsion = DeclarationData.GearboxTCU.CurrentCardanPowerThresholdPropulsion,
- TargetSpeedDeviationFactor = DeclarationData.GearboxTCU.TargetSpeedDeviationFactor,
- EngineSpeedHighDriveOffFactor = DeclarationData.GearboxTCU.EngineSpeedHighDriveOffFactor,
+
RatingFactorCurrentGear = gbx.Type.AutomaticTransmission()
- ? DeclarationData.GearboxTCU.RatingFactorCurrentGearAT
+ ? DeclarationData.GearboxTCU.RatingFactorCurrentGearAPT
: DeclarationData.GearboxTCU.RatingFactorCurrentGear,
//--------------------
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 2b35016e60..016e69f1b1 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -608,46 +608,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
StartVelocity = gsInputData.StartSpeed ?? DeclarationData.GearboxTCU.StartSpeed,
StartAcceleration = gsInputData.StartAcceleration ?? DeclarationData.GearboxTCU.StartAcceleration,
- //GearResidenceTime = gsInputData.GearResidenceTime ?? DeclarationData.GearboxTCU.GearResidenceTime,
- //DnT99L_highMin1 = gsInputData.DnT99LHMin1 ?? DeclarationData.GearboxTCU.DnT99L_highMin1,
- //DnT99L_highMin2 = gsInputData.DnT99LHMin2 ?? DeclarationData.GearboxTCU.DnT99L_highMin2,
- //AllowedGearRangeUp = gsInputData.AllowedGearRangeUp ?? DeclarationData.GearboxTCU.AllowedGearRangeUp,
- //AllowedGearRangeDown = gsInputData.AllowedGearRangeDown ?? DeclarationData.GearboxTCU.AllowedGearRangeDown,
- //LookBackInterval = gsInputData.LookBackInterval ?? DeclarationData.GearboxTCU.LookBackInterval,
- //DriverAccelerationLookBackInterval = gsInputData.DriverAccelerationLookBackInterval ?? DeclarationData.GearboxTCU.DriverAccelerationLookBackInterval,
- //DriverAccelerationThresholdLow = gsInputData.DriverAccelerationThresholdLow ?? DeclarationData.GearboxTCU.DriverAccelerationThresholdLow,
- //AverageCardanPowerThresholdPropulsion = gsInputData.AvgCardanPowerThresholdPropulsion ??
- // DeclarationData.GearboxTCU.AverageCardanPowerThresholdPropulsion,
- //CurrentCardanPowerThresholdPropulsion = gsInputData.CurrCardanPowerThresholdPropulsion ??
- // DeclarationData.GearboxTCU.CurrentCardanPowerThresholdPropulsion,
- //TargetSpeedDeviationFactor = gsInputData.TargetSpeedDeviationFactor ?? DeclarationData.GearboxTCU.TargetSpeedDeviationFactor,
- //EngineSpeedHighDriveOffFactor = gsInputData.EngineSpeedHighDriveOffFactor ?? DeclarationData.GearboxTCU.EngineSpeedHighDriveOffFactor,
- //AccelerationReserveLookup = AccelerationReserveLookupReader.Create(gsInputData.AccelerationReserveLookup) ??
- // AccelerationReserveLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.AccelerationReserveLookup.csv")),
- //ShareTorque99L = ShareTorque99lLookupReader.Create(gsInputData.ShareTorque99L) ??
- // ShareTorque99lLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareTq99L.csv")
- // ),
- //PredictionDurationLookup = PredictionDurationLookupReader.Create(gsInputData.PredictionDurationLookup) ??
- // PredictionDurationLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.PredictionTimeLookup.csv")
- // ),
- //ShareIdleLow = ShareIdleLowReader.Create(gsInputData.ShareIdleLow) ?? ShareIdleLowReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareIdleLow.csv")
- // ),
- //ShareEngineHigh = EngineSpeedHighLookupReader.Create(gsInputData.ShareEngineHigh) ??
- // EngineSpeedHighLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareEngineSpeedHigh.csv")
- // ),
- //---------------
RatingFactorCurrentGear = gsInputData.RatingFactorCurrentGear ?? (gbxType.AutomaticTransmission()
- ? DeclarationData.GearboxTCU.RatingFactorCurrentGearAT
+ ? DeclarationData.GearboxTCU.RatingFactorCurrentGearAPT
: DeclarationData.GearboxTCU.RatingFactorCurrentGear),
RatioEarlyUpshiftFC = (gsInputData.RatioEarlyUpshiftFC ?? DeclarationData.GearboxTCU.RatioEarlyUpshiftFC) / axleRatio,
@@ -662,25 +624,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
LoadStageThresoldsUp = gsInputData.LoadStageThresholdsUp?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresholdsUp,
ShiftSpeedsTCToLocked = engineIdlingSpeed == null ? null : (gsInputData.ShiftSpeedsTCToLocked ?? DeclarationData.GearboxTCU.ShiftSpeedsTCToLocked).Select(x => x.Select(y => y + engineIdlingSpeed.AsRPM).ToArray()).ToArray(),
- // voith gs parameters
-
- //GearshiftLines = gsInputData.LoadStageShiftLines,
-
- LoadstageThresholds = gsInputData.LoadStageThresholdsUp != null && gsInputData.LoadStageThresholdsDown != null ? gsInputData.LoadStageThresholdsUp.Zip(gsInputData.LoadStageThresholdsDown, Tuple.Create) : null
};
- //if (gsInputData.PEV_DeRatingDownshiftSpeedFactor != null) {
- // retVal.PEV_DeRatedDownshiftSpeedFactor = gsInputData.PEV_DeRatingDownshiftSpeedFactor.Value;
- //}
-
- //if (gsInputData.PEV_TargetSpeedBrakeNorm != null) {
- // retVal.PEV_TargetSpeedBrakeNorm = gsInputData.PEV_TargetSpeedBrakeNorm.Value;
- //}
-
- //if (gsInputData.PEV_DownshiftMinSpeedFactor != null) {
- // retVal.PEV_DownshiftMinSpeedFactor = gsInputData.PEV_DownshiftMinSpeedFactor.Value;
- //}
-
return retVal;
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index c7c3c2cfb3..d60b410c25 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -191,46 +191,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
StartVelocity = gsInputData.StartSpeed ?? DeclarationData.GearboxTCU.StartSpeed,
StartAcceleration = gsInputData.StartAcceleration ?? DeclarationData.GearboxTCU.StartAcceleration,
- //GearResidenceTime = gsInputData.GearResidenceTime ?? DeclarationData.GearboxTCU.GearResidenceTime,
- //DnT99L_highMin1 = gsInputData.DnT99LHMin1 ?? DeclarationData.GearboxTCU.DnT99L_highMin1,
- //DnT99L_highMin2 = gsInputData.DnT99LHMin2 ?? DeclarationData.GearboxTCU.DnT99L_highMin2,
- //AllowedGearRangeUp = gsInputData.AllowedGearRangeUp ?? DeclarationData.GearboxTCU.AllowedGearRangeUp,
- //AllowedGearRangeDown = gsInputData.AllowedGearRangeDown ?? DeclarationData.GearboxTCU.AllowedGearRangeDown,
- //LookBackInterval = gsInputData.LookBackInterval ?? DeclarationData.GearboxTCU.LookBackInterval,
- //DriverAccelerationLookBackInterval = gsInputData.DriverAccelerationLookBackInterval ?? DeclarationData.GearboxTCU.DriverAccelerationLookBackInterval,
- //DriverAccelerationThresholdLow = gsInputData.DriverAccelerationThresholdLow ?? DeclarationData.GearboxTCU.DriverAccelerationThresholdLow,
- //AverageCardanPowerThresholdPropulsion = gsInputData.AvgCardanPowerThresholdPropulsion ??
- // DeclarationData.GearboxTCU.AverageCardanPowerThresholdPropulsion,
- //CurrentCardanPowerThresholdPropulsion = gsInputData.CurrCardanPowerThresholdPropulsion ??
- // DeclarationData.GearboxTCU.CurrentCardanPowerThresholdPropulsion,
- //TargetSpeedDeviationFactor = gsInputData.TargetSpeedDeviationFactor ?? DeclarationData.GearboxTCU.TargetSpeedDeviationFactor,
- //EngineSpeedHighDriveOffFactor = gsInputData.EngineSpeedHighDriveOffFactor ?? DeclarationData.GearboxTCU.EngineSpeedHighDriveOffFactor,
- //AccelerationReserveLookup = AccelerationReserveLookupReader.Create(gsInputData.AccelerationReserveLookup) ??
- // AccelerationReserveLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.AccelerationReserveLookup.csv")),
- //ShareTorque99L = ShareTorque99lLookupReader.Create(gsInputData.ShareTorque99L) ??
- // ShareTorque99lLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareTq99L.csv")
- // ),
- //PredictionDurationLookup = PredictionDurationLookupReader.Create(gsInputData.PredictionDurationLookup) ??
- // PredictionDurationLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.PredictionTimeLookup.csv")
- // ),
- //ShareIdleLow = ShareIdleLowReader.Create(gsInputData.ShareIdleLow) ?? ShareIdleLowReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareIdleLow.csv")
- // ),
- //ShareEngineHigh = EngineSpeedHighLookupReader.Create(gsInputData.ShareEngineHigh) ??
- // EngineSpeedHighLookupReader.ReadFromStream(
- // RessourceHelper.ReadStream(
- // DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareEngineSpeedHigh.csv")
- // ),
- //---------------
RatingFactorCurrentGear = gsInputData.RatingFactorCurrentGear ?? (gbxType.AutomaticTransmission()
- ? DeclarationData.GearboxTCU.RatingFactorCurrentGearAT
+ ? DeclarationData.GearboxTCU.RatingFactorCurrentGearAPT
: DeclarationData.GearboxTCU.RatingFactorCurrentGear),
RatioEarlyUpshiftFC = (gsInputData.RatioEarlyUpshiftFC ?? DeclarationData.GearboxTCU.RatioEarlyUpshiftFC) / axleRatio,
@@ -245,15 +207,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
LoadStageThresoldsUp = gsInputData.LoadStageThresholdsUp?.ToArray() ?? DeclarationData.GearboxTCU.LoadStageThresholdsUp,
ShiftSpeedsTCToLocked = engineIdlingSpeed == null ? null : (gsInputData.ShiftSpeedsTCToLocked ?? DeclarationData.GearboxTCU.ShiftSpeedsTCToLocked).Select(x => x.Select(y => y + engineIdlingSpeed.AsRPM).ToArray()).ToArray(),
- // voith gs parameters
-
- //GearshiftLines = gsInputData.LoadStageShiftLines,
-
- LoadstageThresholds = gsInputData.LoadStageThresholdsUp != null && gsInputData.LoadStageThresholdsDown != null ? gsInputData.LoadStageThresholdsUp.Zip(gsInputData.LoadStageThresholdsDown, Tuple.Create) : null
};
-
-
return retVal;
}
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 0eccbbd1c5..abcf4e7382 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -430,24 +430,9 @@ namespace TUGraz.VectoCore.Models.Declaration
public static readonly MeterPerSecond StartSpeed = 8.KMPHtoMeterPerSecond();
public static readonly MeterPerSquareSecond StartAcceleration = 0.8.SI<MeterPerSquareSecond>();
- public static readonly Second GearResidenceTime = 5.SI<Second>();
- public static readonly Watt CurrentCardanPowerThresholdPropulsion = 5000.SI<Watt>();
- public static readonly Watt AverageCardanPowerThresholdPropulsion = 1000.SI<Watt>();
- public static readonly Second LookBackInterval = 4.SI<Second>();
- public static readonly Second DriverAccelerationLookBackInterval = 2.SI<Second>();
- public const double EngineSpeedHighDriveOffFactor = 1.05;
- public const double DnT99L_highMin1 = 0.4;
- public const double DnT99L_highMin2 = 0.5;
-
- public const int AllowedGearRangeUp = 3;
- public const int AllowedGearRangeDown = 3;
-
- public const double TargetSpeedDeviationFactor = 0.1;
-
public static double RatingFactorCurrentGear = 0.97;
- public static double RatingFactorCurrentGearAT = 0.97;
+ public static double RatingFactorCurrentGearAPT = 0.97;
- public static readonly MeterPerSquareSecond DriverAccelerationThresholdLow = 0.1.SI<MeterPerSquareSecond>();
public static double VelocityDropFactor = 1.0;
public static double AccelerationFactor = 0.5;
@@ -487,7 +472,6 @@ namespace TUGraz.VectoCore.Models.Declaration
// TODO: MQ 2019-11-26 remove, once the parameters are fixed! make fields above read-only or const
static GearboxTCU()
{
- //#if RELEASE_CANDIDATE
var expectedFile = @"Declaration\EffShiftParameters.vtcu";
if (!File.Exists(expectedFile)) {
return;
@@ -496,7 +480,7 @@ namespace TUGraz.VectoCore.Models.Declaration
var tcuData = JSONInputDataFactory.ReadShiftParameters(expectedFile, true);
if (tcuData.RatingFactorCurrentGear.HasValue) {
RatingFactorCurrentGear = tcuData.RatingFactorCurrentGear.Value;
- RatingFactorCurrentGearAT = tcuData.RatingFactorCurrentGear.Value;
+ RatingFactorCurrentGearAPT = tcuData.RatingFactorCurrentGear.Value;
}
if (tcuData.RatioEarlyDownshiftFC.HasValue) {
RatioEarlyDownshiftFC = tcuData.RatioEarlyDownshiftFC.Value;
@@ -533,7 +517,7 @@ namespace TUGraz.VectoCore.Models.Declaration
if (tmp != null && tmp.Body["ShiftStrategy"] != null) {
DefaultShiftStrategy = tmp.Body["ShiftStrategy"].Value<string>();
}
- //#endif
+
}
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/ShiftStrategyParameters.cs b/VectoCore/VectoCore/Models/Simulation/Data/ShiftStrategyParameters.cs
index 5a3a6c8c9c..6fc5c87eb5 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/ShiftStrategyParameters.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/ShiftStrategyParameters.cs
@@ -7,18 +7,12 @@ using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Models.Simulation.Data {
public class ShiftStrategyParameters
{
- public ShiftStrategyParameters()
- {
- PEV_DownshiftMinSpeedFactor = 0.1;
- PEV_TargetSpeedBrakeNorm = 0.7;
- PEV_DeRatedDownshiftSpeedFactor = 1;
- }
public MeterPerSecond StartVelocity { get; internal set; }
//public MeterPerSquareSecond StartAcceleration { get; internal set; }
- public Second GearResidenceTime { get; internal set; }
+ //public Second GearResidenceTime { get; internal set; }
//public IPredictionDurationLookup PredictionDurationLookup { get; internal set; }
@@ -62,32 +56,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Data {
[Required, SIRange(0, double.MaxValue)]
public MeterPerSquareSecond UpshiftMinAcceleration { get; internal set; }
- //% Max.acceptable engine speed for current gear
- //% Low limit, if demanded cardan torque for /constant/ velocity is not above
- //% the max.available cardan torque
- //% Min.ratio of distance between
- //% min.speed where 99 % of the max.engine torque are reached, and
- //% max.speed where 99 % of the max.engine power are reached.
- public double DnT99L_highMin1 { get; internal set; }
-
- //% Max.acceptable engine speed for current gear
- //% Low limit, if demanded cardan torque for /constant/ velocity is not above
- //% the max.available cardan torque
- //% Max.ratio of distance between
- //% min.speed where 99 % of the max.engine torque are reached, and
- //% max.speed where 99 % of the max.engine power are reached.
- public double DnT99L_highMin2 { get; internal set; }
-
- public double EngineSpeedHighDriveOffFactor { get; set; }
- public int AllowedGearRangeDown { get; set; }
- public int AllowedGearRangeUp { get; set; }
- public Second LookBackInterval { get; set; }
- public Second DriverAccelerationLookBackInterval { get; set; }
- public Watt AverageCardanPowerThresholdPropulsion { get; set; }
- public Watt CurrentCardanPowerThresholdPropulsion { get; set; }
- public double TargetSpeedDeviationFactor { get; set; }
public double RatingFactorCurrentGear { get; set; }
- public MeterPerSquareSecond DriverAccelerationThresholdLow { get; set; }
+
public double RatioEarlyDownshiftFC { get; set; }
public double RatioEarlyUpshiftFC { get; set; }
@@ -97,18 +67,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Data {
public double VelocityDropFactor { get; internal set; }
- // Shift Lines for Voith proposed shift strategy
- public TableData GearshiftLines { get; set; }
-
- public IEnumerable<Tuple<double, double>> LoadstageThresholds { get; set; }
-
public PerSecond MinEngineSpeedPostUpshift { get; set; }
public Second ATLookAheadTime { get; set; }
public double[] LoadStageThresoldsUp { get; set; }
public double[] LoadStageThresoldsDown { get; set; }
public double[][] ShiftSpeedsTCToLocked { get; set; }
- public double PEV_TargetSpeedBrakeNorm { get; set; }
- public double PEV_DeRatedDownshiftSpeedFactor { get; set; }
- public double PEV_DownshiftMinSpeedFactor { get; set; }
+
}
}
\ No newline at end of file
--
GitLab