diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs index 854ee594830d21bc5430cf70fff7373d259897af..d7ec92a767e44cea008df0700fef2962ebb499a9 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs @@ -172,7 +172,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter }; } - protected virtual TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory ) + protected virtual TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory, GearboxType gearboxType) { if (gear.LossMap != null) { return TransmissionLossMapReader.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1), true); diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs index 0917d0e8af8dc7649c64063f93dfcd6aaef5f58f..0762eecc7a64b427f9319a542307a4f81b402fdc 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs @@ -1,25 +1,14 @@ using System; using System.Collections.Generic; -using System.Linq; -using TUGraz.VectoCommon.BusAuxiliaries; using TUGraz.VectoCommon.Exceptions; using TUGraz.VectoCommon.InputData; using TUGraz.VectoCommon.Models; using TUGraz.VectoCommon.Utils; -using TUGraz.VectoCore.Configuration; using TUGraz.VectoCore.InputData.Reader.ComponentData; -using TUGraz.VectoCore.Models.BusAuxiliaries; -using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics; -using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC; -using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics; -using TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics; using TUGraz.VectoCore.Models.Declaration; using TUGraz.VectoCore.Models.GenericModelData; -using TUGraz.VectoCore.Models.Simulation.Data; -using TUGraz.VectoCore.Models.SimulationComponent; using TUGraz.VectoCore.Models.SimulationComponent.Data; using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox; -using TUGraz.VectoCore.Utils; namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter { @@ -31,6 +20,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter public const double GearEfficiencyDirectGear = 0.98; public const double GearEfficiencyIndirectGear = 0.96; + public const double GearEfficiencyAT = 0.925; #region Overrides of DeclarationDataAdapterPrimaryBus @@ -79,9 +69,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter #region Overrides of AbstractSimulationDataAdapter - protected override TransmissionLossMap CreateGearLossMap( - ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory) + protected override TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory, GearboxType gearboxType) { + if (gearboxType.AutomaticTransmission()) { + return TransmissionLossMapReader.Create(GearEfficiencyAT, gear.Ratio, $"Gear {i + 1}"); + } return TransmissionLossMapReader.Create( gear.Ratio.IsEqual(1) ? GearEfficiencyDirectGear : GearEfficiencyIndirectGear, gear.Ratio, $"Gear {i + 1}"); } diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs index ad63ae01d290fa654ce21ef2927c9429173b1c5e..9b924cdab1ea0b60e6b9b2f60bd47c54ba2da9ff 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs @@ -369,7 +369,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter : inputData.VehicleCategory; for (uint i = 0; i < gearsInput.Count; i++) { var gear = gearsInput[(int)i]; - var lossMap = CreateGearLossMap(gear, i, false, vehicleCategory); + var lossMap = CreateGearLossMap(gear, i, false, vehicleCategory, gearbox.Type); var shiftPolygon = shiftPolygonCalc != null ? shiftPolygonCalc.ComputeDeclarationShiftPolygon( diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs index 1da8215e0fe15fedee78c87d74d9f3803d5178f2..84f9ca2546b25934774a854ccd5f9d41e55464c8 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs @@ -50,8 +50,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter #endregion - protected override TransmissionLossMap CreateGearLossMap( - ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory) + protected override TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory, GearboxType gearboxType) { return TransmissionLossMapReader.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1), true); } diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs index dcf1454b3b8ba4b8efb4d28eb76a429bfb8a66b7..d18f0eb065402f0429ee0468ed742026faccb62a 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs @@ -318,7 +318,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter } for (uint i = 0; i < gearbox.Gears.Count; i++) { var gear = gearbox.Gears[(int)i]; - var lossMap = CreateGearLossMap(gear, i, true, VehicleCategory.Unknown); + var lossMap = CreateGearLossMap(gear, i, true, VehicleCategory.Unknown, gearbox.Type); var shiftPolygon = gear.ShiftPolygon != null && gear.ShiftPolygon.SourceType != DataSourceType.Missing ? ShiftPolygonReader.Create(gear.ShiftPolygon)