From 7b53b060abffc87b4e0a8a8d29510c881c011623 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 21 Jun 2017 10:29:01 +0200 Subject: [PATCH] revert changes due to refactoring --- .../VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs | 7 ++++++- VectoCore/VectoCore/OutputData/IModalDataContainer.cs | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs index 87754ccb91..b9634b2589 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs @@ -151,7 +151,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl powertrain.AddComponent(engine, idleController) .AddAuxiliaries(container, data); - + _modData.HasTorqueConverter = data.GearboxData.Type.AutomaticTransmission(); + return container; } @@ -178,6 +179,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl powertrain.AddComponent(new CombustionEngine(container, data.EngineData)) .AddAuxiliaries(container, data); + _modData.HasTorqueConverter = data.GearboxData.Type.AutomaticTransmission(); + return container; } @@ -210,6 +213,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl powertrain.AddComponent(engine, idleController) .AddAuxiliaries(container, data); + _modData.HasTorqueConverter = data.GearboxData.Type.AutomaticTransmission(); + return container; } diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs index 2d4f167fde..341fecb2cf 100644 --- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs @@ -63,6 +63,8 @@ namespace TUGraz.VectoCore.OutputData /// <returns></returns> object this[string auxId] { get; set; } + bool HasTorqueConverter { set; } + /// <summary> /// Commits the data of the current simulation step. /// </summary> @@ -88,7 +90,7 @@ namespace TUGraz.VectoCore.OutputData IEnumerable<T> GetValues<T>(Func<DataRow, T> selectorFunc); Dictionary<string, DataColumn> Auxiliaries { get; } - + T TimeIntegral<T>(ModalResultField field, Func<SI, bool> filter = null) where T : SIBase<T>; void SetDataValue(string fieldName, object value); -- GitLab