Bug fix when maxClasses >= no. unique values

ThinkingLogic · Mar 12, 2018 · 6a89f80 · 6a89f80
1 parent d43aead
commit 6a89f80
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/jenks.go b/jenks.go
@@ -52,6 +52,9 @@ func AllNaturalBreaks(data []float64, maxClasses int) [][]float64 {
 	allBreaks := [][]float64{}
 	for i := 2; i <= maxClasses; i++ {
 		nClasses := breaks(data, lowerClassLimits, i)
+		if i == len(uniq) {
+			nClasses = uniq
+		}
 		allBreaks = append(allBreaks, nClasses)
 	}
 	return allBreaks

diff --git a/jenks_test.go b/jenks_test.go
@@ -28,6 +28,12 @@ func TestNaturalBreaks(t *testing.T) {
 		{name: "more breaks than unique values",
 			args: args{nClasses: 4, data: []float64{1.1, 1.1, 1.1, 1.3, 1.3, 1.3, 1.2, 1.2, 1.2}},
 			want: []float64{1.1, 1.2, 1.3}},
+		{name: "one unique value",
+			args: args{nClasses: 4, data: []float64{1, 1, 1, 1}},
+			want: []float64{1}},
+		{name: "two values, two breaks",
+			args: args{nClasses: 4, data: []float64{1, 2}},
+			want: []float64{1, 2}},
 		{name: "http://www.real-statistics.com/multivariate-statistics/cluster-analysis/jenks-natural-breaks#example1",
 			args: args{nClasses: 4, data: []float64{28.9, 33.5, 36.1, 38.6, 40.7, 42.7, 43.6, 45.8, 48.2, 48.6, 49.0, 51.0, 52.1, 52.2, 52.2, 52.4, 53.6, 54.2, 55.8, 55.8, 56.4, 56.8, 56.8, 57.7, 57.9, 58.2, 58.3, 58.4, 60.1, 60.1, 60.2, 61.1, 61.4, 61.9, 62.1, 62.5, 62.7, 63.1, 63.6, 64.2, 64.3, 64.4, 64.6, 64.7, 64.7, 64.8, 65.4, 65.8, 65.9, 66.2, 66.4, 66.6, 66.8, 67.0, 67.0, 67.1, 67.2, 67.2, 67.4, 68.2, 68.2, 68.3, 69.4, 69.5, 69.8, 70.2, 70.3, 70.5, 70.6, 71.2, 71.2, 71.2, 71.2, 71.8, 71.9, 72.0, 72.0, 72.0, 72.3, 72.5, 72.6, 73.0, 73.0, 73.0, 73.0, 73.2, 73.4, 73.4, 73.4, 74.0, 74.2, 74.4, 74.4, 74.9, 74.9, 75.4, 75.6, 76.0, 76.3, 76.3, 76.3, 76.4, 76.7, 77.2, 77.3, 77.6, 77.7, 78.3, 78.5, 78.5, 78.6, 78.7, 78.9, 79.2, 79.2, 79.2, 79.8, 79.8, 79.9, 80.7, 80.7, 81.2, 81.4, 81.5, 81.8, 82.0, 82.1, 82.2, 82.3, 82.4, 82.8, 83.0, 83.1, 83.3, 83.4, 83.6, 83.8, 83.8, 84.0, 84.2, 85.2, 85.4, 85.8, 86.1, 86.3, 87.1, 87.5, 87.7, 87.7, 87.8, 88.3, 88.9, 89.3, 90.3, 93.1, 94.2, 94.7, 95.7, 97.8, 99.2}},
 			want: []float64{28.9, 55.8, 69.4, 80.7}},
@@ -69,6 +75,15 @@ func TestAllNaturalBreaks(t *testing.T) {
 				{1, 2, 4},
 			},
 		},
+		{name: "one unique value",
+			args: args{maxClasses: 4, data: []float64{1, 1, 1, 1}},
+			want: [][]float64{}},
+		{name: "two values, two breaks",
+			args: args{maxClasses: 4, data: []float64{1, 2}},
+			want: [][]float64{
+				{1, 2},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -101,6 +116,10 @@ func TestRound(t *testing.T) {
 			args: args{breaks: []float64{1.01, 2.01, 2.51}, data: []float64{1.01, 1.11, 1.12, 2.01, 2.11, 2.12, 2.51, 2.61, 2.72}},
 			want: []float64{1, 2, 2.5},
 		},
+		{name: "Round with 2 values",
+			args: args{breaks: []float64{1.01, 2.01}, data: []float64{1.01, 2.01}},
+			want: []float64{1, 2},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {