Skip to content

Commit c63a329

Browse files
committed
Removing color from utils and sorting algorithms
1 parent 9f226f8 commit c63a329

8 files changed

+31
-37
lines changed

bubble_sort.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ func bubbleSortVisualizer(arr []int, delay time.Duration) {
66
n := len(arr)
77
for i := 0; i < n-1; i++ {
88
for j := 0; j < n-i-1; j++ {
9-
visualizeIteration(White, arr, j, j+1, delay)
9+
visualizeIteration(arr, j, j+1, delay)
1010
if arr[j] > arr[j+1] {
11-
visualizeIteration(LightYellow, arr, j, j+1, delay)
11+
visualizeIteration(arr, j, j+1, delay)
1212
arr[j], arr[j+1] = arr[j+1], arr[j]
13-
visualizeIteration(LightBlue, arr, j, j+1, delay)
13+
visualizeIteration(arr, j, j+1, delay)
1414
}
1515
}
1616
}

cocktail_shaker_sort.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ func cocktailShakerSortVisualizer(arr []int, delay time.Duration) {
88

99
for left <= right {
1010
for i := left; i < right; i++ {
11-
visualizeIteration(White, arr, i, i+1, delay)
11+
visualizeIteration(arr, i, i+1, delay)
1212
if arr[i] > arr[i+1] {
13-
visualizeIteration(LightYellow, arr, i, i+1, delay)
13+
visualizeIteration(arr, i, i+1, delay)
1414
arr[i], arr[i+1] = arr[i+1], arr[i]
15-
visualizeIteration(LightBlue, arr, i, i+1, delay)
15+
visualizeIteration(arr, i, i+1, delay)
1616
}
1717
}
1818
right--
1919

2020
for i := right; i > left; i-- {
21-
visualizeIteration(White, arr, i-1, i, delay)
21+
visualizeIteration(arr, i-1, i, delay)
2222
if arr[i-1] > arr[i] {
23-
visualizeIteration(LightYellow, arr, i-1, i, delay)
23+
visualizeIteration(arr, i-1, i, delay)
2424
arr[i], arr[i-1] = arr[i-1], arr[i]
25-
visualizeIteration(LightBlue, arr, i-1, i, delay)
25+
visualizeIteration(arr, i-1, i, delay)
2626
}
2727
}
2828
left++

comb_sort.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ func combSortVisualizer(arr []int, delay time.Duration) {
1212
swapped = false
1313

1414
for i := 0; i < n-gap; i++ {
15-
visualizeIteration(White, arr, i, i+gap, delay)
15+
visualizeIteration(arr, i, i+gap, delay)
1616
if arr[i] > arr[i+gap] {
17-
visualizeIteration(LightYellow, arr, i, i+gap, delay)
17+
visualizeIteration(arr, i, i+gap, delay)
1818
arr[i], arr[i+gap] = arr[i+gap], arr[i]
19-
visualizeIteration(LightBlue, arr, i, i+gap, delay)
19+
visualizeIteration(arr, i, i+gap, delay)
2020
swapped = true
2121
}
2222
}

gnome_sort.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ func gnomeSortVisualizer(arr []int, delay time.Duration) {
77

88
for i < len(arr) {
99
if i == 0 || arr[i] >= arr[i-1] {
10-
visualizeIteration(White, arr, i-1, i, delay)
10+
visualizeIteration(arr, i-1, i, delay)
1111
i++
1212
} else {
13-
visualizeIteration(LightYellow, arr, i-1, i, delay)
13+
visualizeIteration(arr, i-1, i, delay)
1414
arr[i], arr[i-1] = arr[i-1], arr[i]
15-
visualizeIteration(LightBlue, arr, i-1, i, delay)
15+
visualizeIteration(arr, i-1, i, delay)
1616
i--
1717
if i == 0 {
1818
i = 1

insertion_sort.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
func insertionSortVisualizer(arr []int, delay time.Duration) {
88
for i := 1; i < len(arr); i++ {
99
j := i
10-
visualizeIteration(White, arr, j-1, j, delay)
10+
visualizeIteration(arr, j-1, j, delay)
1111
for j > 0 && arr[j] < arr[j-1] {
12-
visualizeIteration(LightYellow, arr, j-1, j, delay)
12+
visualizeIteration(arr, j-1, j, delay)
1313
arr[j], arr[j-1] = arr[j-1], arr[j]
14-
visualizeIteration(LightBlue, arr, j-1, j, delay)
14+
visualizeIteration(arr, j-1, j, delay)
1515
j--
1616
}
1717
}

odd_even_sort.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ func oddEvenSortVisualizer(arr []int, delay time.Duration) {
99
for !sorted {
1010
sorted = true
1111
for i := 1; i <= n-2; i += 2 {
12-
visualizeIteration(White, arr, i, i+1, delay)
12+
visualizeIteration(arr, i, i+1, delay)
1313
if arr[i] > arr[i+1] {
14-
visualizeIteration(LightYellow, arr, i, i+1, delay)
14+
visualizeIteration(arr, i, i+1, delay)
1515
arr[i], arr[i+1] = arr[i+1], arr[i]
16-
visualizeIteration(LightBlue, arr, i, i+1, delay)
16+
visualizeIteration(arr, i, i+1, delay)
1717
sorted = false
1818
}
1919
}
2020

2121
for i := 0; i <= n-2; i += 2 {
22-
visualizeIteration(White, arr, i, i+1, delay)
22+
visualizeIteration(arr, i, i+1, delay)
2323
if arr[i] > arr[i+1] {
24-
visualizeIteration(LightYellow, arr, i, i+1, delay)
24+
visualizeIteration(arr, i, i+1, delay)
2525
arr[i], arr[i+1] = arr[i+1], arr[i]
26-
visualizeIteration(LightBlue, arr, i, i+1, delay)
26+
visualizeIteration(arr, i, i+1, delay)
2727
sorted = false
2828
}
2929
}

selection_sort.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ func selectionSortVisualizer(arr []int, delay time.Duration) {
88
for i := 0; i < len(arr); i++ {
99
min := i
1010
for j := i + 1; j < len(arr); j++ {
11-
visualizeIteration(White, arr, i, j, delay)
11+
visualizeIteration(arr, i, j, delay)
1212
if arr[j] < arr[min] {
13-
visualizeIteration(LightYellow, arr, i, j, delay)
13+
visualizeIteration(arr, i, j, delay)
1414
min = j
1515
}
1616
}
1717
arr[i], arr[min] = arr[min], arr[i]
18-
visualizeIteration(LightBlue, arr, i, min, delay)
18+
visualizeIteration(arr, i, min, delay)
1919
}
2020
}

utils.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ import (
1313

1414
type Color int
1515

16-
const (
17-
White Color = iota
18-
LightYellow
19-
LightBlue
20-
)
21-
2216
func generateRandomArray(size int) []int {
2317
arr := make([]int, size)
2418
for i := 0; i < len(arr); i++ {
@@ -42,22 +36,22 @@ func clearConsole() {
4236
}
4337
}
4438

45-
func printColoredArray(c Color, array []int, idx1, idx2 int) {
39+
func printColoredArray(array []int, idx1, idx2 int) {
4640
fmt.Print("[")
4741
for i, _ := range array {
4842
if idx1 == i {
4943
fmt.Print(color.OpUnderscore.Sprint(color.LightYellow.Sprint(array[idx1]), " "))
5044
} else if idx2 == i {
5145
fmt.Print(color.OpUnderscore.Sprint(color.LightYellow.Sprint(array[idx2]), " "))
5246
} else {
53-
fmt.Print(color.OpUnderscore.Sprint(array[i], " "))
47+
fmt.Print(color.Sprint(array[i], " "))
5448
}
5549
}
5650
fmt.Println("]")
5751
}
5852

59-
func visualizeIteration(c Color, array []int, idx1, idx2 int, delay time.Duration) {
60-
printColoredArray(c, array, idx1, idx2)
53+
func visualizeIteration(array []int, idx1, idx2 int, delay time.Duration) {
54+
printColoredArray(array, idx1, idx2)
6155
time.Sleep(delay)
6256
clearConsole()
6357
}

0 commit comments

Comments
 (0)