complete section 9

2 files changed, 29 insertions, 0 deletions

diff --git a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/Number.java b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/Number.java
index 643fb79..d96274f 100644
--- a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/Number.java
+++ b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/Number.java
@@ -1,5 +1,7 @@
 package ca.mokhan.assignment1;
 
+import java.util.ArrayList;
+
 public class Number {
   public static boolean isDivisibleBy5(int n) {
     return isDivisibleBy(n, 5);
@@ -24,4 +26,21 @@ public class Number {
   public static boolean isDivisibleBy(int n, int denominator) {
     return n % denominator == 0;
   }
+
+  public static ArrayList<String> iterate() {
+    ArrayList<String> items = new ArrayList<String>();
+    ArrayList<String> row = new ArrayList<String>();
+    for (Integer i = 0; i < 113; i++) {
+      row.clear();
+      row.add(String.format("%d", i));
+
+      if (isOdd(i)) row.add(String.format("%d is odd", i));
+      if (isDivisibleBy5(i)) row.add("hi five");
+      if (isDivisibleBy7(i + (i + 1))) row.add("wow");
+      if (isPrime(i)) row.add("prime");
+
+      items.add(String.join(",", row));
+    }
+    return items;
+  }
 }
diff --git a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/NumberTest.java b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/NumberTest.java
index d75a26b..1ef9d96 100644
--- a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/NumberTest.java
+++ b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/NumberTest.java
@@ -1,5 +1,6 @@
 package ca.mokhan.assignment1;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import junit.framework.Test;
@@ -45,4 +46,13 @@ public class NumberTest extends TestCase {
       if (primes.contains(i)) assertTrue(Number.isPrime(i));
       else assertFalse(Number.isPrime(i));
   }
+
+  public void testIterate() {
+    ArrayList<String> results = Number.iterate();
+    assertTrue(results.contains("0,hi five"));
+    assertTrue(results.contains("1,1 is odd"));
+    assertTrue(results.contains("2,prime"));
+    assertTrue(results.contains("3,3 is odd,wow,prime"));
+    assertTrue(results.contains("4"));
+  }
 }