瀏覽代碼

ayyyy im out here

Kthomas 6 年之前
父節點
當前提交
1c66ec4d12

+ 4
- 1
src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java 查看文件

@@ -5,7 +5,10 @@ import java.util.Scanner;
5 5
 /**
6 6
  * Created by leon on 1/31/18.
7 7
  */
8
-public class MainApp {
8
+public class MainApp extends TableUtilities{
9 9
     public static void main(String[] args) {
10
+        TableUtilities result = new TableUtilities();
11
+        System.out.print(result.getMultiplicationTable(20));
12
+
10 13
     }
11 14
 }

+ 27
- 6
src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java 查看文件

@@ -2,7 +2,7 @@ package io.zipcoder.microlabs.mastering_loops;
2 2
 
3 3
 public class TableUtilities {
4 4
 
5
-    public static String getSmallMultiplicationTable() {
5
+    public String getSmallMultiplicationTable() {
6 6
 
7 7
         String lilguy = "";
8 8
             for(int i = 1; i < 6; i++) {
@@ -16,11 +16,32 @@ public class TableUtilities {
16 16
         return lilguy;
17 17
     }
18 18
 
19
-    public static String getLargeMultiplicationTable() {
20
-        return null;
19
+    public String getLargeMultiplicationTable() {
20
+
21
+        String bigguy = "";
22
+        for(int i = 1; i < 11; i++) {
23
+            String grow = "";
24
+            for (int a = 1; a < 11; a++) {
25
+                int b = a * i;
26
+                grow += String.format("%3d", b) + " |";
27
+            }
28
+            bigguy += grow + "\n";
29
+        }
30
+        return bigguy;
21 31
     }
22 32
 
23
-    public static String getMultiplicationTable(int tableSize) {
24
-        return null;
33
+    public String getMultiplicationTable(int tableSize) {
34
+
35
+        String ultraguy = "";
36
+        for (int i = 1; i < 21; i++) {
37
+            String grow = "";
38
+            for (int a = 1; a < 21; a++) {
39
+                int b = a * i;
40
+                grow += String.format("%3d", b) + " |";
41
+            }
42
+            ultraguy += grow + "\n";
43
+        }
44
+
45
+            return ultraguy;
46
+        }
25 47
     }
26
-}

+ 5
- 3
src/test/java/io/zipcoder/microlabs/mastering_loops/TableUtilitiesTest.java 查看文件

@@ -7,6 +7,8 @@ import org.junit.Test;
7 7
  * Created by leon on 1/31/18.
8 8
  */
9 9
 public class TableUtilitiesTest {
10
+
11
+    TableUtilities table = new TableUtilities();
10 12
     @Test
11 13
     public void testGetLargeMultiplicationTable() {
12 14
         String expected =
@@ -21,7 +23,7 @@ public class TableUtilitiesTest {
21 23
                 "  9 | 18 | 27 | 36 | 45 | 54 | 63 | 72 | 81 | 90 |\n" +
22 24
                 " 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 |100 |\n";
23 25
 
24
-        String actual = TableUtilities.getLargeMultiplicationTable();
26
+        String actual = table.getLargeMultiplicationTable();
25 27
         Assert.assertEquals(expected, actual);
26 28
     }
27 29
 
@@ -35,7 +37,7 @@ public class TableUtilitiesTest {
35 37
                         "  4 |  8 | 12 | 16 | 20 |\n" +
36 38
                         "  5 | 10 | 15 | 20 | 25 |\n";
37 39
 
38
-        String actual = TableUtilities.getSmallMultiplicationTable();
40
+        String actual = table.getSmallMultiplicationTable();
39 41
         Assert.assertEquals(expected, actual);
40 42
     }
41 43
 
@@ -62,7 +64,7 @@ public class TableUtilitiesTest {
62 64
                 " 18 | 36 | 54 | 72 | 90 |108 |126 |144 |162 |180 |198 |216 |234 |252 |270 |288 |306 |324 |342 |360 |\n" +
63 65
                 " 19 | 38 | 57 | 76 | 95 |114 |133 |152 |171 |190 |209 |228 |247 |266 |285 |304 |323 |342 |361 |380 |\n" +
64 66
                 " 20 | 40 | 60 | 80 |100 |120 |140 |160 |180 |200 |220 |240 |260 |280 |300 |320 |340 |360 |380 |400 |\n";
65
-        String actual = TableUtilities.getMultiplicationTable(20);
67
+        String actual = table.getMultiplicationTable(20);
66 68
         Assert.assertEquals(expected, actual);
67 69
     }
68 70