Accept all dimensionless measurements

Trim space and normalize decimal separators for all cases. Relax the
parsing of measurements to accept all number-like values, not just those
with a single digit.

luxwslang/terminology.go

@@ -69,17 +69,17 @@ func (*Terminology) ParseDuration(v string) (time.Duration, error) {
 	return time.ParseDuration(fmt.Sprintf("%dh%dm%ds", hours, minutes, seconds))
 }
 
-// ParseMeasurement parses a string with a value and a physical unit such as
-// degrees Celsius or kWh. The unit is case-sensitive. The returned unit string
-// is in a normalized form.
+// ParseMeasurement parses a string with a value and an optional physical unit
+// such as degrees Celsius or kWh. The unit name is case-sensitive. The
+// returned unit string is in a normalized form.
 func (*Terminology) ParseMeasurement(text string) (float64, string, error) {
+	text = strings.TrimSpace(strings.ReplaceAll(text, ",", "."))
+
 	if len(text) > 2 {
 		var value float64
 		var unit string
 		var ok bool
 
-		text = strings.TrimSpace(strings.ReplaceAll(text, ",", "."))
-
 		for _, format := range []string{
 			"%f %s\n",
 			"%f%s\n",
@@ -120,14 +120,10 @@ func (*Terminology) ParseMeasurement(text string) (float64, string, error) {
 		}
 	}
 
-	if _, err := strconv.Atoi(text); err == nil && len(text) == 1 {
-		var value float64
-		var unit string
-
-		unit = "enum"
-		value, _ = strconv.ParseFloat(text, 64)
-
-		return value, unit, nil
+	// Heat pumps of type LD7 report a "Smart Grid" measurement which is
+	// a dimensionless enumeration.
+	if value, err := strconv.ParseFloat(text, 64); err == nil {
+		return value, "", nil
 	}
 
 	return 0, "", fmt.Errorf("unrecognized measurement format %q", text)

luxwslang/terminology_test.go

@@ -122,7 +122,7 @@ func TestParseMeasurement(t *testing.T) {
 		wantErr  bool
 	}{
 		{terms: German, input: "", wantErr: true},
-		{terms: German, input: "1.23", wantErr: true},
+		{terms: German, input: "1.23", want: 1.23},
 		{terms: German, input: "100m", wantErr: true},
 		{terms: German, input: "1l", wantErr: true},
 		{terms: German, input: "1.11°C", want: 1.11, wantUnit: "degC"},
@@ -138,11 +138,12 @@ func TestParseMeasurement(t *testing.T) {
 		{terms: German, input: "100000 kWh", want: 100000, wantUnit: "kWh"},
 		{terms: German, input: "1 kW", want: 1, wantUnit: "kW"},
 		{terms: German, input: "16.66 Hz", want: 16.66, wantUnit: "Hz"},
-		{terms: German, input: "2", want: 2, wantUnit: "enum"},
+		{terms: German, input: "2", want: 2},
 		{terms: English, input: "200 mA", want: 200, wantUnit: "mA"},
 		{terms: English, input: "3600s", want: 3600, wantUnit: "s"},
 		{terms: English, input: "36 m³/h", want: 36, wantUnit: "m³/h"},
 		{terms: English, input: "18 min", want: 18 * 60, wantUnit: "s"},
+		{terms: English, input: "3.14", want: 3.14},
 		{terms: Dutch, input: "--- l/h", want: 0, wantUnit: "l/h"},
 		{terms: English, input: "---rpm", want: 0, wantUnit: "rpm"},
 	} {