From dbc7cca97d6e2d3ef3ec01fe76ed2a0ef7477e62 Mon Sep 17 00:00:00 2001 From: msanlli Date: Sat, 28 Dec 2024 23:27:56 +0100 Subject: [PATCH 1/5] fix enum logic --- backend/cmd/JSON_ADE | 2 +- backend/internal/pod_data/measurement.go | 10 +++++++--- backend/internal/pod_data/pod_data.go | 2 -- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/backend/cmd/JSON_ADE b/backend/cmd/JSON_ADE index c5f6b5712..5857e0f8d 160000 --- a/backend/cmd/JSON_ADE +++ b/backend/cmd/JSON_ADE @@ -1 +1 @@ -Subproject commit c5f6b5712e5d9dc7ef80ade201796fe66c295ad5 +Subproject commit 5857e0f8d85aa9b5953e3b84d7cc39b1c9a96858 diff --git a/backend/internal/pod_data/measurement.go b/backend/internal/pod_data/measurement.go index 869c69168..d0d6bbf6b 100644 --- a/backend/internal/pod_data/measurement.go +++ b/backend/internal/pod_data/measurement.go @@ -87,12 +87,16 @@ func getEnumMeasurement(adeMeas adj.Measurement) EnumMeasurement { Id: adeMeas.Id, Name: adeMeas.Name, Type: EnumType, - Options: getEnumMembers(adeMeas.EnumValues), + Options: getEnumMembers(adeMeas.Type), } } -func getEnumMembers(enumExp []string) []string { - return enumExp +func getEnumMembers(enumExp string) []string { + trimmedEnumExp := strings.Replace(enumExp, " ", "", -1) + firstParenthesisIndex := strings.Index(trimmedEnumExp, "(") + lastParenthesisIndex := strings.LastIndex(trimmedEnumExp, ")") + + return strings.Split(trimmedEnumExp[firstParenthesisIndex+1:lastParenthesisIndex], ",") } func getBooleanMeasurement(adeMeas adj.Measurement) BooleanMeasurement { diff --git a/backend/internal/pod_data/pod_data.go b/backend/internal/pod_data/pod_data.go index a85bc7644..156bc42b8 100644 --- a/backend/internal/pod_data/pod_data.go +++ b/backend/internal/pod_data/pod_data.go @@ -38,8 +38,6 @@ func getBoard(adjBoard adj.Board, globalUnits map[string]utils.Operations) (Boar packets := make([]Packet, 0) - // TESTING - for _, adjPacket := range adjBoard.Packets { packet, err := getPacket(adjPacket) // Black magic fuck if err != nil { From 0e1a797ca014bf83fa352657515546d9c308f2c3 Mon Sep 17 00:00:00 2001 From: msanlli Date: Wed, 1 Jan 2025 00:41:52 +0100 Subject: [PATCH 2/5] empty enum exception --- backend/internal/pod_data/measurement.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/internal/pod_data/measurement.go b/backend/internal/pod_data/measurement.go index d0d6bbf6b..2aa9a035f 100644 --- a/backend/internal/pod_data/measurement.go +++ b/backend/internal/pod_data/measurement.go @@ -92,11 +92,14 @@ func getEnumMeasurement(adeMeas adj.Measurement) EnumMeasurement { } func getEnumMembers(enumExp string) []string { - trimmedEnumExp := strings.Replace(enumExp, " ", "", -1) - firstParenthesisIndex := strings.Index(trimmedEnumExp, "(") - lastParenthesisIndex := strings.LastIndex(trimmedEnumExp, ")") + if enumExp == "enum" { + return []string{} + } else { + firstParenthesisIndex := strings.Index(enumExp, "(") + lastParenthesisIndex := strings.LastIndex(enumExp, ")") - return strings.Split(trimmedEnumExp[firstParenthesisIndex+1:lastParenthesisIndex], ",") + return strings.Split(enumExp[firstParenthesisIndex+1:lastParenthesisIndex], ",") + } } func getBooleanMeasurement(adeMeas adj.Measurement) BooleanMeasurement { From bd9389a68c8805effd980f72b35b146d2c230630 Mon Sep 17 00:00:00 2001 From: msanlli Date: Wed, 1 Jan 2025 01:40:44 +0100 Subject: [PATCH 3/5] adapt to enumValues ADJ logic --- backend/internal/pod_data/measurement.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/backend/internal/pod_data/measurement.go b/backend/internal/pod_data/measurement.go index 2aa9a035f..b75247146 100644 --- a/backend/internal/pod_data/measurement.go +++ b/backend/internal/pod_data/measurement.go @@ -55,13 +55,11 @@ func getNumericMeasurement(adeMeas adj.Measurement, globalUnits map[string]utils warningRange := adeMeas.WarningRange displayUnits, err := utils.ParseUnits(adeMeas.DisplayUnits, globalUnits) - if err != nil { measErrs.Add(err) } podUnits, err := utils.ParseUnits(adeMeas.PodUnits, globalUnits) - if err != nil { measErrs.Add(err) } @@ -87,18 +85,7 @@ func getEnumMeasurement(adeMeas adj.Measurement) EnumMeasurement { Id: adeMeas.Id, Name: adeMeas.Name, Type: EnumType, - Options: getEnumMembers(adeMeas.Type), - } -} - -func getEnumMembers(enumExp string) []string { - if enumExp == "enum" { - return []string{} - } else { - firstParenthesisIndex := strings.Index(enumExp, "(") - lastParenthesisIndex := strings.LastIndex(enumExp, ")") - - return strings.Split(enumExp[firstParenthesisIndex+1:lastParenthesisIndex], ",") + Options: adeMeas.EnumValues, } } From c7161a5eeca0401222071d2a32e7731087482ba7 Mon Sep 17 00:00:00 2001 From: msanlli Date: Wed, 1 Jan 2025 01:42:02 +0100 Subject: [PATCH 4/5] deprecate old range finding logic --- backend/internal/utils/range.go | 47 --------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 backend/internal/utils/range.go diff --git a/backend/internal/utils/range.go b/backend/internal/utils/range.go deleted file mode 100644 index 2a6695c8e..000000000 --- a/backend/internal/utils/range.go +++ /dev/null @@ -1,47 +0,0 @@ -package utils - -import ( - "errors" - "strconv" - "strings" -) - -func ParseRange(literal string) ([]*float64, error) { - if literal == "" { - return []*float64{nil, nil}, nil - } - - strRange := strings.Split(strings.TrimSuffix(strings.TrimPrefix(strings.Replace(literal, " ", "", -1), "["), "]"), ",") - - if len(strRange) != 2 { - return nil, errors.New("invalid range") - } - - numRange := make([]*float64, 0) - - if strRange[0] != "" { - lowerBound, errLowerBound := strconv.ParseFloat(strRange[0], 64) - - if errLowerBound != nil { - return nil, errors.New("parsing lower bound") - } - - numRange = append(numRange, &lowerBound) - } else { - numRange = append(numRange, nil) - } - - if strRange[1] != "" { - upperBound, errUpperBound := strconv.ParseFloat(strRange[1], 64) - - if errUpperBound != nil { - return nil, errors.New("parsing upper bound") - } - - numRange = append(numRange, &upperBound) - } else { - numRange = append(numRange, nil) - } - - return numRange, nil -} From 72d3898726aba1cc6ff37f7cc44fd96fb8877b51 Mon Sep 17 00:00:00 2001 From: msanlli Date: Wed, 1 Jan 2025 01:51:06 +0100 Subject: [PATCH 5/5] update adj --- backend/cmd/JSON_ADE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/cmd/JSON_ADE b/backend/cmd/JSON_ADE index 5857e0f8d..7a3da6697 160000 --- a/backend/cmd/JSON_ADE +++ b/backend/cmd/JSON_ADE @@ -1 +1 @@ -Subproject commit 5857e0f8d85aa9b5953e3b84d7cc39b1c9a96858 +Subproject commit 7a3da66976be16f28cab96e9c63f18fb0ab664f7