qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 00:48:01 -07:00
Code Releases Activity

new sort interface - no structs, just slices.

Browse Source 
R=rsc
DELTA=37  (0 added, 7 deleted, 30 changed)
OCL=22330
CL=22342
This commit is contained in:
Rob Pike 2009-01-08 15:12:00 -08:00
parent 1b7881adb4
commit ab331f7a7d
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/lib/sort.go
View File

@ -34,7 +34,6 @@ func MedianOfThree(data SortInterface, a, b, c int) {
m0 := b; m0 := b;
m1 := a; m1 := a;
m2 := c; m2 := c;
// bubble sort on 3 elements // bubble sort on 3 elements
if data.Less(m1, m0) { data.Swap(m1, m0); } if data.Less(m1, m0) { data.Swap(m1, m0); }
if data.Less(m2, m1) { data.Swap(m2, m1); } if data.Less(m2, m1) { data.Swap(m2, m1); }
@ -135,40 +134,34 @@ export func IsSorted(data SortInterface) bool {
// Convenience types for common cases // Convenience types for common cases
export type IntArray struct { export type IntArray []int
data []int;
}
func (p *IntArray) Len() int { return len(p.data); } func (p IntArray) Len() int { return len(p); }
func (p *IntArray) Less(i, j int) bool { return p.data[i] < p.data[j]; } func (p IntArray) Less(i, j int) bool { return p[i] < p[j]; }
func (p *IntArray) Swap(i, j int) { p.data[i], p.data[j] = p.data[j], p.data[i]; } func (p IntArray) Swap(i, j int) { p[i], p[j] = p[j], p[i]; }
export type FloatArray struct { export type FloatArray []float
data []float;
}
func (p *FloatArray) Len() int { return len(p.data); } func (p FloatArray) Len() int { return len(p); }
func (p *FloatArray) Less(i, j int) bool { return p.data[i] < p.data[j]; } func (p FloatArray) Less(i, j int) bool { return p[i] < p[j]; }
func (p *FloatArray) Swap(i, j int) { p.data[i], p.data[j] = p.data[j], p.data[i]; } func (p FloatArray) Swap(i, j int) { p[i], p[j] = p[j], p[i]; }
export type StringArray struct { export type StringArray []string
data []string;
}
func (p *StringArray) Len() int { return len(p.data); } func (p StringArray) Len() int { return len(p); }
func (p *StringArray) Less(i, j int) bool { return p.data[i] < p.data[j]; } func (p StringArray) Less(i, j int) bool { return p[i] < p[j]; }
func (p *StringArray) Swap(i, j int) { p.data[i], p.data[j] = p.data[j], p.data[i]; } func (p StringArray) Swap(i, j int) { p[i], p[j] = p[j], p[i]; }
// Convenience wrappers for common cases // Convenience wrappers for common cases
export func SortInts(a []int) { Sort(&IntArray{a}); } export func SortInts(a []int) { Sort(IntArray(a)); }
export func SortFloats(a []float) { Sort(&FloatArray{a}); } export func SortFloats(a []float) { Sort(FloatArray(a)); }
export func SortStrings(a []string) { Sort(&StringArray{a}); } export func SortStrings(a []string) { Sort(StringArray(a)); }
export func IntsAreSorted(a []int) bool { return IsSorted(&IntArray{a}); } export func IntsAreSorted(a []int) bool { return IsSorted(IntArray(a)); }
export func FloatsAreSorted(a []float) bool { return IsSorted(&FloatArray{a}); } export func FloatsAreSorted(a []float) bool { return IsSorted(FloatArray(a)); }
export func StringsAreSorted(a []string) bool { return IsSorted(&StringArray{a}); } export func StringsAreSorted(a []string) bool { return IsSorted(StringArray(a)); }

24
src/lib/sort_test.go
View File

@ -14,15 +14,15 @@ import (
func BentleyMcIlroyTests(); func BentleyMcIlroyTests();
var ints = []int{74, 59, 238, -784, 9845, 959, 905, 0, 0, 42, 7586, -5467984, 7586} var ints = [...]int{74, 59, 238, -784, 9845, 959, 905, 0, 0, 42, 7586, -5467984, 7586}
var floats = []float{74.3, 59.0, 238.2, -784.0, 2.3, 9845.768, -959.7485, 905, 7.8, 7.8} var floats = [...]float{74.3, 59.0, 238.2, -784.0, 2.3, 9845.768, -959.7485, 905, 7.8, 7.8}
var strings = []string{"", "Hello", "foo", "bar", "foo", "f00", "%*&^*&^&", "***"} var strings = [...]string{"", "Hello", "foo", "bar", "foo", "f00", "%*&^*&^&", "***"}
export func TestSortIntArray(t *testing.T) { export func TestSortIntArray(t *testing.T) {
data := ints; data := ints;
a := sort.IntArray{data}; a := IntArray(data);
sort.Sort(&a); sort.Sort(a);
if !sort.IsSorted(&a) { if !sort.IsSorted(a) {
t.Errorf("sorted %v", ints); t.Errorf("sorted %v", ints);
t.Errorf(" got %v", data); t.Errorf(" got %v", data);
} }
@ -30,9 +30,9 @@ export func TestSortIntArray(t *testing.T) {
export func TestSortFloatArray(t *testing.T) { export func TestSortFloatArray(t *testing.T) {
data := floats; data := floats;
a := sort.FloatArray{data}; a := FloatArray(data);
sort.Sort(&a); sort.Sort(a);
if !sort.IsSorted(&a) { if !sort.IsSorted(a) {
t.Errorf("sorted %v", floats); t.Errorf("sorted %v", floats);
t.Errorf(" got %v", data); t.Errorf(" got %v", data);
} }
@ -40,9 +40,9 @@ export func TestSortFloatArray(t *testing.T) {
export func TestSortStringArray(t *testing.T) { export func TestSortStringArray(t *testing.T) {
data := strings; data := strings;
a := sort.StringArray{data}; a := StringArray(data);
sort.Sort(&a); sort.Sort(a);
if !sort.IsSorted(&a) { if !sort.IsSorted(a) {
t.Errorf("sorted %v", strings); t.Errorf("sorted %v", strings);
t.Errorf(" got %v", data); t.Errorf(" got %v", data);
} }