diff options
Diffstat (limited to 'ds')
| -rw-r--r-- | ds/arraylist.go | 8 | ||||
| -rw-r--r-- | ds/comparer.go | 10 | ||||
| -rw-r--r-- | ds/elem.go | 10 | ||||
| -rw-r--r-- | ds/integer.go | 26 |
4 files changed, 27 insertions, 27 deletions
diff --git a/ds/arraylist.go b/ds/arraylist.go index 243efe1..d3feef5 100644 --- a/ds/arraylist.go +++ b/ds/arraylist.go @@ -5,7 +5,7 @@ import ( "strings" ) -type ArrayList []Comparer +type ArrayList []Elem func (a ArrayList) FirstN(n int) string { var sb strings.Builder @@ -37,7 +37,7 @@ func (a ArrayList) Sorted() bool { } func (a ArrayList) Swap(i, j int) { - tmp := a[i] - a[i] = a[j] - a[j] = tmp + tmp := a[i] + a[i] = a[j] + a[j] = tmp } diff --git a/ds/comparer.go b/ds/comparer.go deleted file mode 100644 index 8fb3727..0000000 --- a/ds/comparer.go +++ /dev/null @@ -1,10 +0,0 @@ -package ds - -type Comparer interface { - Equal(a Comparer) bool - Lower(a Comparer) bool - LowerEqual(a Comparer) bool - Higher(a Comparer) bool - HigherEqual(a Comparer) bool - Int() int -} diff --git a/ds/elem.go b/ds/elem.go new file mode 100644 index 0000000..0589e81 --- /dev/null +++ b/ds/elem.go @@ -0,0 +1,10 @@ +package ds + +type Elem interface { + Equal(a Elem) bool + Lower(a Elem) bool + LowerEqual(a Elem) bool + Higher(a Elem) bool + HigherEqual(a Elem) bool + Int() int +} diff --git a/ds/integer.go b/ds/integer.go index 04fee3e..4abb349 100644 --- a/ds/integer.go +++ b/ds/integer.go @@ -6,7 +6,7 @@ import ( ) type Integer struct { - val int + Val int } func RandomIntegers(length, max int) ArrayList { @@ -36,29 +36,29 @@ func ReverseSortedIntegers(length int) ArrayList { } func (i Integer) String() string { - return fmt.Sprintf("%d", i.val) + return fmt.Sprintf("%d", i.Val) } func (i Integer) Int() int { - return i.val + return i.Val } -func (i Integer) Equal(j Comparer) bool { - return i.val == j.Int() +func (i Integer) Equal(j Elem) bool { + return i.Val == j.Int() } -func (i Integer) Lower(j Comparer) bool { - return i.val < j.Int() +func (i Integer) Lower(j Elem) bool { + return i.Val < j.Int() } -func (i Integer) LowerEqual(j Comparer) bool { - return i.val <= j.Int() +func (i Integer) LowerEqual(j Elem) bool { + return i.Val <= j.Int() } -func (i Integer) Higher(j Comparer) bool { - return i.val > j.Int() +func (i Integer) Higher(j Elem) bool { + return i.Val > j.Int() } -func (i Integer) HigherEqual(j Comparer) bool { - return i.val >= j.Int() +func (i Integer) HigherEqual(j Elem) bool { + return i.Val >= j.Int() } |
