implements automatic stepping if needed fix #15

Author: hekmon

file.go

@@ -16,8 +16,9 @@ const (
 	headerFields       = 9
 	headerDateFormat   = "02/01/2006"                // 31/12/2021
 	dataDateFormat     = "2006-01-02T15:04:05-07:00" // 2021-12-31T00:30:00+01:00
-	steppingHalfHour   = 30 * time.Minute
-	steppingHour       = time.Hour
+	noSteppingValue    = -1
+	dataStartLine      = 4
+	defaultStepping    = 30 * time.Minute
 )
 
 type CSVHeader struct {
@@ -30,6 +31,7 @@ type CSVHeader struct {
 type point struct {
 	Time  time.Time
 	Value float64 // kW
+	Conso float64 // kWh
 }
 
 func parseFile(path string) (header CSVHeader, data []point, err error) {
@@ -49,24 +51,10 @@ func parseFile(path string) (header CSVHeader, data []point, err error) {
 		return
 	}
 	// Parse data
-	if data, err = parseData(cr); err != nil {
+	if data, err = parseData(cr, header.Step); err != nil {
 		err = fmt.Errorf("failed to parse data: %w", err)
 		return
 	}
-	// Try to guess stepping if missing (saw in the wild)
-	if header.Step == -1 {
-		for index, point := range data {
-			if point.Time.Minute() == 30 {
-				header.Step = steppingHalfHour
-				break
-			}
-			if index > 1 {
-				// 2 records processed and 30min step not encountered, guessing it is 60min step
-				header.Step = steppingHour
-				break
-			}
-		}
-	}
 	return
 }
 
@@ -101,25 +89,21 @@ func parseHeader(cr *csv.Reader) (header CSVHeader, err error) {
 		return
 	}
 	step_str := records[8]
-	if step_str == "" {
-		// step empty
-		header.Step = -1
-	} else {
+	if step_str != "" {
 		var step int
 		if step, err = strconv.Atoi(step_str); err != nil {
 			err = fmt.Errorf("non integer stepping found: %s", err)
 			return
-		} else if header.Step != 30 && header.Step != 60 {
-			err = fmt.Errorf("unexpected stepping found: %d", header.Step)
-			return
-		} else {
-			header.Step = time.Duration(step) * time.Minute
 		}
+		header.Step = time.Duration(step) * time.Minute
+	} else {
+		// step empty
+		header.Step = noSteppingValue
 	}
 	return
 }
 
-func parseData(cr *csv.Reader) (data []point, err error) {
+func parseData(cr *csv.Reader, stepping time.Duration) (data []point, err error) {
 	// nb of records changes for data
 	cr.FieldsPerRecord = 2
 	// remove data header
@@ -134,9 +118,14 @@ func parseData(cr *csv.Reader) (data []point, err error) {
 		line        int
 		recordTime  time.Time
 		recordValue int
+		computedkWh float64
 	)
-	data = make([]point, 0, 365*24*2) // most people will analyse a full year (make more sense for tempo)
-	for line = 4; ; line++ {
+	if stepping == noSteppingValue {
+		data = make([]point, 0, 365*24*(time.Hour/defaultStepping))
+	} else {
+		data = make([]point, 0, 365*24*(time.Hour/stepping))
+	}
+	for line = dataStartLine; ; line++ {
 		// read line
 		records, err = cr.Read()
 		if err != nil {
@@ -156,19 +145,34 @@ func parseData(cr *csv.Reader) (data []point, err error) {
 			err = fmt.Errorf("failed to parse record value: %w", err)
 			break
 		}
-		// checks
-		if recordTime.Minute() != 30 && recordTime.Minute() != 0 {
-			err = fmt.Errorf("minutes should always be 00 or 30: %v", recordTime)
-			break
-		}
+		// check
 		if recordTime.Second() != 0 {
 			err = fmt.Errorf("seconds should always be 00: %v", recordTime)
 			break
 		}
+		// Determine stepping if needed
+		if stepping == noSteppingValue {
+			if line > dataStartLine {
+				// get previous point and compute stepping
+				prevPoint := data[len(data)-1]
+				stepping := recordTime.Sub(prevPoint.Time)
+				computedkWh = float64(recordValue) / 1000 / float64(time.Hour/stepping)
+				if line == dataStartLine+1 {
+					// compute the first point kWh using the same stepping
+					firstPoint := data[len(data)-1]
+					firstPoint.Conso = firstPoint.Value / 1000 / float64(time.Hour/stepping)
+					data[len(data)-1] = firstPoint
+				}
+			}
+			// else first point, can not compute stepping without a previous point, waiting for second point to retro compute first point
+		} else {
+			computedkWh = float64(recordValue) / 1000 / float64(time.Hour/stepping)
+		}
 		// save value
 		data = append(data, point{
 			Time:  recordTime.In(frLocation),   // make sure every date time in this program is in the same loc
 			Value: float64(recordValue) / 1000, // convert W to kW
+			Conso: computedkWh,
 		})
 	}
 	if errors.Is(err, io.EOF) {

main.go

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"log"
-	"os"
 	"time"
 )
 
@@ -54,7 +53,6 @@ func main() {
 
 func compute(header CSVHeader, data []point, montly bool) {
 	var (
-		pointAdjustedConso                 float64
 		totalConso, monthConso             float64
 		totalBase, monthBase, pointBase    float64
 		totalHC, monthHC, pointHC          float64
@@ -64,32 +62,27 @@ func compute(header CSVHeader, data []point, montly bool) {
 	fmt.Printf("PRM:\t\t%s\n", header.PRMID)
 	fmt.Printf("Start:\t\t%v\n", header.Start)
 	fmt.Printf("End:\t\t%v\n", header.End)
-	fmt.Printf("Stepping:\t%v\n", header.Step)
+	if header.Step == noSteppingValue {
+		fmt.Printf("Stepping:\tnot fixed (automatically detected for each point)\n")
+	} else {
+		fmt.Printf("Stepping:\t%v\n", header.Step)
+	}
 	for index, point := range data {
 		// Adjust time for start and not end
 		adjustedTime := point.Time.Add(header.Step * -1)
 		if index == 0 {
 			refMonth = adjustedTime
 		}
-		// Adjust average watt consumption to kWh
-		if header.Step == steppingHour {
-			pointAdjustedConso = point.Value
-		} else if header.Step == steppingHalfHour {
-			pointAdjustedConso = point.Value / 2
-		} else {
-			fmt.Printf("unexpected stepping: %s", header.Step)
-			os.Exit(1)
-		}
 		// Compute price for current point
-		pointBase = pointAdjustedConso * getBasePrice(adjustedTime)
-		pointHC = pointAdjustedConso * getHCPrice(adjustedTime)
-		pointTempo = pointAdjustedConso * getTempoPrice(adjustedTime)
+		pointBase = point.Conso * getBasePrice(adjustedTime)
+		pointHC = point.Conso * getHCPrice(adjustedTime)
+		pointTempo = point.Conso * getTempoPrice(adjustedTime)
 		// Handle months
 		if refMonth.Year() == adjustedTime.Year() && refMonth.Month() == adjustedTime.Month() {
 			monthBase += pointBase
 			monthHC += pointHC
 			monthTempo += pointTempo
-			monthConso += pointAdjustedConso
+			monthConso += point.Conso
 		} else {
 			if montly {
 				// Print total for previous month
@@ -104,11 +97,11 @@ func compute(header CSVHeader, data []point, montly bool) {
 			monthBase = pointBase
 			monthHC = pointHC
 			monthTempo = pointTempo
-			monthConso = pointAdjustedConso
+			monthConso = point.Conso
 			refMonth = adjustedTime
 		}
 		// Add to total
-		totalConso += pointAdjustedConso
+		totalConso += point.Conso
 		totalBase += pointBase
 		totalHC += pointHC
 		totalTempo += pointTempo