Skip to content

Commit 0d8e015

Browse files
committed
cpplint and msvc fixes for - sorting
1 parent 76a5f57 commit 0d8e015

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

sorting/bead_sort.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ void beadSort(int *a, int len) {
3434
// Put sorted values in array using beads
3535
for (int i = 0; i < len; i++) {
3636
int j;
37-
for (j = 0; j < max && BEAD(i, j); j++)
38-
;
37+
for (j = 0; j < max && BEAD(i, j); j++) {
38+
}
3939

4040
a[i] = j;
4141
}

sorting/bubble_sort.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ optimized bubble sort algorithm. It's right down there.
4242

4343
int main() {
4444
int n;
45-
short swap_check = 1;
45+
bool swap_check = true;
4646
std::cout << "Enter the amount of numbers to sort: ";
4747
std::cin >> n;
4848
std::vector<int> numbers;
@@ -56,11 +56,11 @@ int main() {
5656
}
5757

5858
// Bubble Sorting
59-
for (int i = 0; (i < n) && (swap_check == 1); i++) {
60-
swap_check = 0;
59+
for (int i = 0; (i < n) && (swap_check); i++) {
60+
swap_check = false;
6161
for (int j = 0; j < n - 1 - i; j++) {
6262
if (numbers[j] > numbers[j + 1]) {
63-
swap_check = 1;
63+
swap_check = true;
6464
std::swap(numbers[j],
6565
numbers[j + 1]); // by changing swap location.
6666
// I mean, j. If the number is

sorting/cocktail_selection_sort.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99

1010
// Iterative Version
1111

12-
void CocktailSelectionSort(std::vector<int> &vec, int low, int high) {
12+
void CocktailSelectionSort(std::vector<int> *vec, int low, int high) {
1313
while (low <= high) {
14-
int minimum = vec[low];
14+
int minimum = (*vec)[low];
1515
int minimumindex = low;
16-
int maximum = vec[high];
16+
int maximum = (*vec)[high];
1717
int maximumindex = high;
1818

1919
for (int i = low; i <= high; i++) {
20-
if (vec[i] >= maximum) {
21-
maximum = vec[i];
20+
if ((*vec)[i] >= maximum) {
21+
maximum = (*vec)[i];
2222
maximumindex = i;
2323
}
24-
if (vec[i] <= minimum) {
25-
minimum = vec[i];
24+
if ((*vec)[i] <= minimum) {
25+
minimum = (*vec)[i];
2626
minimumindex = i;
2727
}
2828
}
2929
if (low != maximumindex || high != minimumindex) {
30-
std::swap(vec[low], vec[minimumindex]);
31-
std::swap(vec[high], vec[maximumindex]);
30+
std::swap((*vec)[low], (*vec)[minimumindex]);
31+
std::swap((*vec)[high], (*vec)[maximumindex]);
3232
} else {
33-
std::swap(vec[low], vec[high]);
33+
std::swap((*vec)[low], (*vec)[high]);
3434
}
3535

3636
low++;
@@ -40,29 +40,29 @@ void CocktailSelectionSort(std::vector<int> &vec, int low, int high) {
4040

4141
// Recursive Version
4242

43-
void CocktailSelectionSort_v2(std::vector<int> &vec, int low, int high) {
43+
void CocktailSelectionSort_v2(std::vector<int> *vec, int low, int high) {
4444
if (low >= high) return;
4545

46-
int minimum = vec[low];
46+
int minimum = (*vec)[low];
4747
int minimumindex = low;
48-
int maximum = vec[high];
48+
int maximum = (*vec)[high];
4949
int maximumindex = high;
5050

5151
for (int i = low; i <= high; i++) {
52-
if (vec[i] >= maximum) {
53-
maximum = vec[i];
52+
if ((*vec)[i] >= maximum) {
53+
maximum = (*vec)[i];
5454
maximumindex = i;
5555
}
56-
if (vec[i] <= minimum) {
57-
minimum = vec[i];
56+
if ((*vec)[i] <= minimum) {
57+
minimum = (*vec)[i];
5858
minimumindex = i;
5959
}
6060
}
6161
if (low != maximumindex || high != minimumindex) {
62-
std::swap(vec[low], vec[minimumindex]);
63-
std::swap(vec[high], vec[maximumindex]);
62+
std::swap((*vec)[low], (*vec)[minimumindex]);
63+
std::swap((*vec)[high], (*vec)[maximumindex]);
6464
} else {
65-
std::swap(vec[low], vec[high]);
65+
std::swap((*vec)[low], (*vec)[high]);
6666
}
6767

6868
CocktailSelectionSort(vec, low + 1, high - 1);
@@ -85,9 +85,9 @@ int main() {
8585
std::cin >> method;
8686

8787
if (method == 0) {
88-
CocktailSelectionSort(v, 0, n - 1);
88+
CocktailSelectionSort(&v, 0, n - 1);
8989
} else if (method == 1) {
90-
CocktailSelectionSort_v2(v, 0, n - 1);
90+
CocktailSelectionSort_v2(&v, 0, n - 1);
9191
} else {
9292
std::cerr << "Unknown method" << std::endl;
9393
return -1;

0 commit comments

Comments
 (0)