Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Introduce ClampMin and ClampMax

This commit is contained in:
atef 2023-06-20 15:34:04 +02:00
parent 789780791f
commit 8feee5db43
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
csharp/App/SaliMax/src/Ess/Controller.cs
View File

@ -85,8 +85,8 @@ public static class Controller
// find out if we reach the lower or upper Dc limit by comparing the current Dc voltage to the reference voltage // find out if we reach the lower or upper Dc limit by comparing the current Dc voltage to the reference voltage
return s.AcDc.Dc.Voltage > s.Config.ReferenceDcBusVoltage return s.AcDc.Dc.Voltage > s.Config.ReferenceDcBusVoltage
? control with { PowerCorrection = clampedPowerDelta.Clamp(-maxStep, -correction), LimitedBy = EssLimit.ChargeLimitedByMaxDcBusVoltage } ? control with { PowerCorrection = clampedPowerDelta.ClampMax(-correction), LimitedBy = EssLimit.ChargeLimitedByMaxDcBusVoltage }
: control with { PowerCorrection = clampedPowerDelta.Clamp(correction, maxStep), LimitedBy = EssLimit.DischargeLimitedByMinDcBusVoltage }; : control with { PowerCorrection = clampedPowerDelta.ClampMin(correction), LimitedBy = EssLimit.DischargeLimitedByMinDcBusVoltage };
} }
// private static Double AdjustMaxChargePower(StatusRecord s, Double powerDelta) // private static Double AdjustMaxChargePower(StatusRecord s, Double powerDelta)

9
csharp/Lib/Utils/Utils.cs
View File

@ -124,7 +124,16 @@ public static class Utils
return clamped; return clamped;
} }
public static Double ClampMax(this Double value, Double maxValue)
{
return Math.Min(maxValue, value);
}
public static Double ClampMin(this Double value, Double minValue)
{
return Math.Max(minValue, value);
}
public static Decimal Clamp(this Decimal value, Decimal minValue, Decimal maxValue) public static Decimal Clamp(this Decimal value, Decimal minValue, Decimal maxValue)
{ {
var clamped = Math.Min(maxValue, value); var clamped = Math.Min(maxValue, value);