Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 95a24eb0 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

updating repo, adding todos

parent 2e1ac56d
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public virtual double TorqueReserve
{
get { return Body[JsonKeys.Gearbox_TorqueReserve] == null ?
DeclarationData.Gearbox.TorqueReserve
DeclarationData.GearboxTCU.TorqueReserve
:Body.GetEx<double>(JsonKeys.Gearbox_TorqueReserve) / 100.0; }
}
......@@ -85,19 +85,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
get {
return Body[JsonKeys.Gearbox_StartTorqueReserve] == null
? DeclarationData.Gearbox.TorqueReserveStart
? DeclarationData.GearboxTCU.TorqueReserveStart
: Body.GetEx<double>(JsonKeys.Gearbox_StartTorqueReserve) / 100.0;
}
}
public MeterPerSecond StartSpeed
{
get { return Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartSpeed)?.KMPHtoMeterPerSecond() ?? DeclarationData.Gearbox.StartSpeed; }
get { return Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartSpeed)?.KMPHtoMeterPerSecond() ?? DeclarationData.GearboxTCU.StartSpeed; }
}
public MeterPerSquareSecond StartAcceleration
{
get { return Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartAcceleration)?.SI<MeterPerSquareSecond>() ?? DeclarationData.Gearbox.StartAcceleration; }
get { return Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartAcceleration)?.SI<MeterPerSquareSecond>() ?? DeclarationData.GearboxTCU.StartAcceleration; }
}
public Second GearResidenceTime
......
......@@ -53,7 +53,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[Required, ValidateObject] public Dictionary<uint, GearData> Gears = new Dictionary<uint, GearData>();
public TorqueConverterData TorqueConverterData { get; internal set; }
public TorqueConverterData TorqueConverterData { get; internal set; }
[Required, SIRange(0, 10)]
public KilogramSquareMeter Inertia { get; internal set; }
......@@ -65,36 +65,36 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
/// [%] (0-1) The torque reserve for shift strategy (early upshift, skipgears)
/// </summary>
[Required, Range(0, 0.5)]
public double TorqueReserve { get; internal set; }
public double TorqueReserve { get; internal set; } // todo: move to shift parameters
/// <summary>
/// Gets the minimum time between shifts.
/// </summary>
[Required, SIRange(0, 5)]
public Second ShiftTime { get; internal set; }
public Second ShiftTime { get; internal set; } // todo: move to shift parameters
/// <summary>
/// [%] (0-1) The starting torque reserve for finding the starting gear after standstill.
/// </summary>
[Required, Range(0, 0.5)]
public double StartTorqueReserve { get; internal set; }
public double StartTorqueReserve { get; internal set; } // todo: move to shift parameters
// MQ: TODO: move to Driver Data ?
[Required, SIRange(double.Epsilon, 5)]
public MeterPerSecond StartSpeed { get; internal set; }
public MeterPerSecond StartSpeed { get; internal set; } // todo: move to shift parameters
// MQ: TODO: move to Driver Data ?
[Required, SIRange(double.Epsilon, 2)]
public MeterPerSquareSecond StartAcceleration { get; internal set; }
public MeterPerSquareSecond StartAcceleration { get; internal set; } // todo: move to shift parameters
[Required, SIRange(0, double.MaxValue)]
public Second UpshiftAfterDownshiftDelay { get; internal set; }
public Second UpshiftAfterDownshiftDelay { get; internal set; } // todo: move to shift parameters
[Required, SIRange(0, double.MaxValue)]
public Second DownshiftAfterUpshiftDelay { get; internal set; }
public Second DownshiftAfterUpshiftDelay { get; internal set; } // todo: move to shift parameters
[Required, SIRange(0, double.MaxValue)]
public MeterPerSquareSecond UpshiftMinAcceleration { get; internal set; }
public MeterPerSquareSecond UpshiftMinAcceleration { get; internal set; } // todo: move to shift parameters
[SIRange(0.5, 1)]
public Second PowershiftShiftTime { get; internal set; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment