@energiok/node-red-contrib-pricecontrol-thermal 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@energiok/node-red-contrib-pricecontrol-thermal",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": false,
   "publishConfig": {
     "access": "restricted"

package/src/strategy-smart-thermal-functions.js

@@ -523,41 +523,12 @@ function createSchedule(prices, outdoorTemp, config) {
       }
     }
   } else {
-    // Apply thermal constraints PER DAY - thermal budget resets each day
-    // because the house recovers during overnight boost periods
-
-    // Group intervals by day (using output timezone for day boundaries)
-    const dayGroups = new Map(); // Map<dayKey, Array<{index, price}>>
-    for (let i = 0; i < n; i++) {
-      if (modes[i] === "coast") {
-        const utcTime = DateTime.fromISO(validPrices[i].time, { zone: "UTC" });
-        const localTime = utcTime.setZone(outputTimezone);
-        const dayKey = localTime.toFormat("yyyy-MM-dd");
-
-        if (!dayGroups.has(dayKey)) {
-          dayGroups.set(dayKey, []);
-        }
-        dayGroups.get(dayKey).push({ index: i, price: priceValues[i] });
-      }
-    }
-
-    // For each day, apply thermal budget independently
-    for (const [dayKey, coastIndices] of dayGroups) {
-      // Sort by price (highest first) to prioritize most expensive periods
-      coastIndices.sort((a, b) => b.price - a.price);
-
-      // Keep only the most expensive coast periods within daily thermal budget
-      let dailyCoastUsed = 0;
-      for (const entry of coastIndices) {
-        if (dailyCoastUsed < maxCoastIntervals) {
-          dailyCoastUsed++;
-          // Keep this coast interval
-        } else {
-          // Exceeded daily thermal budget - convert to normal
-          modes[entry.index] = "normal";
-        }
-      }
-    }
+    // STEP 2: Right-align coast and boost windows within their contiguous periods
+    // When thermal budget is shorter than a full cheap/expensive period,
+    // position the allowed intervals at the END (right side) of the period:
+    // - Coast at end of expensive period → heat pump restarts when cheap prices begin
+    // - Boost at end of cheap period → heat pump stops right before expensive prices begin
+    applyRightAlignedWindows(modes, maxCoastIntervals, maxBoostLookahead);
   }
 
   // STEP 3: Extend coast periods using runway/lookahead
@@ -605,19 +576,19 @@ function createSchedule(prices, outdoorTemp, config) {
       avgPrice,
       minPrice: Math.min(...priceValues),
       maxPrice: Math.max(...priceValues),
-      priceRange: Math.max(...priceValues) - Math.min(...priceValues),
-      variationPercent: ((Math.max(...priceValues) - Math.min(...priceValues)) / avgPrice) * 100,
-      minSavingsThreshold,
-      minSavingsPercent, // Base configured value
-      effectiveMinSavingsPercent, // Actual value after temperature scaling
-      effectiveVariationThreshold,
-      maxCoastMinutes,
-      maxBoostRetention,
-      maxCoastIntervals,
-      maxBoostLookahead,
-      extremeWeatherThreshold,
-      isExtremeWeather,
-      outdoorTemp,
+      priceRange: Math.max(...priceValues) - Math.min(...priceValues),
+      variationPercent: ((Math.max(...priceValues) - Math.min(...priceValues)) / avgPrice) * 100,
+      minSavingsThreshold,
+      minSavingsPercent, // Base configured value
+      effectiveMinSavingsPercent, // Actual value after temperature scaling
+      effectiveVariationThreshold,
+      maxCoastMinutes,
+      maxBoostRetention,
+      maxCoastIntervals,
+      maxBoostLookahead,
+      extremeWeatherThreshold,
+      isExtremeWeather,
+      outdoorTemp,
       intervalMinutes,
       minModeDuration,
       outputTimezone,
@@ -787,6 +758,72 @@ function enforceMinimumDurations(modes, intervalMinutes, minModeDuration) {
   return result;
 }
 
+/**
+ * Right-align coast and boost windows within their contiguous periods.
+ *
+ * When thermal budget allows fewer intervals than a full cheap/expensive period,
+ * this positions the allowed intervals at the END of the period:
+ * - Coast at end of expensive period → heat pump restarts when cheap prices begin
+ * - Boost at end of cheap period → heat pump stops right before expensive prices begin
+ *
+ * Example:
+ *   Prices:         [EXPENSIVE][EXPENSIVE][EXPENSIVE][EXPENSIVE][cheap][cheap]
+ *   Thermal budget: Can only coast 2 hours
+ *   Before:         [COAST    ][COAST    ][normal   ][normal   ]...
+ *   After:          [normal   ][normal   ][COAST    ][COAST    ]...
+ *
+ * @param {Array<string>} modes - Array of mode strings (modified in place)
+ * @param {number} maxCoastIntervals - Maximum consecutive coast intervals (thermal budget)
+ * @param {number} maxBoostIntervals - Maximum consecutive boost intervals (thermal budget)
+ */
+function applyRightAlignedWindows(modes, maxCoastIntervals, maxBoostIntervals) {
+  const n = modes.length;
+
+  // Process COAST periods - keep rightmost intervals only
+  let i = 0;
+  while (i < n) {
+    if (modes[i] === "coast") {
+      const start = i;
+      while (i < n && modes[i] === "coast") {
+        i++;
+      }
+      const length = i - start;
+
+      if (length > maxCoastIntervals) {
+        // Convert leftmost excess to normal, keep rightmost
+        const keepStart = start + (length - maxCoastIntervals);
+        for (let j = start; j < keepStart; j++) {
+          modes[j] = "normal";
+        }
+      }
+    } else {
+      i++;
+    }
+  }
+
+  // Process BOOST periods - keep rightmost intervals only
+  i = 0;
+  while (i < n) {
+    if (modes[i] === "boost") {
+      const start = i;
+      while (i < n && modes[i] === "boost") {
+        i++;
+      }
+      const length = i - start;
+
+      if (length > maxBoostIntervals) {
+        // Convert leftmost excess to normal, keep rightmost
+        const keepStart = start + (length - maxBoostIntervals);
+        for (let j = start; j < keepStart; j++) {
+          modes[j] = "normal";
+        }
+      }
+    } else {
+      i++;
+    }
+  }
+}
+
 // ============================================================================
 // Utility Functions
 // ============================================================================
@@ -1010,6 +1047,7 @@ module.exports = {
   enforceMinimumDurations,
   enforceMaxCoastDuration,
   extendCoastToRunway,
+  applyRightAlignedWindows,
   alignToHourlyBoundaries,
   validateConfig,
   ckmeans,