Skip to content

Commit 3ac1e99

Browse files
phishman3579phishman3579
committed
Clean-up of a number of classes, no logic changes (I hope)
1 parent 81b8af7 commit 3ac1e99

File tree

9 files changed

+81
-63
lines changed

9 files changed

+81
-63
lines changed

‎src/com/jwetherell/algorithms/mathematics/Primes.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
public class Primes {
88

9-
public static final Map<Long, Long> getPrimeFactorization(long n) {
9+
public static final Map<Long, Long> getPrimeFactorization(long number) {
1010
Map<Long, Long> map = new HashMap<Long, Long>();
11+
long n = number;
1112
int c = 0;
1213
// for each potential factor i
1314
for (long i = 2; i * i <= n; i++) {
@@ -42,25 +43,25 @@ public static final Map<Long, Long> getPrimeFactorization(long n) {
4243
* number n is: if we cannot find a number f less than or equal n that
4344
* divides n then n is prime: the only primefactor of n is n itself
4445
*/
45-
public static final boolean isPrime(long value) {
46-
if (value == 1)
46+
public static final boolean isPrime(long number) {
47+
if (number == 1)
4748
return false;
48-
if (value < 4)
49+
if (number < 4)
4950
return true; // 2 and 3 are prime
50-
if (value % 2 == 0)
51+
if (number % 2 == 0)
5152
return false; // short circuit
52-
if (value < 9)
53+
if (number < 9)
5354
return true; // we have already excluded 4, 6 and 8.
5455
// (testing for 5 & 7)
55-
if (value % 3 == 0)
56+
if (number % 3 == 0)
5657
return false; // short circuit
57-
long r = (long) (Math.sqrt(value)); // n rounded to the greatest integer
58+
long r = (long) (Math.sqrt(number)); // n rounded to the greatest integer
5859
// r so that r*r<=n
5960
int f = 5;
6061
while (f <= r) {
61-
if (value % f == 0)
62+
if (number % f == 0)
6263
return false;
63-
if (value % (f + 2) == 0)
64+
if (number % (f + 2) == 0)
6465
return false;
6566
f += 6;
6667
}

‎src/com/jwetherell/algorithms/numbers/Integers.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ public class Integers {
99
private static final BigDecimal ZERO = new BigDecimal(0);
1010
private static final BigDecimal TWO = new BigDecimal(2);
1111

12-
public static final String toBinaryUsingDivideAndModulus(int integer) {
12+
public static final String toBinaryUsingDivideAndModulus(int numberToConvert) {
13+
int integer = numberToConvert;
1314
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
1415
StringBuilder builder = new StringBuilder();
1516
int temp = 0;
@@ -21,7 +22,8 @@ public static final String toBinaryUsingDivideAndModulus(int integer) {
2122
return builder.reverse().toString();
2223
}
2324

24-
public static final String toBinaryUsingShiftsAndModulus(int integer) {
25+
public static final String toBinaryUsingShiftsAndModulus(int numberToConvert) {
26+
int integer = numberToConvert;
2527
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
2628
StringBuilder builder = new StringBuilder();
2729
int temp = 0;
@@ -33,7 +35,8 @@ public static final String toBinaryUsingShiftsAndModulus(int integer) {
3335
return builder.reverse().toString();
3436
}
3537

36-
public static final String toBinaryUsingBigDecimal(int integer) {
38+
public static final String toBinaryUsingBigDecimal(int numberToConvert) {
39+
int integer = numberToConvert;
3740
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
3841
StringBuilder builder = new StringBuilder();
3942
BigDecimal number = new BigDecimal(integer);
@@ -46,7 +49,8 @@ public static final String toBinaryUsingBigDecimal(int integer) {
4649
return builder.reverse().toString();
4750
}
4851

49-
public static final String toBinaryUsingDivideAndDouble(int integer) {
52+
public static final String toBinaryUsingDivideAndDouble(int numberToConvert) {
53+
int integer = numberToConvert;
5054
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
5155
StringBuilder builder = new StringBuilder();
5256
double temp = 0d;
@@ -83,7 +87,8 @@ public static final int euclidsGreatestCommonDivsor(int x, int y) {
8387
return result;
8488
}
8589

86-
public static final boolean powerOfTwoUsingLoop(int number) {
90+
public static final boolean powerOfTwoUsingLoop(int numberToCheck) {
91+
int number = numberToCheck;
8792
if (number == 0)
8893
return false;
8994
while (number % 2 == 0) {
@@ -94,23 +99,26 @@ public static final boolean powerOfTwoUsingLoop(int number) {
9499
return true;
95100
}
96101

97-
public static final boolean powerOfTwoUsingRecursion(int number) {
102+
public static final boolean powerOfTwoUsingRecursion(int numberToCheck) {
103+
int number = numberToCheck;
98104
if (number == 1)
99105
return true;
100106
if (number == 0 || number % 2 != 0)
101107
return false;
102108
return powerOfTwoUsingRecursion(number / 2);
103109
}
104110

105-
public static final boolean powerOfTwoUsingLog(int number) {
111+
public static final boolean powerOfTwoUsingLog(int numberToCheck) {
112+
int number = numberToCheck;
106113
double doubleLog = Math.log10(number) / Math.log10(2);
107114
int intLog = (int) doubleLog;
108115
if (doubleLog == intLog)
109116
return true;
110117
return false;
111118
}
112119

113-
public static final boolean powerOfTwoUsingBits(int number) {
120+
public static final boolean powerOfTwoUsingBits(int numberToCheck) {
121+
int number = numberToCheck;
114122
if (number != 0 && ((number & (number - 1)) == 0))
115123
return true;
116124
return false;
@@ -160,8 +168,9 @@ public static final boolean powerOfTwoUsingBits(int number) {
160168
private static final int HUNDRED = 100;
161169
private static final int TEN = 10;
162170

163-
private static final String handleUnderOneThousand(int x) {
171+
private static final String handleUnderOneThousand(int number) {
164172
StringBuilder builder = new StringBuilder();
173+
int x = number;
165174
int m = x / HUNDRED;
166175
int r = x % HUNDRED;
167176
if (m > 0) {
@@ -187,9 +196,9 @@ private static final String handleUnderOneThousand(int x) {
187196
return builder.toString();
188197
}
189198

190-
public static final String toEnglish(int x) {
191-
if (x>Integer.MAX_VALUE || x<=Integer.MIN_VALUE)
192-
throw new IllegalArgumentException("Number has to be <= Integer.MAX_VALUE and > Integer.MIN_VALUE. number="+x);
199+
public static final String toEnglish(int number) {
200+
int x = number;
201+
if (x>Integer.MAX_VALUE || x<=Integer.MIN_VALUE) throw new IllegalArgumentException("Number has to be <= Integer.MAX_VALUE and > Integer.MIN_VALUE. number="+x);
193202
StringBuilder builder = new StringBuilder();
194203
if (x==0) {
195204
//Zero is a special case

‎src/com/jwetherell/algorithms/numbers/Longs.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
public class Longs {
66

7-
public static final String toBinaryUsingDivideAndModulus(long longNumber) {
7+
public static final String toBinaryUsingDivideAndModulus(long numberToConvert) {
8+
long longNumber = numberToConvert;
89
if (longNumber<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+longNumber);
910
StringBuilder builder = new StringBuilder();
1011
long temp = 0l;
@@ -16,7 +17,8 @@ public static final String toBinaryUsingDivideAndModulus(long longNumber) {
1617
return builder.reverse().toString();
1718
}
1819

19-
public static final String toBinaryUsingShiftsAndModulus(long longNumber) {
20+
public static final String toBinaryUsingShiftsAndModulus(long numberToConvert) {
21+
long longNumber = numberToConvert;
2022
if (longNumber<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+longNumber);
2123
StringBuilder builder = new StringBuilder();
2224
long temp = 0l;
@@ -28,7 +30,8 @@ public static final String toBinaryUsingShiftsAndModulus(long longNumber) {
2830
return builder.reverse().toString();
2931
}
3032

31-
public static final String toBinaryUsingBigDecimal(long longNumber) {
33+
public static final String toBinaryUsingBigDecimal(long numberToConvert) {
34+
long longNumber = numberToConvert;
3235
if (longNumber<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+longNumber);
3336
StringBuilder builder = new StringBuilder();
3437
BigDecimal zero = new BigDecimal(0);

‎src/com/jwetherell/algorithms/sequence/LongestCommonSubsequence.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,49 +88,49 @@ public static MatrixPair getLCS(char[] seq1, char[] seq2) {
8888

8989
public static class MatrixPair {
9090

91-
private int[][] lengthMatrix = null;
92-
private Set<String>[][] sequenceMatrix = null;
91+
private int[][] lenMatrix = null;
92+
private Set<String>[][] seqMatrix = null;
9393

9494
public MatrixPair(int[][] lengthMatrix, Set<String>[][] sequenceMatrix) {
95-
this.lengthMatrix = lengthMatrix;
96-
this.sequenceMatrix = sequenceMatrix;
95+
this.lenMatrix = lengthMatrix;
96+
this.seqMatrix = sequenceMatrix;
9797
}
9898

9999
public int getLongestSequenceLength() {
100-
if (lengthMatrix == null)
100+
if (lenMatrix == null)
101101
return 0;
102102

103-
int length1 = lengthMatrix.length;
104-
int length2 = lengthMatrix[length1 - 1].length;
105-
return lengthMatrix[length1 - 1][length2 - 1];
103+
int length1 = lenMatrix.length;
104+
int length2 = lenMatrix[length1 - 1].length;
105+
return lenMatrix[length1 - 1][length2 - 1];
106106
}
107107

108108
public Set<String> getLongestSequences() {
109-
if (sequenceMatrix == null)
109+
if (seqMatrix == null)
110110
return (new HashSet<String>());
111111

112-
int length1 = sequenceMatrix.length;
113-
int length2 = sequenceMatrix[length1 - 1].length;
114-
return sequenceMatrix[length1 - 1][length2 - 1];
112+
int length1 = seqMatrix.length;
113+
int length2 = seqMatrix[length1 - 1].length;
114+
return seqMatrix[length1 - 1][length2 - 1];
115115
}
116116

117117
public int[][] getLengthMatrix() {
118-
return lengthMatrix;
118+
return lenMatrix;
119119
}
120120

121121
public Set<String>[][] getSequenceMatrix() {
122-
return sequenceMatrix;
122+
return seqMatrix;
123123
}
124124

125125
public String getLengthMatrixString() {
126126
StringBuilder builder = new StringBuilder();
127-
if (lengthMatrix == null) {
127+
if (lenMatrix == null) {
128128
builder.append("Length matrix is NULL.\n");
129129
} else {
130-
for (int i = 0; i < lengthMatrix.length; i++) {
131-
int length = lengthMatrix[i].length;
130+
for (int i = 0; i < lenMatrix.length; i++) {
131+
int length = lenMatrix[i].length;
132132
for (int j = 0; j < length; j++) {
133-
int size = lengthMatrix[i][j];
133+
int size = lenMatrix[i][j];
134134
builder.append(size);
135135
if (j < length - 1)
136136
builder.append(",\t");
@@ -143,13 +143,13 @@ public String getLengthMatrixString() {
143143

144144
public String getSequenceMatrixString() {
145145
StringBuilder builder = new StringBuilder();
146-
if (sequenceMatrix == null) {
146+
if (seqMatrix == null) {
147147
builder.append("Sequence matrix is NULL.\n");
148148
} else {
149-
for (int i = 0; i < sequenceMatrix.length; i++) {
150-
int length = sequenceMatrix[i].length;
149+
for (int i = 0; i < seqMatrix.length; i++) {
150+
int length = seqMatrix[i].length;
151151
for (int j = 0; j < length; j++) {
152-
Set<String> set = sequenceMatrix[i][j];
152+
Set<String> set = seqMatrix[i][j];
153153
builder.append(set.toString());
154154
if (j < length - 1)
155155
builder.append(", ");

‎src/com/jwetherell/algorithms/sequence/TotalOfSequence.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
public class TotalOfSequence {
44

5-
public static final long sequenceTotalUsingLoop(int start, int length) {
5+
public static final long sequenceTotalUsingLoop(int number, int size) {
6+
int start = number;
7+
int length = size;
68
long result = 0L;
79
while (length > 0) {
810
result += start++;
@@ -11,11 +13,12 @@ public static final long sequenceTotalUsingLoop(int start, int length) {
1113
return result;
1214
}
1315

14-
public static final long sequenceTotalUsingTriangularNumbers(int start, int length) {
16+
public static final long sequenceTotalUsingTriangularNumbers(int number, int size) {
1517
// n*(n+1)/2
18+
int start = number;
19+
int length = size;
1620
long result = length * (length + 1) / 2;
1721
result += (start - 1) * length;
1822
return result;
1923
}
20-
2124
}

‎src/com/jwetherell/algorithms/sorts/HeapSort.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ private static <T extends Comparable<T>> void createHeap(T[] unsorted) {
7878
}
7979
}
8080

81-
private static <T extends Comparable<T>> int add(int length, T element, T[] unsorted) {
81+
private static <T extends Comparable<T>> int add(int size, T element, T[] unsorted) {
82+
int length = size;
8283
int i = length;
8384
unsorted[length++] = element;
8485
T e = unsorted[i];

‎src/com/jwetherell/algorithms/sorts/MergeSort.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private static <T extends Comparable<T>> void merge(int aStart, int aLength, int
6464
} else if (b != null && a == null) {
6565
output[count++] = b;
6666
j++;
67-
} else if (b.compareTo(a) <= 0) {
67+
} else if (b != null && b.compareTo(a) <= 0) {
6868
output[count++] = b;
6969
j++;
7070
} else {

‎src/com/jwetherell/algorithms/sorts/QuickSort.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@
1919
*/
2020
public class QuickSort<T extends Comparable<T>> {
2121

22-
private static final Random RANDOM = new Random();
22+
private static final Random RAND = new Random();
2323

2424
public static enum PIVOT_TYPE {
2525
FIRST, MIDDLE, RANDOM
26-
};
26+
}
2727

2828
public static PIVOT_TYPE type = PIVOT_TYPE.RANDOM;
2929

3030
private QuickSort() { }
3131

32-
public static <T extends Comparable<T>> T[] sort(PIVOT_TYPE type, T[] unsorted) {
32+
public static <T extends Comparable<T>> T[] sort(PIVOT_TYPE pivotType, T[] unsorted) {
3333
int pivot = 0;
34-
if (type == PIVOT_TYPE.MIDDLE) {
34+
if (pivotType == PIVOT_TYPE.MIDDLE) {
3535
pivot = unsorted.length/2;
36-
} else if (type == PIVOT_TYPE.RANDOM) {
36+
} else if (pivotType == PIVOT_TYPE.RANDOM) {
3737
pivot = getRandom(unsorted.length);
3838
}
3939
sort(pivot, 0, unsorted.length - 1, unsorted);
4040
return unsorted;
4141
}
4242

43-
private static <T extends Comparable<T>> void sort(int pivotIndex, int start, int finish, T[] unsorted) {
44-
pivotIndex = start + pivotIndex;
43+
private static <T extends Comparable<T>> void sort(int index, int start, int finish, T[] unsorted) {
44+
int pivotIndex = start + index;
4545
T pivot = unsorted[pivotIndex];
4646
int s = start;
4747
int f = finish;
@@ -68,7 +68,7 @@ private static <T extends Comparable<T>> void sort(int pivotIndex, int start, in
6868

6969
private static final int getRandom(int length) {
7070
if (type == PIVOT_TYPE.RANDOM && length > 0)
71-
return RANDOM.nextInt(length);
71+
return RAND.nextInt(length);
7272
if (type == PIVOT_TYPE.FIRST && length > 0)
7373
return 0;
7474
return length / 2;

‎src/com/jwetherell/algorithms/sorts/RadixSort.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@ private static int getDigit(int integer, int divisor) {
7272
private static int[] add(int integer, int[] bucket) {
7373
int size = bucket[0]; // size is stored in first element
7474
int length = bucket.length;
75+
int[] result = bucket;
7576
if (size >= length) {
76-
bucket = Arrays.copyOf(bucket, ((length * 3) / 2) + 1);
77+
result = Arrays.copyOf(result, ((length * 3) / 2) + 1);
7778
}
78-
bucket[size] = integer;
79-
bucket[0] = ++size;
79+
result[size] = integer;
80+
result[0] = ++size;
8081
return bucket;
8182
}
8283
}

0 commit comments

Comments
 (0)