Merge pull request #217 from observerly/refactor/vcurve/Point

refactor: amend Point{} to X, Y in vcurve module in @observerly/iris

Author: michealroberts

pkg/vcurve/vcurve.go

@@ -10,8 +10,8 @@ import (
 
 // Point is a data point with x and y coordinates.
 type Point struct {
-	x float64
-	y float64
+	X float64
+	Y float64
 }
 
 // VCurve is a struct that holds the data points for the V-curve.
@@ -25,8 +25,8 @@ type VCurveParams struct {
 	B float64
 	C float64
 	D float64
-	x []float64
-	y []float64
+	X []float64
+	Y []float64
 }
 
 /*
@@ -43,8 +43,8 @@ func NewHyperbolicVCurve(data VCurve) *VCurveParams {
 
 	// A single loop to populate the slices
 	for _, point := range data.Points {
-		dataX = append(dataX, point.x)
-		dataY = append(dataY, point.y)
+		dataX = append(dataX, point.X)
+		dataY = append(dataY, point.Y)
 	}
 
 	// Get the initial guess for the parameter, for A, we take the mean value of the yData:
@@ -61,8 +61,8 @@ func NewHyperbolicVCurve(data VCurve) *VCurveParams {
 		B: B,
 		C: C,
 		D: 0,
-		x: dataX,
-		y: dataY,
+		X: dataX,
+		Y: dataY,
 	}
 }
 
@@ -108,7 +108,7 @@ LevenbergMarquardtOptimisation optimizes the hyperbolic function using the Leven
 func (p *VCurveParams) LevenbergMarquardtOptimisation() (VCurveParams, error) {
 	// Setting up the optimizer:
 	problem := optimize.Problem{
-		Func: objectiveFunc(p.x, p.y),
+		Func: objectiveFunc(p.X, p.Y),
 	}
 
 	// Create custom settings for the optimization:

pkg/vcurve/vcurve_test.go

@@ -6,27 +6,27 @@ import (
 
 var (
 	points = []Point{
-		{x: 29000, y: 40.5},
-		{x: 29100, y: 36.2},
-		{x: 29200, y: 31.4},
-		{x: 29300, y: 28.6},
-		{x: 29400, y: 23.1},
-		{x: 29500, y: 21.2},
-		{x: 29600, y: 16.6},
-		{x: 29700, y: 13.7},
-		{x: 29800, y: 6.21},
-		{x: 29900, y: 4.21},
-		{x: 30000, y: 3.98},
-		{x: 30100, y: 4.01},
-		{x: 30200, y: 4.85},
-		{x: 30300, y: 11.1},
-		{x: 30400, y: 15.3},
-		{x: 30500, y: 22.1},
-		{x: 30600, y: 21.9},
-		{x: 30700, y: 27.4},
-		{x: 30800, y: 32.1},
-		{x: 30900, y: 36.5},
-		{x: 31000, y: 39.7},
+		{X: 29000, Y: 40.5},
+		{X: 29100, Y: 36.2},
+		{X: 29200, Y: 31.4},
+		{X: 29300, Y: 28.6},
+		{X: 29400, Y: 23.1},
+		{X: 29500, Y: 21.2},
+		{X: 29600, Y: 16.6},
+		{X: 29700, Y: 13.7},
+		{X: 29800, Y: 6.21},
+		{X: 29900, Y: 4.21},
+		{X: 30000, Y: 3.98},
+		{X: 30100, Y: 4.01},
+		{X: 30200, Y: 4.85},
+		{X: 30300, Y: 11.1},
+		{X: 30400, Y: 15.3},
+		{X: 30500, Y: 22.1},
+		{X: 30600, Y: 21.9},
+		{X: 30700, Y: 27.4},
+		{X: 30800, Y: 32.1},
+		{X: 30900, Y: 36.5},
+		{X: 31000, Y: 39.7},
 	}
 )