Energy demand profile: to take heating into account

api/feature.go

@@ -4,19 +4,21 @@ type Feature int
 
 //go:generate go tool enumer -type Feature -text
 const (
-	_                  Feature = iota
-	CoarseCurrent              // charger
-	IntegratedDevice           // charger - always connected - no vehicle, no charging sessions
-	SwitchDevice               // charger - no current control - heat pumps or switch sockets
-	Heating                    // charger - heating device - soc ist temperature (°C)
-	Continuous                 // charger - heating device where disabled means "normal operation"
-	Average                    // tariff
-	Cacheable                  // tariff
-	Offline                    // vehicle
-	Retryable                  // vehicle
-	Streaming                  // vehicle
-	WelcomeCharge              // vehicle
-	ClimaterDisabled           // vehicle - ignore climater state for charge control
-	AutodetectDisabled         // vehicle - do not try to identify vehicle by status
-	WakeUpDisabled             // vehicle - do not send wake-up calls
+	_                        Feature = iota
+	CoarseCurrent                    // charger
+	IntegratedDevice                 // charger - always connected - no vehicle, no charging sessions
+	SwitchDevice                     // charger - no current control - heat pumps or switch sockets
+	Heating                          // charger - heating device - soc ist temperature (°C)
+	DemandProfileWeekly              // charger - demand forecast: same weekday last week (warm water)
+	DemandProfileTemperature         // charger - demand forecast: daily avg scaled by outdoor temp (room heating)
+	Continuous                       // charger - heating device where disabled means "normal operation"
+	Average                          // tariff
+	Cacheable                        // tariff
+	Offline                          // vehicle
+	Retryable                        // vehicle
+	Streaming                        // vehicle
+	WelcomeCharge                    // vehicle
+	ClimaterDisabled                 // vehicle - ignore climater state for charge control
+	AutodetectDisabled               // vehicle - do not try to identify vehicle by status
+	WakeUpDisabled                   // vehicle - do not send wake-up calls
 )

core/metrics/collector.go

@@ -170,6 +170,10 @@ func (c *Collector) EnergyProfile(from time.Time) (*[96]float64, error) {
 	return energyProfile(c.entity, from)
 }
 
+func (c *Collector) EnergyProfileWeekday() (*[96]float64, error) {
+	return energyProfileWeekday(c.entity)
+}
+
 // LastSlotEnergy returns the energy in kWh of the most recently completed
 // 15min slot, or false when it has not been persisted (boot, data gap) or
 // contains recovered downtime energy.

core/metrics/db_profile.go

@@ -10,8 +10,9 @@ import (
 
 var ErrIncomplete = errors.New("meter profile incomplete")
 
-// energyProfile returns a 15min average meter profile in Wh. The profile
-// is sorted by timestamp starting at 00:00. It is guaranteed to contain 96 15min values.
+// energyProfile returns a 15min average meter profile in kWh, averaged across all
+// days in [from, now). Groups by time-of-day (96 slots). Returns ErrIncomplete if
+// fewer than 96 slots are present.
 func energyProfile(entity entity, from time.Time) (*[96]float64, error) {
 	db, err := db.Instance.DB()
 	if err != nil {
@@ -61,3 +62,62 @@ func energyProfile(entity entity, from time.Time) (*[96]float64, error) {
 
 	return (*[96]float64)(res), nil
 }
+
+// energyProfileWeekday returns the actual 96-slot 15min energy profile (kWh) for the
+// same weekday as now, taken from 7 days ago. No averaging — one day is the forecast.
+// Returns ErrIncomplete if fewer than 96 slots are present for that day.
+func energyProfileWeekday(entity entity) (*[96]float64, error) {
+	database, err := db.Instance.DB()
+	if err != nil {
+		return nil, err
+	}
+
+	// same weekday, 7 days back: covers exactly 00:00–23:45 of that day
+	weekdayNum := int(time.Now().Weekday()) // 0=Sunday
+	rows, err := database.Query(`SELECT ts, COALESCE(energy, 0) AS energy
+		FROM meters
+		WHERE meter = ? AND COALESCE(recovered, 0) = 0
+		  AND strftime('%w', ts, 'unixepoch', 'localtime') = ?
+		  AND ts >= ?
+		  AND ts < ?
+		ORDER BY ts ASC`,
+		entity.Id,
+		weekdayNum,
+		time.Now().AddDate(0, 0, -7).Truncate(24*time.Hour).Unix(),
+		time.Now().AddDate(0, 0, -6).Truncate(24*time.Hour).Unix(),
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var prev time.Time
+	res := make([]float64, 0, 96)
+
+	for rows.Next() {
+		var ts SqlTime
+		var val float64
+
+		if err := rows.Scan(&ts, &val); err != nil {
+			return nil, err
+		}
+
+		// interpolate single missing value
+		if !prev.IsZero() && time.Time(ts).Sub(prev) == 2*tariff.SlotDuration {
+			res = append(res, (val+res[len(res)-1])/2)
+		}
+		prev = time.Time(ts)
+
+		res = append(res, val)
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	if len(res) != 96 {
+		return nil, ErrIncomplete
+	}
+
+	return (*[96]float64)(res), nil
+}