Exported A2l & Hex from calib_data and changed SystemConstants to hashmap

Changed A2l & Hex from calibrationReader into exported fields  so they are available for preliminary testing outside the library.
Also changed SystemConstants from slice to a hashmap so theyx can be searched more efficiently.

Author: asap2Go

a2l/mod_par.go

@@ -22,7 +22,7 @@ type modPar struct {
 	noOfInterfaces       noOfInterfaces
 	phoneNo              phoneNo
 	supplier             supplier
-	systemConstant       []systemConstant
+	SystemConstants      map[string]systemConstant
 	user                 user
 	version              version
 }
@@ -139,7 +139,7 @@ forLoop:
 				log.Err(err).Msg("modPar systemConstant could not be parsed")
 				break forLoop
 			}
-			mp.systemConstant = append(mp.systemConstant, buf)
+			mp.SystemConstants[buf.name] = buf
 			log.Info().Msg("modPar systemConstant successfully parsed")
 		case userToken:
 			mp.user, err = parseUser(tok)

calib_data.go

@@ -26,15 +26,15 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-//CalibrationData contains the parsed structs from the a2l as well as the byte data from the hex file
-//that are parsed by ReadCalibration()
+// CalibrationData contains the parsed structs from the a2l as well as the byte data from the hex file
+// that are parsed by ReadCalibration()
 type CalibrationData struct {
-	a2l a2l.A2L
-	hex map[uint32]byte
+	A2l a2l.A2L
+	Hex map[uint32]byte
 }
 
-//ReadCalibration takes filepaths to the a2l file and the hex file,
-//parses them in parallel and returns a CalibrationData struct
+// ReadCalibration takes filepaths to the a2l file and the hex file,
+// parses them in parallel and returns a CalibrationData struct
 func ReadCalibration(a2lFilePath string, hexFilePath string) (CalibrationData, error) {
 	var err error
 	var cd CalibrationData
@@ -66,13 +66,13 @@ func ReadCalibration(a2lFilePath string, hexFilePath string) (CalibrationData, e
 		}
 		return cd, firstErr
 	}
-	cd.a2l = <-a2lChan
-	cd.hex = <-hexChan
+	cd.A2l = <-a2lChan
+	cd.Hex = <-hexChan
 	return cd, nil
 }
 
-//readA2L is a helper function intended to be run in a separate go routine to call the a2l parser
-//in order to be able to parse hex and a2l in parallel
+// readA2L is a helper function intended to be run in a separate go routine to call the a2l parser
+// in order to be able to parse hex and a2l in parallel
 func readA2L(wg *sync.WaitGroup, ca chan a2l.A2L, ce chan error, a2lFilePath string) {
 	defer wg.Done()
 	a, err := a2l.ParseFromFile(a2lFilePath)
@@ -87,8 +87,8 @@ func readA2L(wg *sync.WaitGroup, ca chan a2l.A2L, ce chan error, a2lFilePath str
 	}
 }
 
-//readHex is a helper function intended to be run in a separate go routine to call the hex parser
-//in order to be able to parse hex and a2l in parallel
+// readHex is a helper function intended to be run in a separate go routine to call the hex parser
+// in order to be able to parse hex and a2l in parallel
 func readHex(wg *sync.WaitGroup, ch chan map[uint32]byte, ce chan error, hexFilePath string) {
 	defer wg.Done()
 	if strings.Contains(strings.ToLower(hexFilePath), ".hex") {
@@ -122,7 +122,7 @@ func readHex(wg *sync.WaitGroup, ch chan map[uint32]byte, ce chan error, hexFile
 
 }
 
-//configureLogger adds a file logger, resets previous log file and does some formatting
+// configureLogger adds a file logger, resets previous log file and does some formatting
 func configureLogger() error {
 	var err error
 	var file *os.File
@@ -149,7 +149,7 @@ func (cd *CalibrationData) getObjectsByIdent(ident string) []interface{} {
 	var buf interface{}
 	var exists bool
 
-	for _, m := range cd.a2l.Project.Modules {
+	for _, m := range cd.A2l.Project.Modules {
 		buf, exists = m.AxisPts[ident]
 		if exists {
 			calibrationObjects = append(calibrationObjects, buf)

calib_data_test.go

@@ -22,8 +22,8 @@ func BenchmarkReadCalibration(b *testing.B) {
 		if err != nil {
 			log.Err(err).Msg("failed reading calibration")
 		} else {
-			log.Info().Str("project name", cd.a2l.Project.Name).Msg("finished parsing")
-			log.Info().Int("length of data in hex file", len(cd.hex)).Msg("finished parsing")
+			log.Info().Str("project name", cd.A2l.Project.Name).Msg("finished parsing")
+			log.Info().Int("length of data in hex file", len(cd.Hex)).Msg("finished parsing")
 			log.Warn().Msg("time for parsing bench files: " + fmt.Sprint(elapsed.Milliseconds()))
 		}
 		cd, err = CalibrationData{}, nil
@@ -43,8 +43,8 @@ func TestReadCalibration(t *testing.T) {
 		log.Err(err).Msg("failed reading calibration")
 		t.Fatalf("failed parsing with error: %s.", err)
 	} else {
-		log.Info().Str("project name", cd.a2l.Project.Name).Msg("finished parsing")
-		log.Info().Int("length of data in hex file", len(cd.hex)).Msg("finished parsing")
+		log.Info().Str("project name", cd.A2l.Project.Name).Msg("finished parsing")
+		log.Info().Int("length of data in hex file", len(cd.Hex)).Msg("finished parsing")
 		log.Warn().Msg("time for parsing test files: " + fmt.Sprint(elapsed.Milliseconds()))
 		startTime := time.Now()
 		//find object in a2l struct