node-red-contrib-power-saver 3.5.6 → 3.6.1

package/src/strategy-lowest-price.html

@@ -43,6 +43,14 @@
         value: "12",
         required: true,
       },
+      maxPrice: {
+        value: null,
+        required: false,
+        validate: function (v) {
+          console.log("validating " + v);
+          return v == null || v == "" || (!isNaN(parseFloat(v)) && isFinite(v));
+        },
+      },
       doNotSplit: {
         value: "false",
         required: true,
@@ -145,6 +153,10 @@
       <label for="node-input-hoursOn"><i class="fa fa-arrows-h"></i> Hours on</label>
       <input type="text" id="node-input-hoursOn" style="width: 80px">
   </div>
+  <div class="form-row">
+    <label for="node-input-maxPrice"><i class="fa fa-minus"></i> Max price</label>
+    <input type="text" id="node-input-maxPrice" placeholder="Max price" style="width: 80px">
+  </div>
   <div class="form-row">
       <label for="node-input-doNotSplit">Consecutive on-period</label>
       <input type="checkbox" id="node-input-doNotSplit" style="display:inline-block; width:22px; vertical-align:top;">
@@ -177,5 +189,5 @@
 <script type="text/markdown" data-help-name="ps-strategy-lowest-price">
   A node to turn on a switch the hours when the price is lowest.
 
-  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/ps-strategy-lowest-price)
+  Please read more in the [node documentation](https://powersaver.no/nodes/ps-strategy-lowest-price)
 </script>

package/src/strategy-lowest-price.js

@@ -13,6 +13,7 @@ module.exports = function (RED) {
       fromTime: config.fromTime,
       toTime: config.toTime,
       hoursOn: parseInt(config.hoursOn),
+      maxPrice: config.maxPrice == null || config.maxPrice == "" ? null : parseFloat(config.maxPrice),
       doNotSplit: booleanConfig(config.doNotSplit),
       sendCurrentValueWhenRescheduling: booleanConfig(config.sendCurrentValueWhenRescheduling),
       outputIfNoSchedule: booleanConfig(config.outputIfNoSchedule),
@@ -22,7 +23,6 @@ module.exports = function (RED) {
     node.context().set("config", originalConfig);
     node.contextStorage = originalConfig.contextStorage;
 
-
     node.on("close", function () {
       clearTimeout(node.schedulingTimeout);
     });
@@ -123,8 +123,17 @@ function makePlan(node, values, onOff, fromIndex, toIndex) {
   const res = node.doNotSplit
     ? getBestContinuous(valuesInPeriod, node.hoursOn)
     : getBestX(valuesInPeriod, node.hoursOn);
+  const sumPriceOn = res.reduce((p, v, i) => {
+    return p + (v ? valuesInPeriod[i] : 0);
+  }, 0);
+  const average = sumPriceOn / node.hoursOn;
   res.forEach((v, i) => {
-    onOff[fromIndex + i] = v;
+    onOff[fromIndex + i] =
+      node.maxPrice == null
+        ? v
+        : node.doNotSplit
+        ? v && average <= node.maxPrice
+        : v && valuesInPeriod[i] <= node.maxPrice;
   });
   return onOff;
 }

package/src/utils.js

@@ -138,13 +138,16 @@ function countAtEnd(arr, value) {
 function makeSchedule(onOff, startTimes, initial = null) {
   const res = [];
   let prev = initial;
+  let prevRecord;
   for (let i = 0; i < startTimes.length; i++) {
     const value = onOff[i];
-    if (value !== prev) {
+    if (value !== prev || i === 0) {
       const time = startTimes[i];
-      res.push({ time, value });
+      prevRecord = { time, value, countHours: 0 };
+      res.push(prevRecord);
       prev = value;
     }
+    prevRecord.countHours++;
   }
   return res;
 }

package/test/data/best-save-overlap-prices.json

@@ -0,0 +1,197 @@
+{
+  "source": "Tibber",
+  "priceData": [
+    {
+      "value": 5.5759,
+      "start": "2022-08-16T00:00:00.000+02:00"
+    },
+    {
+      "value": 5.1618,
+      "start": "2022-08-16T01:00:00.000+02:00"
+    },
+    {
+      "value": 5.1653,
+      "start": "2022-08-16T02:00:00.000+02:00"
+    },
+    {
+      "value": 4.9917,
+      "start": "2022-08-16T03:00:00.000+02:00"
+    },
+    {
+      "value": 5.0654,
+      "start": "2022-08-16T04:00:00.000+02:00"
+    },
+    {
+      "value": 5.2855,
+      "start": "2022-08-16T05:00:00.000+02:00"
+    },
+    {
+      "value": 5.3179,
+      "start": "2022-08-16T06:00:00.000+02:00"
+    },
+    {
+      "value": 5.7233,
+      "start": "2022-08-16T07:00:00.000+02:00"
+    },
+    {
+      "value": 5.8856,
+      "start": "2022-08-16T08:00:00.000+02:00"
+    },
+    {
+      "value": 5.6756,
+      "start": "2022-08-16T09:00:00.000+02:00"
+    },
+    {
+      "value": 5.5708,
+      "start": "2022-08-16T10:00:00.000+02:00"
+    },
+    {
+      "value": 5.424,
+      "start": "2022-08-16T11:00:00.000+02:00"
+    },
+    {
+      "value": 5.3128,
+      "start": "2022-08-16T12:00:00.000+02:00"
+    },
+    {
+      "value": 5.2237,
+      "start": "2022-08-16T13:00:00.000+02:00"
+    },
+    {
+      "value": 5.224,
+      "start": "2022-08-16T14:00:00.000+02:00"
+    },
+    {
+      "value": 5.2958,
+      "start": "2022-08-16T15:00:00.000+02:00"
+    },
+    {
+      "value": 5.4854,
+      "start": "2022-08-16T16:00:00.000+02:00"
+    },
+    {
+      "value": 5.77,
+      "start": "2022-08-16T17:00:00.000+02:00"
+    },
+    {
+      "value": 5.9207,
+      "start": "2022-08-16T18:00:00.000+02:00"
+    },
+    {
+      "value": 5.9163,
+      "start": "2022-08-16T19:00:00.000+02:00"
+    },
+    {
+      "value": 5.8926,
+      "start": "2022-08-16T20:00:00.000+02:00"
+    },
+    {
+      "value": 5.8729,
+      "start": "2022-08-16T21:00:00.000+02:00"
+    },
+    {
+      "value": 5.871,
+      "start": "2022-08-16T22:00:00.000+02:00"
+    },
+    {
+      "value": 5.7373,
+      "start": "2022-08-16T23:00:00.000+02:00"
+    },
+    {
+      "value": 6.0164,
+      "start": "2022-08-17T00:00:00.000+02:00"
+    },
+    {
+      "value": 5.7825,
+      "start": "2022-08-17T01:00:00.000+02:00"
+    },
+    {
+      "value": 5.6423,
+      "start": "2022-08-17T02:00:00.000+02:00"
+    },
+    {
+      "value": 5.4882,
+      "start": "2022-08-17T03:00:00.000+02:00"
+    },
+    {
+      "value": 5.5498,
+      "start": "2022-08-17T04:00:00.000+02:00"
+    },
+    {
+      "value": 5.718,
+      "start": "2022-08-17T05:00:00.000+02:00"
+    },
+    {
+      "value": 5.7206,
+      "start": "2022-08-17T06:00:00.000+02:00"
+    },
+    {
+      "value": 5.9987,
+      "start": "2022-08-17T07:00:00.000+02:00"
+    },
+    {
+      "value": 6.2019,
+      "start": "2022-08-17T08:00:00.000+02:00"
+    },
+    {
+      "value": 6.5776,
+      "start": "2022-08-17T09:00:00.000+02:00"
+    },
+    {
+      "value": 6.5709,
+      "start": "2022-08-17T10:00:00.000+02:00"
+    },
+    {
+      "value": 6.2955,
+      "start": "2022-08-17T11:00:00.000+02:00"
+    },
+    {
+      "value": 6.0833,
+      "start": "2022-08-17T12:00:00.000+02:00"
+    },
+    {
+      "value": 5.9871,
+      "start": "2022-08-17T13:00:00.000+02:00"
+    },
+    {
+      "value": 5.9045,
+      "start": "2022-08-17T14:00:00.000+02:00"
+    },
+    {
+      "value": 6.0756,
+      "start": "2022-08-17T15:00:00.000+02:00"
+    },
+    {
+      "value": 6.4711,
+      "start": "2022-08-17T16:00:00.000+02:00"
+    },
+    {
+      "value": 6.5347,
+      "start": "2022-08-17T17:00:00.000+02:00"
+    },
+    {
+      "value": 6.4604,
+      "start": "2022-08-17T18:00:00.000+02:00"
+    },
+    {
+      "value": 6.4911,
+      "start": "2022-08-17T19:00:00.000+02:00"
+    },
+    {
+      "value": 6.4908,
+      "start": "2022-08-17T20:00:00.000+02:00"
+    },
+    {
+      "value": 6.3622,
+      "start": "2022-08-17T21:00:00.000+02:00"
+    },
+    {
+      "value": 6.5796,
+      "start": "2022-08-17T22:00:00.000+02:00"
+    },
+    {
+      "value": 6.0813,
+      "start": "2022-08-17T23:00:00.000+02:00"
+    }
+  ]
+}

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

@@ -0,0 +1,357 @@
+{
+  "schedule": [
+    {
+      "time": "2022-08-16T00:00:00.000+02:00",
+      "value": false,
+      "countHours": 3
+    },
+    {
+      "time": "2022-08-16T03:00:00.000+02:00",
+      "value": true,
+      "countHours": 2
+    },
+    {
+      "time": "2022-08-16T05:00:00.000+02:00",
+      "value": false,
+      "countHours": 8
+    },
+    {
+      "time": "2022-08-16T13:00:00.000+02:00",
+      "value": true,
+      "countHours": 4
+    },
+    {
+      "time": "2022-08-16T17:00:00.000+02:00",
+      "value": false,
+      "countHours": 10
+    },
+    {
+      "time": "2022-08-17T03:00:00.000+02:00",
+      "value": true,
+      "countHours": 4
+    },
+    {
+      "time": "2022-08-17T07:00:00.000+02:00",
+      "value": false,
+      "countHours": 7
+    },
+    {
+      "time": "2022-08-17T14:00:00.000+02:00",
+      "value": true,
+      "countHours": 2
+    },
+    {
+      "time": "2022-08-17T16:00:00.000+02:00",
+      "value": false,
+      "countHours": 7
+    },
+    {
+      "time": "2022-08-17T23:00:00.000+02:00",
+      "value": true,
+      "countHours": 1
+    }
+  ],
+  "hours": [
+    {
+      "price": 5.5759,
+      "onOff": false,
+      "start": "2022-08-16T00:00:00.000+02:00",
+      "saving": 0.5842
+    },
+    {
+      "price": 5.1618,
+      "onOff": false,
+      "start": "2022-08-16T01:00:00.000+02:00",
+      "saving": 0.1701
+    },
+    {
+      "price": 5.1653,
+      "onOff": false,
+      "start": "2022-08-16T02:00:00.000+02:00",
+      "saving": 0.1736
+    },
+    {
+      "price": 4.9917,
+      "onOff": true,
+      "start": "2022-08-16T03:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.0654,
+      "onOff": true,
+      "start": "2022-08-16T04:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.2855,
+      "onOff": false,
+      "start": "2022-08-16T05:00:00.000+02:00",
+      "saving": 0.0618
+    },
+    {
+      "price": 5.3179,
+      "onOff": false,
+      "start": "2022-08-16T06:00:00.000+02:00",
+      "saving": 0.0942
+    },
+    {
+      "price": 5.7233,
+      "onOff": false,
+      "start": "2022-08-16T07:00:00.000+02:00",
+      "saving": 0.4996
+    },
+    {
+      "price": 5.8856,
+      "onOff": false,
+      "start": "2022-08-16T08:00:00.000+02:00",
+      "saving": 0.6619
+    },
+    {
+      "price": 5.6756,
+      "onOff": false,
+      "start": "2022-08-16T09:00:00.000+02:00",
+      "saving": 0.4519
+    },
+    {
+      "price": 5.5708,
+      "onOff": false,
+      "start": "2022-08-16T10:00:00.000+02:00",
+      "saving": 0.3471
+    },
+    {
+      "price": 5.424,
+      "onOff": false,
+      "start": "2022-08-16T11:00:00.000+02:00",
+      "saving": 0.2003
+    },
+    {
+      "price": 5.3128,
+      "onOff": false,
+      "start": "2022-08-16T12:00:00.000+02:00",
+      "saving": 0.0891
+    },
+    {
+      "price": 5.2237,
+      "onOff": true,
+      "start": "2022-08-16T13:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.224,
+      "onOff": true,
+      "start": "2022-08-16T14:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.2958,
+      "onOff": true,
+      "start": "2022-08-16T15:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.4854,
+      "onOff": true,
+      "start": "2022-08-16T16:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.77,
+      "onOff": false,
+      "start": "2022-08-16T17:00:00.000+02:00",
+      "saving": 0.2818
+    },
+    {
+      "price": 5.9207,
+      "onOff": false,
+      "start": "2022-08-16T18:00:00.000+02:00",
+      "saving": 0.4325
+    },
+    {
+      "price": 5.9163,
+      "onOff": false,
+      "start": "2022-08-16T19:00:00.000+02:00",
+      "saving": 0.4281
+    },
+    {
+      "price": 5.8926,
+      "onOff": false,
+      "start": "2022-08-16T20:00:00.000+02:00",
+      "saving": 0.4044
+    },
+    {
+      "price": 5.8729,
+      "onOff": false,
+      "start": "2022-08-16T21:00:00.000+02:00",
+      "saving": 0.3847
+    },
+    {
+      "price": 5.871,
+      "onOff": false,
+      "start": "2022-08-16T22:00:00.000+02:00",
+      "saving": 0.3828
+    },
+    {
+      "price": 5.7373,
+      "onOff": false,
+      "start": "2022-08-16T23:00:00.000+02:00",
+      "saving": 0.2491
+    },
+    {
+      "price": 6.0164,
+      "onOff": false,
+      "start": "2022-08-17T00:00:00.000+02:00",
+      "saving": 0.5282
+    },
+    {
+      "price": 5.7825,
+      "onOff": false,
+      "start": "2022-08-17T01:00:00.000+02:00",
+      "saving": 0.2943
+    },
+    {
+      "price": 5.6423,
+      "onOff": false,
+      "start": "2022-08-17T02:00:00.000+02:00",
+      "saving": 0.1541
+    },
+    {
+      "price": 5.4882,
+      "onOff": true,
+      "start": "2022-08-17T03:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.5498,
+      "onOff": true,
+      "start": "2022-08-17T04:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.718,
+      "onOff": true,
+      "start": "2022-08-17T05:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.7206,
+      "onOff": true,
+      "start": "2022-08-17T06:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 5.9987,
+      "onOff": false,
+      "start": "2022-08-17T07:00:00.000+02:00",
+      "saving": 0.0942
+    },
+    {
+      "price": 6.2019,
+      "onOff": false,
+      "start": "2022-08-17T08:00:00.000+02:00",
+      "saving": 0.2974
+    },
+    {
+      "price": 6.5776,
+      "onOff": false,
+      "start": "2022-08-17T09:00:00.000+02:00",
+      "saving": 0.6731
+    },
+    {
+      "price": 6.5709,
+      "onOff": false,
+      "start": "2022-08-17T10:00:00.000+02:00",
+      "saving": 0.6664
+    },
+    {
+      "price": 6.2955,
+      "onOff": false,
+      "start": "2022-08-17T11:00:00.000+02:00",
+      "saving": 0.391
+    },
+    {
+      "price": 6.0833,
+      "onOff": false,
+      "start": "2022-08-17T12:00:00.000+02:00",
+      "saving": 0.1788
+    },
+    {
+      "price": 5.9871,
+      "onOff": false,
+      "start": "2022-08-17T13:00:00.000+02:00",
+      "saving": 0.0826
+    },
+    {
+      "price": 5.9045,
+      "onOff": true,
+      "start": "2022-08-17T14:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 6.0756,
+      "onOff": true,
+      "start": "2022-08-17T15:00:00.000+02:00",
+      "saving": null
+    },
+    {
+      "price": 6.4711,
+      "onOff": false,
+      "start": "2022-08-17T16:00:00.000+02:00",
+      "saving": 0.3898
+    },
+    {
+      "price": 6.5347,
+      "onOff": false,
+      "start": "2022-08-17T17:00:00.000+02:00",
+      "saving": 0.4534
+    },
+    {
+      "price": 6.4604,
+      "onOff": false,
+      "start": "2022-08-17T18:00:00.000+02:00",
+      "saving": 0.3791
+    },
+    {
+      "price": 6.4911,
+      "onOff": false,
+      "start": "2022-08-17T19:00:00.000+02:00",
+      "saving": 0.4098
+    },
+    {
+      "price": 6.4908,
+      "onOff": false,
+      "start": "2022-08-17T20:00:00.000+02:00",
+      "saving": 0.4095
+    },
+    {
+      "price": 6.3622,
+      "onOff": false,
+      "start": "2022-08-17T21:00:00.000+02:00",
+      "saving": 0.2809
+    },
+    {
+      "price": 6.5796,
+      "onOff": false,
+      "start": "2022-08-17T22:00:00.000+02:00",
+      "saving": 0.4983
+    },
+    {
+      "price": 6.0813,
+      "onOff": true,
+      "start": "2022-08-17T23:00:00.000+02:00",
+      "saving": null
+    }
+  ],
+  "source": "Tibber",
+  "config": {
+    "maxHoursToSaveInSequence": 12,
+    "minHoursOnAfterMaxSequenceSaved": 1,
+    "minSaving": 0.01,
+    "sendCurrentValueWhenRescheduling": true,
+    "outputIfNoSchedule": false,
+    "contextStorage": "default"
+  },
+  "sentOnCommand": false,
+  "time": "2022-08-16T17:14:35.673+02:00",
+  "version": "3.6.0",
+  "current": false
+}

package/test/data/lowest-price-result-cont-max-fail.json

@@ -0,0 +1,14 @@
+{
+  "schedule": [{ "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 48 }],
+  "config": {
+    "contextStorage": "default",
+    "doNotSplit": true,
+    "fromTime": "10",
+    "hoursOn": 4,
+    "maxPrice": 0.23,
+    "outputIfNoSchedule": true,
+    "outputOutsidePeriod": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "toTime": "20"
+  }
+}

package/test/data/lowest-price-result-cont-max.json

@@ -0,0 +1,20 @@
+{
+  "schedule": [
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 11 },
+    { "time": "2021-10-11T11:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-11T15:00:00.000+02:00", "value": false, "countHours": 21 },
+    { "time": "2021-10-12T12:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-12T16:00:00.000+02:00", "value": false, "countHours": 8 }
+  ],
+  "config": {
+    "contextStorage": "default",
+    "doNotSplit": true,
+    "fromTime": "10",
+    "hoursOn": 4,
+    "maxPrice": 1,
+    "outputIfNoSchedule": true,
+    "outputOutsidePeriod": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "toTime": "20"
+  }
+}

package/test/data/lowest-price-result-cont.json

@@ -1,16 +1,17 @@
 {
   "schedule": [
-    { "time": "2021-10-11T00:00:00.000+02:00", "value": false },
-    { "time": "2021-10-11T11:00:00.000+02:00", "value": true },
-    { "time": "2021-10-11T15:00:00.000+02:00", "value": false },
-    { "time": "2021-10-12T12:00:00.000+02:00", "value": true },
-    { "time": "2021-10-12T16:00:00.000+02:00", "value": false }
+    { "time": "2021-10-11T00:00:00.000+02:00", "value": false, "countHours": 11 },
+    { "time": "2021-10-11T11:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-11T15:00:00.000+02:00", "value": false, "countHours": 21 },
+    { "time": "2021-10-12T12:00:00.000+02:00", "value": true, "countHours": 4 },
+    { "time": "2021-10-12T16:00:00.000+02:00", "value": false, "countHours": 8 }
   ],
   "config": {
     "contextStorage": "default",
     "doNotSplit": true,
     "fromTime": "10",
     "hoursOn": 4,
+    "maxPrice": null,
     "outputIfNoSchedule": true,
     "outputOutsidePeriod": false,
     "sendCurrentValueWhenRescheduling": true,