node-red-contrib-power-saver 5.0.0-beta.1 → 5.0.0-beta.2

package/.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: ottopaulsen
+patreon: # ottopaulsen
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

package/README.md

@@ -5,3 +5,6 @@ A Node-RED node to save money when power prices are changing by the hour.
 ![Logo](docs/.vuepress/public/logo.png)
 
 ## Please read more in the [documentation](https://powersaver.no/).
+
+
+[![Donation](./donation.png)](https://powersaver.no/contribute/#donate)

package/docs/.vuepress/config.js

@@ -83,6 +83,7 @@ export default defineUserConfig({
             "/examples/example-visualize-on-off/example-visualize-on-off.md",
             "/examples/example-grid-tariff-capacity-part.md",
             "/examples/example-stromstotte.md",
+            "/examples/example-reduce-minutes-array.md",
           ],
         },
       ],

package/docs/changelog/README.md

@@ -7,6 +7,10 @@ sidebarDepth: 1
 
 List the most significant changes.
 
+## 5.0.0.beta.2
+
+ - Fix bug in Min minutes off
+
 ## 5.0.0 beta.1
 
  - Fix bug `dataDayBefore.minutes is not iterable`

package/docs/examples/README.md

@@ -17,6 +17,8 @@
 
 [Strømstøtte (governmentall support)](./example-stromstotte)
 
+[Reduce minutes-array](./example-reduce-minutes-array)
+
 ## User provided examples
 
 [Output schedule to a sensor entity](./example-next-schedule-entity.md) (by Stefan)

package/docs/examples/example-reduce-minutes-array.md

@@ -0,0 +1,23 @@
+# Reduce minutes array
+
+If you want to reduce number of entries in the minutes array on output 3, you can send it through a function node with the following code:
+```
+const minutes = []
+let previousHour = ""
+let previousSaving = null
+let previousPrice = null
+msg.payload.minutes.forEach(m => {
+  const hour = m.start.substring(0, 13)
+  if (hour !== previousHour || m.saving !== previousSaving || m.price !== previousPrice) {
+    minutes.push(m)
+    previousHour = hour
+    previousSaving = m.saving
+    previousPrice = m.price
+  }
+})
+
+msg.payload.minutes = minutes
+
+return msg;
+```
+It will remove all entries that are equal to the one before, but still send at least one per hour.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "A module for Node-RED that you can use to turn on and off a switch based on power prices",
   "main": "index.js",
   "scripts": {

package/src/strategy-best-save-functions.js

@@ -8,7 +8,9 @@ const { fillArray } = require("./utils");
  *
  * @param {*} onOff Array of on/off values
  * @param {*} maxMinutesOff Max number of minutes that can be off in a sequence
- * @param {*} minMinutesOff Min number of minutes that must be on after maxOff is reached
+ * @param {*} minMinutesOff Min number of minutes that must be off to bother
+ * @param {*} recoveryPercentage Percent of off-time that must be on after being off
+ * @param {*} recoveryMaxMinutes Maximum recovery time in minutes
  * @returns
  */
 function isOnOffSequencesOk(
@@ -16,37 +18,53 @@ function isOnOffSequencesOk(
   maxMinutesOff,
   minMinutesOff,
   recoveryPercentage,
-  recoveryMaxMinutes = null,
-  minSaving) {
+  recoveryMaxMinutes = null) {
   let offCount = 0;
   let onCount = 0;
   let reachedMaxOff = false;
-  let reachedMinOn = minMinutesOff === 0;
-  let minOnAfterOff = null;
+  let reachedMinOn = true;
+  let reachedMinOff = null;
+  let minOnAfterOff = 0;
   for (let i = 0; i < onOff.length; i++) {
     if (!onOff[i]) {
       if (maxMinutesOff === 0 || reachedMaxOff) {
         return false;
       }
+      if(!reachedMinOn) {
+        return false;
+      }
+      if(reachedMinOff === null) {
+        reachedMinOff = false;
+      }
       offCount++;
       onCount = 0;
       if (offCount >= maxMinutesOff) {
         reachedMaxOff = true;
       }
       if (offCount >= minMinutesOff) {
-        reachedMinOn = true;
+        reachedMinOff = true;
       }
       const minRounded = Math.max(Math.round(offCount * recoveryPercentage / 100), 1)
       minOnAfterOff = Math.min(minRounded, recoveryMaxMinutes ?? minRounded)
+      if(i === onOff.length - 1) {
+        // If last minute, consider min reached
+        reachedMinOn = true;
+        reachedMinOff = true;
+      }
     } else {
+      if(reachedMinOff === false) {
+        return false;
+      }
       onCount++;
       if (onCount >= minOnAfterOff) {
         reachedMaxOff = false;
+        reachedMinOn = true;
       }
       offCount = 0;
+      reachedMinOff = null;
     }
   }
-  return reachedMinOn;
+  return reachedMinOn && !(reachedMinOff === false);
 }
 
 /**

package/test/data/best-save-result.json

@@ -58,17 +58,7 @@
     {
       "time": "2021-06-20T02:33:00.000+02:00",
       "value": true,
-      "countMinutes": 3
-    },
-    {
-      "time": "2021-06-20T02:36:00.000+02:00",
-      "value": false,
-      "countMinutes": 1
-    },
-    {
-      "time": "2021-06-20T02:37:00.000+02:00",
-      "value": true,
-      "countMinutes": 1
+      "countMinutes": 5
     },
     {
       "time": "2021-06-20T02:38:00.000+02:00",

package/test/data/reconfigResult.js

@@ -58,17 +58,7 @@ module.exports = {
   {
     time: "2021-06-20T02:33:00.000+02:00",
     value: true,
-    countMinutes: 3,
-  },
-  {
-    time: "2021-06-20T02:36:00.000+02:00",
-    value: false,
-    countMinutes: 1,
-  },
-  {
-    time: "2021-06-20T02:37:00.000+02:00",
-    value: true,
-    countMinutes: 1,
+    countMinutes: 5,
   },
   {
     time: "2021-06-20T02:38:00.000+02:00",