node-red-contrib-power-saver 2.1.0 → 3.0.3

package/src/elvia/elvia-api.js

@@ -0,0 +1,61 @@
+const fetch = require("node-fetch");
+
+function ping(node, subscriptionKey, setResultStatus = true) {
+  const url = "https://elvia.azure-api.net/grid-tariff/Ping";
+  const headers = { "Ocp-Apim-Subscription-Key": subscriptionKey };
+  fetch(url, { headers }).then((res) => {
+    if (setResultStatus) {
+      setNodeStatus(node, res.status);
+    }
+  });
+}
+
+function getTariff(node, subscriptionKey, tariffKey, range = "today", setResultStatus = true) {
+  const url = "https://elvia.azure-api.net/grid-tariff/api/1/tariffquery?TariffKey=" + tariffKey + "&Range=" + range;
+  return get(node, subscriptionKey, url, setResultStatus);
+}
+
+function getTariffForPeriod(node, subscriptionKey, tariffKey, startTime, endTime, setResultStatus = true) {
+  const url =
+    "https://elvia.azure-api.net/grid-tariff/api/1/tariffquery?TariffKey=" +
+    tariffKey +
+    "&StartTime=" +
+    startTime +
+    "&EndTime=" +
+    endTime;
+  return get(node, subscriptionKey, url, setResultStatus);
+}
+
+function getTariffTypes(node, subscriptionKey, setResultStatus = true) {
+  const url = "https://elvia.azure-api.net/grid-tariff/api/1/tarifftype";
+  return get(node, subscriptionKey, url, setResultStatus);
+}
+
+function get(node, subscriptionKey, url, setResultStatus) {
+  const headers = { "Ocp-Apim-Subscription-Key": subscriptionKey };
+  return fetch(url, { headers }).then((res) => {
+    if (setResultStatus && node) {
+      setNodeStatus(node, res.status);
+    }
+    return res.json().then((json) => {
+      return json;
+    });
+  });
+}
+
+function setNodeStatus(node, status) {
+  if (status === 200) {
+    node.status({ fill: "green", shape: "dot", text: "Connected" });
+  } else if (status === 401) {
+    node.status({ fill: "red", shape: "dot", text: "Unauthorized" });
+  } else if (status === 403) {
+    node.status({ fill: "red", shape: "dot", text: "Forbidden" });
+  }
+}
+
+module.exports = {
+  ping,
+  getTariff,
+  getTariffForPeriod,
+  getTariffTypes,
+};

package/src/elvia/elvia-config.html

