From 8f0789ddd639f4e94a4ca42c7e12e2fc11257bc0 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 25 Aug 2020 07:33:54 +0200
Subject: [PATCH] in case of overload, use wider filter in first step
---
.../Models/SimulationComponent/Strategies/HybridStrategy.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 414eabbff2..47251a9c80 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -489,7 +489,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var emEngaged = (!ElectricMotorCanPropellDuringTractionInterruption ||
(DataBus.GearboxInfo.GearEngaged(absTime) && (eval.First().Response?.Gearbox.Gear ?? 0) != 0));
if (DataBus.DriverInfo.DrivingAction == DrivingAction.Accelerate && emEngaged) {
- var filtered = eval.Where(x => !x.IgnoreReason.InvalidEngineSpeed()).ToArray();
+ //var filtered = eval.Where(x => !x.IgnoreReason.InvalidEngineSpeed()).ToArray();
+ var filtered = eval
+ .Where(x => !x.IgnoreReason.EngineSpeedTooLow() && !x.IgnoreReason.EngineSpeedTooHigh()).ToArray();
if (filtered.Length == 0) {
filtered = eval
.Where(x => !x.IgnoreReason.EngineSpeedTooLow() && !x.IgnoreReason.EngineSpeedTooHigh()).ToArray();
--
GitLab