Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

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

use tolerances in comparisons for switching on smart aux

parent 5c3eb7dc
No related branches found
No related tags found
No related merge requests found
...@@ -57,12 +57,12 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl ...@@ -57,12 +57,12 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl
var sum12 = _m4.GetPowerDifference() + sum11; var sum12 = _m4.GetPowerDifference() + sum11;
// VC2: Smart Compressor Overrun and Smart Electrics overrun // VC2: Smart Compressor Overrun and Smart Electrics overrun
var vc2 = sum12 < 0 || sum12.IsEqual(0); var vc2 = sum12.IsSmallerOrEqual(0); // sum12 < 0 || sum12.IsEqual(0);
// VC1: Pneumatics Compressor Off and Smart Electrics // VC1: Pneumatics Compressor Off and Smart Electrics
// compressor off power can be provided // compressor off power can be provided
// smart alternator can be provided (max possible) // smart alternator can be provided (max possible)
var vc1 = sum12 > 0; var vc1 = sum12.IsGreater(0); // sum12 > 0;
var sum14 = vc1 ? _m4.GetPowerCompressorOff() : 0.SI<Watt>(); var sum14 = vc1 ? _m4.GetPowerCompressorOff() : 0.SI<Watt>();
var sum15 = vc2 var sum15 = vc2
? _m4.GetPowerCompressorOn() * Constants.BusAuxiliaries.PneumaticUserConfig.PneumaticOverrunUtilisation ? _m4.GetPowerCompressorOn() * Constants.BusAuxiliaries.PneumaticUserConfig.PneumaticOverrunUtilisation
...@@ -78,10 +78,10 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl ...@@ -78,10 +78,10 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl
var sum13 = sum9 + _m4.GetPowerDifference(); var sum13 = sum9 + _m4.GetPowerDifference();
// VC3: Pneumatics compressor off, average elctric power (no overrun) // VC3: Pneumatics compressor off, average elctric power (no overrun)
var vc3 = sum13 > 0; var vc3 = sum13.IsGreater(0); //sum13 > 0;
// VC4: smart compressor overrun and average electrics (no overrun) // VC4: smart compressor overrun and average electrics (no overrun)
var vc4 = sum13 < 0 || sum13.IsEqual(0); var vc4 = sum13.IsSmallerOrEqual(0); // sum13 < 0 || sum13.IsEqual(0);
var sum17 = vc3 ? _m4.GetPowerCompressorOff() : 0.SI<Watt>(); var sum17 = vc3 ? _m4.GetPowerCompressorOff() : 0.SI<Watt>();
var sum18 = vc4 var sum18 = vc4
? _m4.GetPowerCompressorOn() * Constants.BusAuxiliaries.PneumaticUserConfig.PneumaticOverrunUtilisation ? _m4.GetPowerCompressorOn() * Constants.BusAuxiliaries.PneumaticUserConfig.PneumaticOverrunUtilisation
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment