From fbf8bc83123804b0bbd4bbae65a8574baad81e96 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Thu, 17 Jun 2021 16:17:06 +0200
Subject: [PATCH] removed redundant ternary operands (boolean)
---
.../Models/SimulationComponent/Strategies/HybridStrategy.cs | 6 +++---
.../Declaration/DeclarationSegmentComplete2AxleBusesTest.cs | 2 +-
.../Declaration/DeclarationSegmentComplete3AxleBusesTest.cs | 4 ++--
.../Declaration/DeclarationSegmentComplete4AxleBusesTest.cs | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index a7f2c150aa..b133d57a59 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -1862,7 +1862,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
},
evaluateFunction: emTq => {
var cfg = new HybridStrategyResponse() {
- CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
+ CombustionEngineOn = nextGear.IsLockedGear(),
GearboxInNeutral = false,
MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
@@ -1901,7 +1901,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
},
evaluateFunction: emTq => {
var cfg = new HybridStrategyResponse() {
- CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
+ CombustionEngineOn = nextGear.IsLockedGear(),
GearboxInNeutral = false,
MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
@@ -1957,7 +1957,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
},
evaluateFunction: emTq => {
var cfg = new HybridStrategyResponse() {
- CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
+ CombustionEngineOn = nextGear.IsLockedGear(),
GearboxInNeutral = false,
MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
index ac0839d7ce..bc40d360b8 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
- airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+ airDragAllowed: mission.MissionType == MissionType.Interurban,
doubleDecker: false,
busParameters: mission.BusParameter
);
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
index 0af2d107ca..9c8fbd5a2b 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
- airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+ airDragAllowed: mission.MissionType == MissionType.Interurban,
doubleDecker: false,
busParameters: mission.BusParameter
);
@@ -461,7 +461,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
- airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+ airDragAllowed: mission.MissionType == MissionType.Interurban,
doubleDecker: false,
busParameters: mission.BusParameter
);
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
index 57f5cf2138..7af5e1d5c2 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
- airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+ airDragAllowed: mission.MissionType == MissionType.Interurban,
doubleDecker: false,
busParameters: mission.BusParameter
);
--
GitLab