diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs index 01c90a9f8b02963f4159bc4363ee1f3bc897b66c..fa9975bfd946a6fd21717b5dde8871cd62d6a4a6 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs @@ -54,16 +54,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter public abstract class AbstractSimulationDataAdapter : LoggingObject { // ========================= - protected VehicleData.ADASData CreateADAS(IAdvancedDriverAssistantSystemDeclarationInputData adas) - { - return new VehicleData.ADASData - { - EngineStopStart = adas.EngineStopStart, - EcoRoll = adas.EcoRoll, - PredictiveCruiseControl = adas.PredictiveCruiseControl, - InputData = adas - }; - } internal AirdragData SetCommonAirdragData(IAirdragDeclarationInputData data) { var retVal = new AirdragData() diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs index 0b46e058eb08326864927c0182b7df330e57695b..981ae0cc0f9efedaab3cdec2aefca5e108f81649 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs @@ -108,8 +108,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter }: new VehicleData.ADASData { EngineStopStart = adas.EngineStopStart, - EcoRoll = adas.EcoRoll, - PredictiveCruiseControl = adas.PredictiveCruiseControl + PredictiveCruiseControl = adas.PredictiveCruiseControl, + EcoRoll = ((adas.PredictiveCruiseControl == PredictiveCruiseControlType.None) + && adas.EcoRoll.WithoutEngineStop()) + ? EcoRollType.None + : adas.EcoRoll, }; } diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ADASDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ADASDataAdapter.cs index 508b93d5d73467b013e979249005d5c652020e24..c3846bccd20a932bf86bdc4c17ed07656d46424a 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ADASDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ADASDataAdapter.cs @@ -12,9 +12,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen return new VehicleData.ADASData { EngineStopStart = adas.EngineStopStart, - EcoRoll = adas.EcoRoll, PredictiveCruiseControl = adas.PredictiveCruiseControl, - InputData = adas + InputData = adas, + EcoRoll = ((adas.PredictiveCruiseControl == PredictiveCruiseControlType.None) + && adas.EcoRoll.WithoutEngineStop()) + ? EcoRollType.None + : adas.EcoRoll, }; } }