Joshua Chung před 6 roky
rodič
revize
b13615024f
3 změnil soubory, kde provedl 69 přidání a 25 odebrání
  1. 37
    14
      NumberUtilities.java
  2. 15
    7
      TableUtilities.java
  3. 17
    4
      TriangleUtilities.java

+ 37
- 14
NumberUtilities.java Zobrazit soubor

@@ -1,32 +1,55 @@
1
- 
2
-
3 1
 
4 2
 public class NumberUtilities {
5
-    
6 3
     public static String getRange(int start) {
7
-        return null;
4
+        String range = "";
5
+        for(int i=0; i<start; i++){
6
+            range += i;
7
+        }
8
+        return range;
8 9
     }
9
-    
10
+
10 11
     public static String getRange(int start, int stop) {
11
-        return null;
12
-    }
13 12
 
13
+        String range = "";
14
+
15
+        for(int i=start; i<stop; i++){
16
+            range += i;
17
+        }
18
+
19
+        return range;
20
+    }
14 21
 
15 22
     public static String getRange(int start, int stop, int step) {
16
-        return null;
23
+        String range = "";
24
+
25
+        for(int i=start; i<stop; i+=step) {
26
+            range += i;
27
+        }
28
+        return range;
17 29
     }
18
-    
30
+
19 31
     public static String getEvenNumbers(int start, int stop) {
20
-        return null;
32
+        //start = (start % 2 == 1) ? start + 1 : start;
33
+        
34
+        if (start % 2 == 0) {
35
+            return getRange(start, stop, 2);
36
+        } else {
37
+            return getRange(start + 1, stop, 2);
38
+        }
21 39
     }
22 40
 
23
-
24 41
     public static String getOddNumbers(int start, int stop) {
25
-        return null;
42
+        start = (start % 2 == 0) ? start + 1 : start;
43
+            return getRange(start, stop, 2);
26 44
     }
27 45
 
28
-
29 46
     public static String getExponentiations(int start, int stop, int exponent) {
30
-        return null;
47
+        
48
+        String range = "";
49
+        
50
+        for(int i=start; i<stop + 1; i++) {
51
+            range += (int)Math.pow(i, exponent);
52
+        }
53
+        return range;
31 54
     }
32 55
 }

+ 15
- 7
TableUtilities.java Zobrazit soubor

@@ -1,15 +1,23 @@
1
- 
2 1
 
3 2
 public class TableUtilities {
4 3
     public static String getSmallMultiplicationTable() {
5
-        return null;
4
+        return getMultiplicationTable(5);
6 5
     }
7 6
 
8
-    public static String getLargeMultiplicationTable() {
9
-        return null;
10
-    }
7
+        public static String getLargeMultiplicationTable() {
8
+            return getMultiplicationTable(10);
9
+        }
11 10
 
12
-    public static String getMultiplicationTable(int tableSize) {
13
-        return null;
11
+        public static String getMultiplicationTable(int tableSize) {
12
+        StringBuilder multTable = new StringBuilder();
13
+        
14
+        for(int i=1; i<=tableSize; i++){
15
+            for(int j=1; j<=tableSize; j++){
16
+                String number = String.format("%3d |", j*i);
17
+                multTable.append(number);
18
+            }
19
+            multTable.append("\n");        
20
+        }
21
+        return multTable.toString();
14 22
     }
15 23
 }

+ 17
- 4
TriangleUtilities.java Zobrazit soubor

@@ -3,19 +3,32 @@
3 3
 public class TriangleUtilities {
4 4
 
5 5
     public static String getRow(int numberOfStars) {
6
-        return null;
6
+        String newRow = "";
7
+        
8
+        for(int i=0; i<numberOfStars; i++){
9
+            newRow += '*';
10
+        }
11
+        return newRow;
7 12
     }
8 13
     
9 14
     public static String getTriangle(int numberOfRows) {
10
-        return null;
15
+        String triangle = "";
16
+        
17
+        for(int i=0; i<numberOfRows; i++){
18
+            triangle += getRow(i+1);
19
+            triangle += "\n";
20
+        }
21
+        return triangle;
11 22
     }
12 23
 
13 24
 
14 25
     public static String getSmallTriangle() {
15
-        return null;
26
+ 
27
+        
28
+        return getTriangle(4);
16 29
     }
17 30
 
18 31
     public static String getLargeTriangle() {
19
-        return null;
32
+        return getTriangle(9);
20 33
     }
21 34
 }