@@ -0,0 +1,46 @@
+<script type="text/javascript">
+  RED.nodes.registerType("ps-elvia-config", {
+    category: "config",
+    color: "#a6bbcf",
+    defaults: {
+      name: { value: "Elvia Config" },
+    },
+    credentials: {
+      elviaSubscriptionKey: { type: "text" },
+    },
+    inputs: 1,
+    outputs: 1,
+    icon: "elvia_hvite.svg",
+    color: "#FFCC66",
+    label: function () {
+      return this.name || "ps-elvia-tariff-types";
+    },
+  });
+</script>
+
+<script type="text/html" data-template-name="ps-elvia-config">
+  <div class="form-row">
+    <label for="node-config-input-name"><i class="fa fa-tag"></i> Elvia config name</label>
+    <input type="text" id="node-config-input-name" style="width: 240px" />
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-elviaSubscriptionKey"><i class="fa fa-tag"></i> Subscription key</label>
+    <input
+      type="text"
+      id="node-config-input-elviaSubscriptionKey"
+      placeholder="your API subscription key from Elvia"
+      style="width: 240px"
+    />
+  </div>
+</script>
+
+<script type="text/markdown" data-help-name="ps-elvia-tariff-types">
+  # Elvia Configuation
+
+  You must get your own Elvia API subscription key.
+
+  Go to the [Elvia Developer Portal](https://elvia.portal.azure-api.net/) to sign up,
+  and then request for a subscription to the GridTariffAPI.
+  When your subscription is approved, you will find your subscription key in the
+  [developer portal](https://elvia.portal.azure-api.net/developer) under Your subscriptions.
+</script>

package/src/elvia/elvia-config.js

@@ -0,0 +1,19 @@
+const { getTariffTypes } = require("./elvia-api");
+
+module.exports = function (RED) {
+  function ElviaConfigNode(config) {
+    RED.nodes.createNode(this, config);
+
+    this.elviaConfig = RED.nodes.getNode(config.elviaConfig);
+
+    // Store config in global configList
+    const configList = this.context().global.get("elviaConfigList") || [];
+    configList.push(config);
+    this.context().global.set("elviaConfigList", configList);
+  }
+  RED.nodes.registerType("ps-elvia-config", ElviaConfigNode, {
+    credentials: {
+      elviaSubscriptionKey: { type: "text" },
+    },
+  });
+};

package/src/elvia/elvia-tariff-types.html

@@ -0,0 +1,34 @@
+<script type="text/javascript">
+  RED.nodes.registerType("ps-elvia-tariff-types", {
+    category: "Power Saver",
+    color: "#a6bbcf",
+    defaults: {
+      name: { value: "Elvia Tariff Types" },
+      elviaConfig: { value: "", type: "ps-elvia-config" },
+    },
+    inputs: 1,
+    outputs: 1,
+    icon: "elvia_hvite.svg",
+    color: "#FFCC66",
+    label: function () {
+      return this.name || "Elvia Tariff Types";
+    },
+  });
+</script>
+
+<script type="text/html" data-template-name="ps-elvia-tariff-types">
+  <div class="form-row">
+    <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+    <input type="text" id="node-input-name" placeholder="Name" style="width: 240px" />
+  </div>
+  <div class="form-row">
+    <label for="node-input-elviaConfig"><i class="fa fa-tag"></i> Elvia config</label>
+    <input type="text" id="node-input-elviaConfig" placeholder="Elvia config" style="width: 240px" />
+  </div>
+</script>
+
+<script type="text/markdown" data-help-name="ps-elvia-tariff-types">
+  # Elvia Tariff Types
+
+  A node to get the tariff types from Elvia. Send output to a debug node to see the result, or use it as you like.
+</script>

package/src/elvia/elvia-tariff-types.js

@@ -0,0 +1,25 @@
+const { getTariffTypes, ping } = require("./elvia-api");
+
+module.exports = function (RED) {
+  function PsElviaTariffTypesNode(config) {
+    RED.nodes.createNode(this, config);
+    this.elviaConfig = RED.nodes.getNode(config.elviaConfig);
+    const key = this.elviaConfig.credentials.elviaSubscriptionKey;
+    const node = this;
+    ping(node, key);
+
+    node.on("input", function () {
+      getTariffTypes(node, key).then((json) => {
+        node.send([{ payload: json }]);
+      });
+    });
+
+    RED.httpAdmin.get("/elvia-tariff-types", RED.auth.needsPermission("ps-elvia-config.read"), function (req, res) {
+      getTariffTypes(null, key).then((json) => {
+        res.json(json);
+      });
+    });
+  }
+
+  RED.nodes.registerType("ps-elvia-tariff-types", PsElviaTariffTypesNode);
+};

package/src/elvia/elvia-tariff.html

@@ -0,0 +1,89 @@
+<script type="text/javascript">
+  RED.nodes.registerType("ps-elvia-tariff", {
+    category: "Power Saver",
+    color: "#a6bbcf",
+    defaults: {
+      name: { value: "Elvia Tariff" },
+      elviaConfig: { value: "", type: "ps-elvia-config" },
+      tariffKey: { value: "", required: true },
+      range: { value: "today", required: true },
+    },
+    inputs: 1,
+    outputs: 1,
+    // icon: "font-awesome/fa-power-off",
+    icon: "elvia_hvite.svg",
+    color: "#FFCC66",
+    label: function () {
+      return this.name || "Elvia Tariff";
+    },
+    oneditprepare: function () {
+      const readTariffTypes = function () {
+        const configId = $("#node-input-elviaConfig").val();
+        if (!configId) {
+          return;
+        }
+        $.getJSON("elvia-tariff-types?configId=" + configId, function (data) {
+          if (!data.tariffTypes) {
+            return;
+          }
+          $("#node-input-tariffKey").typedInput({
+            types: [
+              {
+                value: "tariffkeys",
+                options: data.tariffTypes.map((k) => {
+                  return { value: k.tariffKey, label: k.title };
+                }),
+              },
+            ],
+          });
+        });
+      };
+
+      $("#node-input-range").typedInput({
+        types: [
+          {
+            value: "range",
+            options: [
+              { value: "today", label: "today" },
+              { value: "yesterday", label: "yesterday" },
+              { value: "tomorrow", label: "tomorrow" },
+            ],
+          },
+        ],
+      });
+      $(".refresh-button").on("click", function () {
+        readTariffTypes();
+      });
+      $("#node-input-elviaConfig").on("change", function () {
+        readTariffTypes();
+      });
+      readTariffTypes();
+    },
+  });
+</script>
+
+<script type="text/html" data-template-name="ps-elvia-tariff">
+  <div class="form-row">
+    <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+    <input type="text" id="node-input-name" placeholder="Name" style="width: 300px" />
+  </div>
+  <div class="form-row">
+    <label for="node-input-elviaConfig"><i class="fa fa-tag"></i> Elvia config</label>
+    <input type="text" id="node-input-elviaConfig" placeholder="Elvia config" style="width: 300px" />
+  </div>
+  <div class="form-row">
+    <label for="node-input-tariffKey"><i class="fa fa-tag"></i> Tariff key</label>
+    <input type="text" id="node-input-tariffKey" placeholder="Tariff" style="width: 300px" />
+  </div>
+  <div class="form-row">
+    <label for="node-input-range">Range</label>
+    <input type="text" id="node-input-range" style="width: 120px">
+    </label>
+  </div>
+</script>
+
+<script type="text/markdown" data-help-name="ps-elvia-tariff">
+  # Elvia Tariff
+
+  A node to get the tariff from Elvia.
+</script>

package/src/elvia/elvia-tariff.js

@@ -0,0 +1,22 @@
+const fetch = require("node-fetch");
+const { getTariff, ping } = require("./elvia-api");
+
+module.exports = function (RED) {
+  function PsElviaTariffNode(config) {
+    RED.nodes.createNode(this, config);
+    this.elviaConfig = RED.nodes.getNode(config.elviaConfig);
+    const key = this.elviaConfig.credentials.elviaSubscriptionKey;
+    this.tariffKey = config.tariffKey;
+    this.range = config.range;
+    const node = this;
+    ping(node, key);
+
+    node.on("input", function () {
+      getTariff(node, key, node.tariffKey, node.range).then((json) => {
+        node.send([{ payload: json }]);
+      });
+    });
+  }
+
+  RED.nodes.registerType("ps-elvia-tariff", PsElviaTariffNode);
+};

package/src/elvia/icons/elvia_hvite.svg

@@ -0,0 +1,4 @@
+<svg width="72" height="72" viewBox="-14 -14 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M71.4075 30.4575H28.578V40.7831H71.4075V30.4575Z" fill="white" />
+    <path d="M36.379 60.915C22.5073 60.915 11.2459 49.5813 11.2459 35.6203C11.2459 21.6593 22.5073 10.3256 36.379 10.3256C44.3621 10.3256 51.4649 14.0832 56.0788 19.918L63.7887 13.1056C57.2929 5.10171 47.4279 0 36.379 0C16.8311 0 0.986298 15.9467 0.986298 35.6203C0.986298 55.294 16.8311 71.2406 36.379 71.2406C47.4279 71.2406 57.2929 66.1389 63.7887 58.135L56.0788 51.3226C51.4953 57.1575 44.3621 60.915 36.379 60.915Z" fill="white" />
+</svg>

package/src/elvia/icons/elvia_positive_4 copy.svg

@@ -0,0 +1,4 @@
+<svg width="72" height="72" viewBox="0 0 72 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M71.4075 30.4575H28.578V40.7831H71.4075V30.4575Z" fill="black"/>
+<path d="M36.379 60.915C22.5073 60.915 11.2459 49.5813 11.2459 35.6203C11.2459 21.6593 22.5073 10.3256 36.379 10.3256C44.3621 10.3256 51.4649 14.0832 56.0788 19.918L63.7887 13.1056C57.2929 5.10171 47.4279 0 36.379 0C16.8311 0 0.986298 15.9467 0.986298 35.6203C0.986298 55.294 16.8311 71.2406 36.379 71.2406C47.4279 71.2406 57.2929 66.1389 63.7887 58.135L56.0788 51.3226C51.4953 57.1575 44.3621 60.915 36.379 60.915Z" fill="black"/>
+</svg>

package/src/handle-input.js

@@ -0,0 +1,162 @@
+const { getEffectiveConfig } = require("./utils");
+const { extractPlanForDate } = require("./utils");
+const { DateTime } = require("luxon");
+
+function handleStrategyInput(node, msg, doPlanning) {
+  node.schedulingTimeout = null;
+
+  const effectiveConfig = getEffectiveConfig(node, msg);
+  if (!validateInput(node, msg)) {
+    return;
+  }
+  const priceData = getPriceData(node, msg);
+  const planFromTime = msg.payload.time ? DateTime.fromISO(msg.payload.time) : DateTime.now();
+
+  // Store config variables in node
+  Object.keys(effectiveConfig).forEach((key) => (node[key] = effectiveConfig[key]));
+
+  clearTimeout(node.schedulingTimeout);
+
+  const dates = [...new Set(priceData.map((v) => DateTime.fromISO(v.start).toISODate()))];
+
+  // Load data from day before
+  const dateToday = DateTime.fromISO(dates[0]);
+  const dateDayBefore = DateTime.fromISO(dates[0]).plus({ days: -1 });
+
+  // Make plan
+  const plan = doPlanning(node, effectiveConfig, priceData, planFromTime, dateDayBefore, dateToday);
+
+  // Save schedule
+  node.context().set("lastPlan", plan);
+  dates.forEach((d) => saveDayData(node, d, extractPlanForDate(plan, d)));
+
+  // Prepare output
+  let output1 = null;
+  let output2 = null;
+  let output3 = {
+    payload: {
+      schedule: plan.schedule,
+      hours: plan.hours,
+      source: msg.payload.source,
+      config: effectiveConfig,
+    },
+  };
+
+  // Find current output, and set output (if configured to do)
+  const pastSchedule = plan.schedule.filter((entry) => DateTime.fromISO(entry.time) <= planFromTime);
+
+  const sendNow = node.sendCurrentValueWhenRescheduling && pastSchedule.length > 0;
+  if (sendNow) {
+    const currentValue = pastSchedule[pastSchedule.length - 1].value;
+    output1 = currentValue ? { payload: true } : null;
+    output2 = currentValue ? null : { payload: false };
+  }
+
+  // Delete old data
+  deleteSavedScheduleBefore(node, dateDayBefore);
+
+  // Send output
+  node.send([output1, output2, output3]);
+
+  // Run schedule
+  node.schedulingTimeout = runSchedule(node, plan.schedule, planFromTime, sendNow);
+}
+
+function getPriceData(node, msg) {
+  const isConfigMsg = !!msg?.payload?.config;
+  if (isConfigMsg) {
+    return node.context().get("lastPriceData");
+  }
+  const priceData = msg.payload.priceData;
+  node.context().set("lastPriceData", priceData);
+  return priceData;
+}
+
+function runSchedule(node, schedule, time, currentSent = false) {
+  let currentTime = time;
+  let remainingSchedule = schedule.filter((entry) => {
+    return DateTime.fromISO(entry.time) > DateTime.fromISO(time);
+  });
+  if (remainingSchedule.length > 0) {
+    const entry = remainingSchedule[0];
+    const nextTime = DateTime.fromISO(entry.time);
+    const wait = nextTime - currentTime;
+    const onOff = entry.value ? "on" : "off";
+    node.log("Switching " + onOff + " in " + wait + " milliseconds");
+    const statusMessage = `Scheduled ${remainingSchedule.length} changes. Next: ${
+      remainingSchedule[0].value ? "on" : "off"
+    }`;
+    node.status({ fill: "green", shape: "dot", text: statusMessage });
+    return setTimeout(() => {
+      sendSwitch(node, entry.value);
+      node.schedulingTimeout = runSchedule(node, remainingSchedule, nextTime);
+    }, wait);
+  } else {
+    const message = "No schedule";
+    node.warn(message);
+    node.status({ fill: "red", shape: "dot", text: message });
+    if (!currentSent) {
+      sendSwitch(node, node.outputIfNoSchedule);
+    }
+  }
+}
+
+function deleteSavedScheduleBefore(node, day) {
+  let date = day;
+  do {
+    date = date.plus({ days: -1 });
+    data = node.context().get(date.toISO());
+  } while (data);
+}
+
+function saveDayData(node, date, plan) {
+  node.context().set(date, plan);
+}
+
+function sendSwitch(node, onOff) {
+  const output1 = onOff ? { payload: true } : null;
+  const output2 = onOff ? null : { payload: false };
+  node.send([output1, output2, null]);
+}
+
+function validateInput(node, msg) {
+  if (!msg.payload) {
+    validationFailure(node, "No payload");
+    return;
+  }
+  if (typeof msg.payload !== "object") {
+    validationFailure(node, "Payload is not an object");
+    return;
+  }
+  if (msg.payload.config !== undefined) {
+    return true; // Got config msg
+  }
+  if (msg.payload.priceData === undefined) {
+    validationFailure(node, "Payload is missing priceData");
+    return;
+  }
+  if (msg.payload.priceData.length === undefined) {
+    validationFailure(node, "Illegal priceData in payload. Did you use the receive-price node?", "Illegal payload");
+    return;
+  }
+  if (msg.payload.priceData.length === 0) {
+    validationFailure(node, "priceData is empty");
+    return;
+  }
+  msg.payload.priceData.forEach((h) => {
+    if (!h.start || !h.value) {
+      validationFailure(node, "Malformed entries in priceData. All entries must contain start and value.");
+      return;
+    }
+  });
+  return true;
+}
+
+function validationFailure(node, message, status = null) {
+  node.status({ fill: "red", shape: "ring", text: status ?? message });
+  node.warn(message);
+}
+
+module.exports = {
+  handleStrategyInput,
+};

package/src/power-saver.html

@@ -0,0 +1,116 @@
+<script type="text/javascript">
+  RED.nodes.registerType("power-saver", {
+    category: "Power Saver",
+    color: "#a6bbcf",
+    defaults: {
+      name: { value: "Power Saver" },
+      maxHoursToSaveInSequence: {
+        value: 3,
+        required: true,
+        validate: RED.validators.number(),
+      },
+      minHoursOnAfterMaxSequenceSaved: {
+        value: 2,
+        required: true,
+        validate: RED.validators.number(),
+      },
+      minSaving: {
+        value: 0.01,
+        required: true,
+        validate: RED.validators.number(),
+      },
+      sendCurrentValueWhenRescheduling: {
+        value: true,
+        required: true,
+        // validate: RED.validators.number(),
+        align: "left",
+      },
+      outputIfNoSchedule: { value: "true", required: true, align: "left" },
+      scheduleOnlyFromCurrentTime: {
+        value: "true",
+        required: true,
+        align: "left",
+      },
+    },
+    inputs: 1,
+    outputs: 3,
+    icon: "font-awesome/fa-eur",
+    color: "#FFCC66",
+    label: function () {
+      return this.name || "Power Saver";
+    },
+    outputLabels: ["on", "off", "schedule"],
+    oneditprepare: function () {
+      $("#node-input-outputIfNoSchedule").typedInput({
+        types: [
+          {
+            value: "onoff",
+            options: [
+              { value: "true", label: "On" },
+              { value: "false", label: "Off" },
+            ],
+          },
+        ],
+      });
+      $("#node-input-scheduleOnlyFromCurrentTime").typedInput({
+        types: [
+          {
+            value: "nowOrStart",
+            options: [
+              { value: "false", label: "Whole data set" },
+              { value: "true", label: "From current hour" },
+            ],
+          },
+        ],
+      });
+    },
+  });
+</script>
+
+<script type="text/html" data-template-name="power-saver">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name" style="width: 240px">
+    </div>
+    <h3>Rules</h3>
+    <div class="form-row">
+        <label for="node-input-maxHoursToSaveInSequence"><i class="fa fa-arrows-h"></i> Max per sequence</label>
+        <input type="text" id="node-input-maxHoursToSaveInSequence" style="width: 80px" placeholder="Max hours to save in sequence">
+    </div>
+    <div class="form-row">
+        <label for="node-input-minHoursOnAfterMaxSequenceSaved"><i class="fa fa-ellipsis-h"></i> Min recover</label>
+        <input type="text"
+               id="node-input-minHoursOnAfterMaxSequenceSaved"
+               style="width: 80px"
+               placeholder="Min hours on after a max sequence">
+    </div>
+    <div class="form-row">
+        <label for="node-input-minSaving"><i class="fa fa-eur"></i> Min saving</label>
+        <input type="text" id="node-input-minSaving" placeholder="Minimum to save for turning off" style="width: 80px">
+    </div>
+    <div class="form-row">
+      <label for="node-input-scheduleOnlyFromCurrentTime">Schedule for</label>
+      <input type="text" id="node-input-scheduleOnlyFromCurrentTime" style="width: 160px">
+      </label>
+  </div>
+  <h3>Output</h3>
+    <div class="form-row">
+        <label for="node-input-sendCurrentValueWhenRescheduling" style="width:240px">
+        <input type="checkbox"
+               id="node-input-sendCurrentValueWhenRescheduling"
+               style="display:inline-block; width:22px; vertical-align:top;"
+               autocomplete="off"><span>Send when rescheduling</span>
+        </label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-outputIfNoSchedule">If no schedule, send</label>
+        <input type="text" id="node-input-outputIfNoSchedule" style="width: 80px">
+        </label>
+    </div>
+</script>
+
+<script type="text/markdown" data-help-name="power-saver">
+  A node you can use to save money by turning off and on a switch based on power prices.
+
+  Please read more in the [node documentation](https://ottopaulsen.github.io/node-red-contrib-power-saver/nodes/power-saver)
+</script>

package/{power-saver.js → src/power-saver.js}

@@ -1,14 +1,16 @@
 const { DateTime } = require("luxon");
 const {
-  convertMsg,
   countAtEnd,
-  makeSchedule,
-  getSavings,
   extractPlanForDate,
-  getStartAtIndex,
   getDiff,
+  getEffectiveConfig,
+  getSavings,
+  getStartAtIndex,
+  loadDayData,
+  makeSchedule,
 } = require("./utils");
-const mostSavedStrategy = require("./mostSavedStrategy");
+const { convertMsg } = require("./receive-price-functions");
+const { calculate } = require("./strategy-best-save-functions");
 
 let schedulingTimeout = null;
 
@@ -37,7 +39,7 @@ module.exports = function (RED) {
       if (!priceData) {
         return;
       }
-      const planFromTime = msg.payload.time ?? DateTime.now();
+      const planFromTime = msg.payload.time ? DateTime.fromISO(msg.payload.time) : DateTime.now();
 
       // Store config variables in node
       Object.keys(effectiveConfig).forEach((key) => (node[key] = effectiveConfig[key]));
@@ -116,19 +118,6 @@ function adjustSavingsPassedHours(plan, includeFromLastPlanHours) {
   }
 }
 
-function getEffectiveConfig(node, msg) {
-  const res = node.context().get("config");
-  const isConfigMsg = !!msg?.payload?.config;
-  if (isConfigMsg) {
-    const inputConfig = msg.payload.config;
-    Object.keys(inputConfig).forEach((key) => {
-      res[key] = inputConfig[key];
-    });
-    node.context().set("config", res);
-  }
-  return res;
-}
-
 function getPriceData(node, msg) {
   const isConfigMsg = !!msg?.payload?.config;
   if (isConfigMsg) {
@@ -149,18 +138,6 @@ function getPriceData(node, msg) {
   return priceData;
 }
 
-function loadDayData(node, date) {
-  // Load saved schedule for the date (YYYY-MM-DD)
-  // Return null if not found
-  const key = date.toISODate();
-  const saved = node.context().get(key);
-  const res = saved ?? {
-    schedule: [],
-    hours: [],
-  };
-  return res;
-}
-
 function loadDataJustBefore(node, dateDayBefore, dateToday, startAtIndex) {
   const dataDayBefore = loadDayData(node, dateDayBefore);
   const dataToday = loadDayData(node, dateToday);
@@ -188,7 +165,7 @@ function makePlan(node, values, startTimes, onOffBefore, firstValueNextDay) {
   const lastCountDayBefore = countAtEnd(onOffBefore, lastValueDayBefore);
   const onOff =
     strategy === "mostSaved"
-      ? mostSavedStrategy.calculate(
+      ? calculate(
           values,
           node.maxHoursToSaveInSequence,
           node.minHoursOnAfterMaxSequenceSaved,