diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs index c040f5b264865164bdab4bddca0281a2df50d750..94f2717f738c16bfd356dd44031909032883fa94 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs @@ -135,8 +135,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON throw new VectoSimulationException("At least one Gear-Entry must be defined in Gearbox!"); } var lossMap = gears[0][JsonKeys.Gearbox_Gear_LossMapFile]; - if (lossMap != null) + if (lossMap != null) { return ReadTableData(gears[0][JsonKeys.Gearbox_Gear_LossMapFile].Value<string>(), "AxleGear", required: false); + } return null; } } @@ -270,21 +271,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON }; } - public virtual bool SkipGears - { - get { return Body.GetEx<bool>(JsonKeys.Gearbox_SkipGears); } - } - public virtual Second ShiftTime { get { return Body.GetEx<double>(JsonKeys.Gearbox_ShiftTime).SI<Second>(); } } - public virtual bool EarlyShiftUp - { - get { return Body.GetEx<bool>(JsonKeys.Gearbox_EarlyShiftUp); } - } - public virtual double TorqueReserve { get { return Body.GetEx<double>(JsonKeys.Gearbox_TorqueReserve) / 100.0; } diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs index 00590a23c5d4363003f16ca1c8e245b52d5527ac..fb61fe5d5ecddb68fe8d8e994ed89991e67231f1 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs @@ -141,13 +141,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox public class GearLossMapEntry { [Required, SIRange(0, 10000 * Constants.RPMToRad)] - public PerSecond InputSpeed { get; set; } + public PerSecond InputSpeed { get; private set; } [Required, SIRange(-100000, 100000)] - public NewtonMeter InputTorque { get; set; } + public NewtonMeter InputTorque { get; private set; } [Required, SIRange(0, 100000)] - public NewtonMeter TorqueLoss { get; set; } + public NewtonMeter TorqueLoss { get; private set; } public GearLossMapEntry(PerSecond inputSpeed, NewtonMeter inputTorque, NewtonMeter torqueLoss) {