capitalize right and left

cipepser · Apr 6, 2018 · f6a6ece · f6a6ece
1 parent 6ee8b14
commit f6a6ece
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 43 deletions.
diff --git a/ward/ward.go b/ward/ward.go
@@ -9,10 +9,10 @@ import (
 // Group represents a cluster.
 // Each Group is represented by `vec` and has N,
 // the number of menber included in the group.
-// Each Group have 2 children(left and right) excludes leaf node,
-// leaf node's left and right is -1.
+// Each Group have 2 children(Left and Right) excludes leaf node,
+// leaf node's Left and Right is -1.
 type Group struct {
-	left, right, N int
+	Left, Right, N int
 	vec            []float64
 	dist           float64
 	visited        bool
@@ -56,8 +56,8 @@ func linkage(T Tree) Tree {
 	vec := centerOfGravity(T[idxi], T[idxj])
 
 	T = append(T, Group{
-		left:    idxi,
-		right:   idxj,
+		Left:    idxi,
+		Right:   idxj,
 		N:       T[idxi].N + T[idxj].N,
 		vec:     vec,
 		dist:    d,
@@ -83,8 +83,8 @@ func initialize(X [][]float64) Tree {
 	T := make([]Group, len(X))
 	for i, vec := range X {
 		T[i] = Group{
-			left:    -1,
-			right:   -1,
+			Left:    -1,
+			Right:   -1,
 			N:       1,
 			vec:     vec,
 			dist:    0,

diff --git a/ward/ward_test.go b/ward/ward_test.go
@@ -25,40 +25,40 @@ func TestWard(t *testing.T) {
 			},
 			want: Tree{
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{0, 0},
 					dist:    0,
 					visited: true,
 				},
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{1, 0},
 					dist:    0,
 					visited: true,
 				},
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{5, 0},
 					dist:    0,
 					visited: true,
 				},
 				Group{
-					left:    0,
-					right:   1,
+					Left:    0,
+					Right:   1,
 					N:       2,
 					vec:     []float64{0.5, 0},
 					dist:    0.5,
 					visited: true,
 				},
 				Group{
-					left:    2,
-					right:   3,
+					Left:    2,
+					Right:   3,
 					N:       3,
 					vec:     []float64{2, 0},
 					dist:    13.5,
@@ -90,16 +90,16 @@ func Test_linkage(t *testing.T) {
 			args: args{
 				Tree{
 					Group{
-						left:    -1,
-						right:   -1,
+						Left:    -1,
+						Right:   -1,
 						N:       1,
 						vec:     []float64{0, 0},
 						dist:    0,
 						visited: false,
 					},
 					Group{
-						left:    -1,
-						right:   -1,
+						Left:    -1,
+						Right:   -1,
 						N:       1,
 						vec:     []float64{2, 0},
 						dist:    0,
@@ -109,24 +109,24 @@ func Test_linkage(t *testing.T) {
 			},
 			want: Tree{
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{0, 0},
 					dist:    0,
 					visited: true,
 				},
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{2, 0},
 					dist:    0,
 					visited: true,
 				},
 				Group{
-					left:    0,
-					right:   1,
+					Left:    0,
+					Right:   1,
 					N:       2,
 					vec:     []float64{1, 0},
 					dist:    2,
@@ -157,16 +157,16 @@ func Test_centerOfGravity(t *testing.T) {
 			name: "test for centerOfGravity (0, 0) and (2, 0)",
 			args: args{
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{0, 0},
 					dist:    0,
 					visited: false,
 				},
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{2, 0},
 					dist:    0,
@@ -202,8 +202,8 @@ func Test_initialize(t *testing.T) {
 				},
 			},
 			want: Tree{Group{
-				left:    -1,
-				right:   -1,
+				Left:    -1,
+				Right:   -1,
 				N:       1,
 				vec:     []float64{0, 0},
 				dist:    0,
@@ -234,16 +234,16 @@ func Test_dist(t *testing.T) {
 			name: "test for dist from (0, 0) to (3, 4)",
 			args: args{
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{0, 0},
 					dist:    0,
 					visited: false,
 				},
 				Group{
-					left:    -1,
-					right:   -1,
+					Left:    -1,
+					Right:   -1,
 					N:       1,
 					vec:     []float64{3, 4},
 					dist:    0,
@@ -264,8 +264,8 @@ func Test_dist(t *testing.T) {
 
 func TestGroup_GetDist(t *testing.T) {
 	type fields struct {
-		left    int
-		right   int
+		Left    int
+		Right   int
 		N       int
 		vec     []float64
 		dist    float64
@@ -278,8 +278,8 @@ func TestGroup_GetDist(t *testing.T) {
 	}{
 		{name: "test for GetDist",
 			fields: fields{
-				left:    -1,
-				right:   -1,
+				Left:    -1,
+				Right:   -1,
 				N:       1,
 				vec:     []float64{},
 				dist:    1.2,
@@ -291,8 +291,8 @@ func TestGroup_GetDist(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			g := &Group{
-				left:    tt.fields.left,
-				right:   tt.fields.right,
+				Left:    tt.fields.Left,
+				Right:   tt.fields.Right,
 				N:       tt.fields.N,
 				vec:     tt.fields.vec,
 				dist:    tt.fields.dist,