no message
This commit is contained in:
+47
-5
@@ -270,13 +270,53 @@ class Manager extends IPSModule
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* Neuer Block */
|
||||||
|
foreach ($samePriorityUsers as $entry) {
|
||||||
|
$withZero[] = $entry;
|
||||||
|
|
||||||
|
if (min($entry["PowerSteps"]) > 0) {
|
||||||
|
|
||||||
|
$withoutZeroHigh[] = $entry;
|
||||||
|
}
|
||||||
|
if (max($entry["PowerSteps"]) < 0) {
|
||||||
|
|
||||||
|
$withoutZeroLow[] = $entry;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verbraucher die nicht 0 annhemen können erhalten nun den minimalwert
|
||||||
|
if (!empty($withoutZeroHigh)) {
|
||||||
|
foreach ($withoutZeroHigh as $entry) {
|
||||||
|
$instanceID = $entry["InstanceID"];
|
||||||
|
$minPowerStep = min($entry["PowerSteps"]);
|
||||||
|
|
||||||
|
$remainingPower -= $minPowerStep;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Verbraucher die nicht 0 annhemen können erhalten nun den minimalwert
|
||||||
|
if (!empty($withoutZeroLow)) {
|
||||||
|
foreach ($withoutZeroLow as $entry) {
|
||||||
|
$instanceID = $entry["InstanceID"];
|
||||||
|
$minPowerStep = max($entry["PowerSteps"]);
|
||||||
|
|
||||||
|
$remainingPower += $minPowerStep;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Neuer Block Ende */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Nun die verteilen, die 0 erhalten können.
|
||||||
|
$samePriorityUsers = $withZero;
|
||||||
// Nun die verteilen, die 0 erhalten können.
|
// Nun die verteilen, die 0 erhalten können.
|
||||||
$samePriorityUsers = $withZero;
|
|
||||||
|
|
||||||
$userEnergyProv = [];
|
$userEnergyProv = [];
|
||||||
|
|
||||||
// Initialisierung für jeden Benutzer abhängig von den Bedingungen
|
// Initialisierung für jeden Benutzer abhängig von den Bedingungen
|
||||||
foreach ($samePriorityUsers as $entry) {
|
foreach ($samePriorityUsers as $entry) {
|
||||||
$instanceID = $entry["InstanceID"];
|
$instanceID = $entry["InstanceID"];
|
||||||
|
|
||||||
if (in_array($entry, $withZero, true)) {
|
if (in_array($entry, $withZero, true)) {
|
||||||
@@ -296,7 +336,9 @@ foreach ($samePriorityUsers as $entry) {
|
|||||||
$userEnergyProv[$instanceID] = 0;
|
$userEnergyProv[$instanceID] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
IPS_LogMessage("Manag", $remainingPower);
|
IPS_LogMessage("Manag", $remainingPower);
|
||||||
|
|
||||||
if($remainingPower>=0){
|
if($remainingPower>=0){
|
||||||
|
|||||||
Reference in New Issue
Block a user