Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 2e2add66 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Revert "removed redundant ternary operands (boolean)"

This reverts commit fbf8bc83.
parent e4f2597b
No related branches found
No related tags found
No related merge requests found
...@@ -1862,7 +1862,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies ...@@ -1862,7 +1862,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}, },
evaluateFunction: emTq => { evaluateFunction: emTq => {
var cfg = new HybridStrategyResponse() { var cfg = new HybridStrategyResponse() {
CombustionEngineOn = nextGear.IsLockedGear(), CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
GearboxInNeutral = false, GearboxInNeutral = false,
MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() { MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) } { emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
...@@ -1901,7 +1901,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies ...@@ -1901,7 +1901,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}, },
evaluateFunction: emTq => { evaluateFunction: emTq => {
var cfg = new HybridStrategyResponse() { var cfg = new HybridStrategyResponse() {
CombustionEngineOn = nextGear.IsLockedGear(), CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
GearboxInNeutral = false, GearboxInNeutral = false,
MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() { MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) } { emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
...@@ -1957,7 +1957,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies ...@@ -1957,7 +1957,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}, },
evaluateFunction: emTq => { evaluateFunction: emTq => {
var cfg = new HybridStrategyResponse() { var cfg = new HybridStrategyResponse() {
CombustionEngineOn = nextGear.IsLockedGear(), CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
GearboxInNeutral = false, GearboxInNeutral = false,
MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() { MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) } { emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
......
...@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters( AssertBusParameters(
missionType: mission.MissionType, missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 }, passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
airDragAllowed: mission.MissionType == MissionType.Interurban, airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false, doubleDecker: false,
busParameters: mission.BusParameter busParameters: mission.BusParameter
); );
......
...@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters( AssertBusParameters(
missionType: mission.MissionType, missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 }, passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
airDragAllowed: mission.MissionType == MissionType.Interurban, airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false, doubleDecker: false,
busParameters: mission.BusParameter busParameters: mission.BusParameter
); );
...@@ -461,7 +461,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -461,7 +461,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters( AssertBusParameters(
missionType: mission.MissionType, missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 }, passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
airDragAllowed: mission.MissionType == MissionType.Interurban, airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false, doubleDecker: false,
busParameters: mission.BusParameter busParameters: mission.BusParameter
); );
......
...@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters( AssertBusParameters(
missionType: mission.MissionType, missionType: mission.MissionType,
passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 }, passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
airDragAllowed: mission.MissionType == MissionType.Interurban, airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false, doubleDecker: false,
busParameters: mission.BusParameter busParameters: mission.BusParameter
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment