Skip to content

Commit b1a2583

Browse files
author
Justin Wetherell
committed
Changed the Numbers tests to use JUnit
1 parent 0e64808 commit b1a2583

File tree

4 files changed

+169
-33
lines changed

4 files changed

+169
-33
lines changed

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

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

1212
public static final String toBinaryUsingDivideAndModulus(int integer) {
13+
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
1314
StringBuilder builder = new StringBuilder();
1415
int temp = 0;
1516
while (integer > 0) {
@@ -21,6 +22,7 @@ public static final String toBinaryUsingDivideAndModulus(int integer) {
2122
}
2223

2324
public static final String toBinaryUsingShiftsAndModulus(int integer) {
25+
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
2426
StringBuilder builder = new StringBuilder();
2527
int temp = 0;
2628
while (integer > 0) {
@@ -32,6 +34,7 @@ public static final String toBinaryUsingShiftsAndModulus(int integer) {
3234
}
3335

3436
public static final String toBinaryUsingBigDecimal(int integer) {
37+
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
3538
StringBuilder builder = new StringBuilder();
3639
BigDecimal number = new BigDecimal(integer);
3740
BigDecimal[] decimals = null;
@@ -44,6 +47,7 @@ public static final String toBinaryUsingBigDecimal(int integer) {
4447
}
4548

4649
public static final String toBinaryUsingDivideAndDouble(int integer) {
50+
if (integer<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+integer);
4751
StringBuilder builder = new StringBuilder();
4852
double temp = 0d;
4953
while (integer > 0) {
@@ -184,6 +188,8 @@ private static final String handleUnderOneThousand(int x) {
184188
}
185189

186190
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);
187193
StringBuilder builder = new StringBuilder();
188194
if (x==0) {
189195
//Zero is a special case
@@ -195,6 +201,7 @@ public static final String toEnglish(int x) {
195201
boolean thousand = false;
196202
if (x<0) {
197203
builder.append("negative ");
204+
// Make the number positive
198205
x = x * -1;
199206
}
200207
int m = x / BILLION;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
public class Longs {
66

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

1819
public static final String toBinaryUsingShiftsAndModulus(long longNumber) {
20+
if (longNumber<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+longNumber);
1921
StringBuilder builder = new StringBuilder();
2022
long temp = 0l;
2123
while (longNumber > 0) {
@@ -27,6 +29,7 @@ public static final String toBinaryUsingShiftsAndModulus(long longNumber) {
2729
}
2830

2931
public static final String toBinaryUsingBigDecimal(long longNumber) {
32+
if (longNumber<0) throw new IllegalArgumentException("Method argument cannot be negative. number="+longNumber);
3033
StringBuilder builder = new StringBuilder();
3134
BigDecimal zero = new BigDecimal(0);
3235
BigDecimal two = new BigDecimal(2);

‎src/com/jwetherell/algorithms/numbers/test/Numbers.java‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
package com.jwetherell.algorithms.numbers.test;
2+
3+
import static org.junit.Assert.assertFalse;
4+
import static org.junit.Assert.assertTrue;
5+
6+
import java.util.Random;
7+
8+
import org.junit.Test;
9+
10+
import com.jwetherell.algorithms.numbers.Integers;
11+
import com.jwetherell.algorithms.numbers.Longs;
12+
13+
public class Numbers {
14+
15+
private static final Random RANDOM = new Random();
16+
17+
@Test
18+
public void testGCD() {
19+
int x = 1989;
20+
int y = 867;
21+
int gcd = Integers.euclidsGreatestCommonDivsor(x, y);
22+
int check = 51;
23+
assertTrue("Euclids GCD error. expected="+check+" got="+gcd, (gcd==check));
24+
25+
x = 567;
26+
y = 56;
27+
gcd = Integers.euclidsGreatestCommonDivsor(x, y);
28+
check = 7;
29+
assertTrue("Euclids GCD error. expected="+check+" got="+gcd, (gcd==check));
30+
31+
x = 10002345;
32+
y = 67885;
33+
gcd = Integers.euclidsGreatestCommonDivsor(x, y);
34+
check = 5;
35+
assertTrue("Euclids GCD error. expected="+check+" got="+gcd, (gcd==check));
36+
}
37+
38+
@Test
39+
public void testPowerOf2() {
40+
int is = 256;
41+
int isNot = 1673;
42+
43+
boolean isPowOf2is = Integers.powerOfTwoUsingBits(is);
44+
boolean isPowOf2isNot = Integers.powerOfTwoUsingBits(isNot);
45+
assertTrue("Is power of 2 using bits error", isPowOf2is);
46+
assertFalse("Is power of 2 using bits error", isPowOf2isNot);
47+
48+
isPowOf2is = Integers.powerOfTwoUsingLog(is);
49+
isPowOf2isNot = Integers.powerOfTwoUsingLog(isNot);
50+
assertTrue("Is power of 2 using logarithm error", isPowOf2is);
51+
assertFalse("Is power of 2 using logarithm error", isPowOf2isNot);
52+
53+
isPowOf2is = Integers.powerOfTwoUsingLoop(is);
54+
isPowOf2isNot = Integers.powerOfTwoUsingLoop(isNot);
55+
assertTrue("Is power of 2 using loops error", isPowOf2is);
56+
assertFalse("Is power of 2 using loops error", isPowOf2isNot);
57+
58+
isPowOf2is = Integers.powerOfTwoUsingRecursion(is);
59+
isPowOf2isNot = Integers.powerOfTwoUsingRecursion(isNot);
60+
assertTrue("Is power of 2 using recursion error", isPowOf2is);
61+
assertFalse("Is power of 2 using recursion error", isPowOf2isNot);
62+
}
63+
64+
@Test
65+
public void testIntegerToBinaryString() {
66+
int a = Math.abs(RANDOM.nextInt());
67+
String check = Integer.toBinaryString(a);
68+
69+
String result1 = Integers.toBinaryUsingBigDecimal(a);
70+
assertTrue("toBinary using BigDecimal error. random="+a+" expected=\n"+check+"\ngot=\n"+result1+"\n", (check.equals(result1)));
71+
72+
String result2 = Integers.toBinaryUsingDivideAndDouble(a);
73+
assertTrue("toBinary using BigDecimal error. random="+a+" expected=\n"+check+"\ngot="+result2+"\n", (check.equals(result2)));
74+
75+
String result3 = Integers.toBinaryUsingDivideAndModulus(a);
76+
assertTrue("toBinary using BigDecimal error. random="+a+" expected=\n"+check+"\ngot="+result3+"\n", (check.equals(result3)));
77+
78+
String result4 = Integers.toBinaryUsingShiftsAndModulus(a);
79+
assertTrue("toBinary using BigDecimal error. random="+a+" expected=\n"+check+"\ngot="+result4+"\n", (check.equals(result4)));
80+
}
81+
82+
@Test
83+
public void testLongToBinaryString() {
84+
long a = Math.abs(RANDOM.nextLong());
85+
String check = Long.toBinaryString(a);
86+
87+
String result1 = Longs.toBinaryUsingBigDecimal(a);
88+
assertTrue("toBinary using BigDecimal error. random="+a+" expected=\n"+check+"\ngot=\n"+result1+"\n", (check.equals(result1)));
89+
90+
String result2 = Longs.toBinaryUsingDivideAndModulus(a);
91+
assertTrue("toBinary using BigDecimal error. random="+a+" expected=\n"+check+"\ngot=\n"+result2+"\n", (check.equals(result2)));
92+
93+
String result3 = Longs.toBinaryUsingShiftsAndModulus(a);
94+
assertTrue("toBinary using BigDecimal error. random="+a+" expected=\n"+check+"\ngot=\n"+result3+"\n", (check.equals(result3)));
95+
}
96+
97+
@Test
98+
public void testToEnglish() {
99+
int a = -1001;
100+
String check = "negative one-thousand one";
101+
String english = Integers.toEnglish(a);
102+
assertTrue("toEnglish error. a="+a+" expected="+check+" got="+english, (check.equals(english)));
103+
104+
a = -1;
105+
check = "negative one";
106+
english = Integers.toEnglish(a);
107+
assertTrue("toEnglish error. a="+a+" expected="+check+" got="+english, (check.equals(english)));
108+
109+
a = 0;
110+
check = "zero";
111+
english = Integers.toEnglish(a);
112+
assertTrue("toEnglish error. a="+a+" expected="+check+" got="+english, (check.equals(english)));
113+
114+
a = 199;
115+
check = "one-hundred ninty-nine";
116+
english = Integers.toEnglish(a);
117+
assertTrue("toEnglish error. a="+a+" expected="+check+" got="+english, (check.equals(english)));
118+
119+
a = Integer.MAX_VALUE; // 2,147,483,647
120+
check = "two-billion one-hundred fourty-seven-million four-hundred eighty-three-thousand six-hundred fourty-seven";
121+
english = Integers.toEnglish(a);
122+
assertTrue("toEnglish error. a="+a+" expected="+check+" got="+english, (check.equals(english)));
123+
124+
a = Integer.MIN_VALUE+1; // -2,147,483,647
125+
check = "negative two-billion one-hundred fourty-seven-million four-hundred eighty-three-thousand six-hundred fourty-seven";
126+
english = Integers.toEnglish(a);
127+
assertTrue("toEnglish error. a="+a+" expected="+check+" got="+english, (check.equals(english)));
128+
}
129+
}

src/com/jwetherell/algorithms/Numbers.java renamed to src/com/jwetherell/algorithms/numbers/timing/NumbersTiming.java

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,122 @@
1-
package com.jwetherell.algorithms;
1+
package com.jwetherell.algorithms.numbers.timing;
22

33
import java.text.DecimalFormat;
44

5+
import org.junit.Test;
6+
57
import com.jwetherell.algorithms.numbers.Integers;
68
import com.jwetherell.algorithms.numbers.Longs;
79

8-
public class Numbers {
10+
public class NumbersTiming {
911

1012
private static final DecimalFormat FORMAT = new DecimalFormat("#.######");
1113

12-
public static void main(String[] args) {
14+
@Test
15+
public void numbersTiming() {
1316
// Integers
1417
{
1518
int a = Integer.MAX_VALUE;
1619
System.out.println("Integer to binary string using division and modulus.");
1720
long before = System.nanoTime();
18-
String result = Integers.toBinaryUsingDivideAndModulus(a);
21+
Integers.toBinaryUsingDivideAndModulus(a);
1922
long after = System.nanoTime();
20-
System.out.println("a=" + a + " " + result);
2123
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
24+
System.out.println();
2225
System.gc();
2326

2427
System.out.println("Integer to binary string using shifts and modulus.");
2528
before = System.nanoTime();
26-
result = Integers.toBinaryUsingShiftsAndModulus(a);
29+
Integers.toBinaryUsingShiftsAndModulus(a);
2730
after = System.nanoTime();
28-
System.out.println("a=" + a + " " + result);
2931
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
32+
System.out.println();
3033
System.gc();
3134

3235
System.out.println("Integer to binary string using BigDecimal.");
3336
before = System.nanoTime();
34-
result = Integers.toBinaryUsingBigDecimal(a);
37+
Integers.toBinaryUsingBigDecimal(a);
3538
after = System.nanoTime();
36-
System.out.println("a=" + a + " " + result);
3739
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
40+
System.out.println();
3841
System.gc();
3942

4043
System.out.println("Integer to binary string using divide and double.");
4144
before = System.nanoTime();
42-
result = Integers.toBinaryUsingDivideAndDouble(a);
45+
Integers.toBinaryUsingDivideAndDouble(a);
4346
after = System.nanoTime();
44-
System.out.println("a=" + a + " " + result);
4547
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
48+
System.out.println();
4649
System.gc();
4750

4851
System.out.println("Euclid's Greatest Common Divisor.");
4952
int x = 1989;
5053
int y = 867;
5154
before = System.nanoTime();
52-
int gcd = Integers.euclidsGreatestCommonDivsor(x, y);
55+
Integers.euclidsGreatestCommonDivsor(x, y);
5356
after = System.nanoTime();
54-
System.out.println("x=" + x + " " + "y=" + y + " " + gcd);
5557
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
58+
System.out.println();
5659
System.gc();
5760

5861
a = (int) Math.pow(2, 30);
5962
System.out.println("Power of 2 using loop.");
6063
before = System.nanoTime();
61-
boolean isPowOf2 = Integers.powerOfTwoUsingLoop(a);
64+
Integers.powerOfTwoUsingLoop(a);
6265
after = System.nanoTime();
63-
System.out.println("a=" + a + " is a power of 2? " + isPowOf2);
6466
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
67+
System.out.println();
6568
System.gc();
6669

6770
System.out.println("Power of 2 using recursion.");
6871
before = System.nanoTime();
69-
isPowOf2 = Integers.powerOfTwoUsingRecursion(a);
72+
Integers.powerOfTwoUsingRecursion(a);
7073
after = System.nanoTime();
71-
System.out.println("a=" + a + " is a power of 2? " + isPowOf2);
7274
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
75+
System.out.println();
7376
System.gc();
7477

7578
System.out.println("Power of 2 using logarithm.");
7679
before = System.nanoTime();
77-
isPowOf2 = Integers.powerOfTwoUsingLog(a);
80+
Integers.powerOfTwoUsingLog(a);
7881
after = System.nanoTime();
79-
System.out.println("a=" + a + " is a power of 2? " + isPowOf2);
8082
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
83+
System.out.println();
8184
System.gc();
8285

8386
System.out.println("Power of 2 using bits.");
8487
before = System.nanoTime();
85-
isPowOf2 = Integers.powerOfTwoUsingBits(a);
88+
Integers.powerOfTwoUsingBits(a);
8689
after = System.nanoTime();
87-
System.out.println("a=" + a + " is a power of 2? " + isPowOf2);
8890
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
89-
System.gc();
90-
91-
System.out.println("Integer to English");
92-
for (int i=-1001; i<=1001; i++) {
93-
System.out.println(Integers.toEnglish(i));
94-
}
9591
System.out.println();
92+
System.gc();
9693
}
9794

9895
// Longs
9996
{
10097
long a = Long.MAX_VALUE;
10198
System.out.println("Long to binary string using division and modulus.");
10299
long before = System.nanoTime();
103-
String result = Longs.toBinaryUsingDivideAndModulus(a);
100+
Longs.toBinaryUsingDivideAndModulus(a);
104101
long after = System.nanoTime();
105-
System.out.println("a=" + a + " " + result);
106102
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
103+
System.out.println();
107104
System.gc();
108105

109106
System.out.println("Long to binary string using shifts and modulus.");
110107
before = System.nanoTime();
111-
result = Longs.toBinaryUsingShiftsAndModulus(a);
108+
Longs.toBinaryUsingShiftsAndModulus(a);
112109
after = System.nanoTime();
113-
System.out.println("a=" + a + " " + result);
114110
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
111+
System.out.println();
115112
System.gc();
116113

117114
System.out.println("Long to binary string using BigDecimal.");
118115
before = System.nanoTime();
119-
result = Longs.toBinaryUsingBigDecimal(a);
116+
Longs.toBinaryUsingBigDecimal(a);
120117
after = System.nanoTime();
121-
System.out.println("a=" + a + " " + result);
122118
System.out.println("Computed in " + FORMAT.format(after - before) + " ns");
119+
System.out.println();
123120
System.gc();
124121
}
125122
}

0 commit comments

Comments
 (0)