- fixed test names

- moved selection sort test and benchmark to the end because it takes very long to finish.

Author: mattan

sorts/selection_sort.go

@@ -1,7 +1,7 @@
 //Package sorts a package for demonstrating sorting algorithms in Go
 package sorts
 
-func selectionSort(arr []int) []int {
+func SelectionSort(arr []int) []int {
 
 	for i := 0; i < len(arr); i++ {
 		min := i

sorts/sorts_case_test.go

@@ -19,37 +19,36 @@ var arr []int = makeRandomSignedSlice(500_000)
 var sortTests = []sortTest{
 	//Sorted slice
 	{[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-		[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Sorted Signed"},
+		[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Sorted Unsigned"},
 	//Reversed slice
 	{[]int{10, 9, 8, 7, 6, 5, 4, 3, 2, 1},
-		[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Reversed Signed"},
-
-	//500k int values sort
-	{arr, getSortedVersion(arr), "Large Random Signed"},
+		[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Reversed Unsigned"},
+	//500k unsigned int values sort
+	{uarr, getSortedVersion(uarr), "Large Random Unsigned"},
 
 	//Sorted slice
 	{[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Sorted Unsigned"},
+		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Sorted Signed"},
 
 	//Reversed slice
 	{[]int{10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10},
-		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Reversed Unsigned"},
+		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Reversed Signed"},
 
 	//Reversed slice, even length
 	{[]int{10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10},
-		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Reversed Unsigned #2"},
+		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "Reversed Signed #2"},
 
 	//Random order with repetitions
 	{[]int{-5, 7, 4, -2, 6, 5, 8, 3, 2, -7, -1, 0, -3, 9, -6, -4, 10, 9, 1, -8, -9, -10},
-		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 10}, "Random order"},
+		[]int{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 10}, "Random order Signed"},
+
+	//500k int values sort
+	{arr, getSortedVersion(arr), "Large Random Signed"},
 
 	//Empty slice
 	{[]int{}, []int{}, "Empty"},
 	//Single-entry slice
 	{[]int{1}, []int{1}, "Singleton"},
-
-	//500k non negative int values sort
-	{uarr, getSortedVersion(uarr), "Large Random unsigned"},
 }
 
 func makeRandomUnsignedSlice(size int) []int {

sorts/sorts_test.go

@@ -1,7 +1,6 @@
 package sorts
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -14,12 +13,7 @@ func testFramework(t *testing.T, sortingFunction func([]int) []int) {
 				if pos == -1 {
 					t.Errorf("test %s failed due to slice length changing", test.name)
 				}
-
-				for i := pos - 10; i < pos+10; i++ {
-					fmt.Print(actual[i], " ")
-				}
 				t.Errorf("test %s failed at index %d", test.name, pos)
-
 			}
 		})
 	}
@@ -55,6 +49,11 @@ func TestRadix(t *testing.T) {
 	testFramework(t, RadixSort)
 }
 
+// Very slow, consider commenting
+func TestSelection(t *testing.T) {
+	testFramework(t, SelectionSort)
+}
+
 /* func TestTopological(t *testing.T) {
 	testFramework(t, topologicalSort)
 } */
@@ -70,14 +69,6 @@ func BenchmarkBubble(b *testing.B) {
 	}
 }
 
-func BenchmarkSelection(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		for _, test := range sortTests {
-			selectionSort(test.input)
-		}
-	}
-}
-
 func BenchmarkInsertion(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		for _, test := range sortTests {
@@ -126,6 +117,15 @@ func BenchmarkRadix(b *testing.B) {
 	}
 }
 
+// Very Slow, consider commenting
+func BenchmarkSelection(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		for _, test := range sortTests {
+			SelectionSort(test.input)
+		}
+	}
+}
+
 /*func BenchmarkTopological(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		for _, test := range sortTests {