#40 jpsp91 (Jae Park)

Отворено
jpsp91 жели да споји 2 комит(е) из jpsp91/CR-MicroLabs-Loops-NumbersTrianglesTables:master у master
4 измењених фајлова са 160 додато и 34 уклоњено
  1. 86
    14
      NumberUtilities.java
  2. 29
    4
      TableUtilities.java
  3. 37
    8
      TriangleUtilities.java
  4. 8
    8
      package.bluej

+ 86
- 14
NumberUtilities.java Прегледај датотеку

@@ -1,32 +1,104 @@
1
- 
2
-
3 1
 
4 2
 public class NumberUtilities {
5
-    
6 3
     public static String getRange(int start) {
7
-        return null;
4
+        StringBuilder number = new StringBuilder();
5
+        for(int i = 0; i < start; i++){
6
+            number.append(i);
7
+        }
8
+
9
+        return number.toString();
8 10
     }
9
-    
11
+
10 12
     public static String getRange(int start, int stop) {
11
-        return null;
12
-    }
13
+        StringBuilder number = new StringBuilder();
13 14
 
15
+        for(int i = start; i < stop; i++){
16
+            number.append(i);
17
+        }
18
+
19
+        return number.toString();
20
+    }
14 21
 
15 22
     public static String getRange(int start, int stop, int step) {
16
-        return null;
23
+        StringBuilder number = new StringBuilder();
24
+
25
+        for(int i = start; i < stop; i+= step){
26
+            number.append(i);
27
+        }
28
+
29
+        return number.toString();
17 30
     }
18
-    
31
+
19 32
     public static String getEvenNumbers(int start, int stop) {
20
-        return null;
21
-    }
33
+        StringBuilder number = new StringBuilder();
22 34
 
35
+        if(start % 2 == 0){
36
+            for(int i = start; i < stop; i+= 2){
37
+                number.append(i);
38
+            }
39
+        }
40
+        else {
41
+            for(int i = start+1; i < stop; i+= 2){
42
+                number.append(i);
43
+            }
44
+        }
23 45
 
24
-    public static String getOddNumbers(int start, int stop) {
25
-        return null;
46
+        return number.toString();
26 47
     }
27 48
 
49
+    public static String getOddNumbers(int start, int stop) {
50
+        StringBuilder number = new StringBuilder();
51
+
52
+        if(start % 2 != 0){
53
+            for(int i = start; i < stop; i+= 2){
54
+                number.append(i);
55
+            }
56
+        }
57
+        else {
58
+            for(int i = start+1; i < stop; i+= 2){
59
+                number.append(i);
60
+            }
61
+        }
62
+
63
+        return number.toString();
64
+    }
28 65
 
29 66
     public static String getExponentiations(int start, int stop, int exponent) {
30
-        return null;
67
+        StringBuilder number = new StringBuilder();
68
+        
69
+        int x = 0;
70
+        
71
+        if(exponent % 2 == 0){
72
+            for(int i = start; i <= stop; i++){
73
+                x = (int)Math.pow(i, exponent);
74
+                number.append(x);
75
+            }
76
+        }
77
+        
78
+        if(exponent % 2 != 0){
79
+            for(int i = start; i <= stop; i++){
80
+                x = (int)Math.pow(i, exponent);
81
+                number.append(x);
82
+            }
83
+        }
84
+        
85
+        
86
+        // else {
87
+            // for(int i = start; i <= stop; i++){
88
+                // Math.pow(start, 3);
89
+                // number.append(i);
90
+            // }
91
+        // }
92
+        
93
+        
94
+        
95
+        
96
+
97
+        // for(int i = start; i <= stop; i++){
98
+            // Math.pow(start, exponent);
99
+            // number.append(i);
100
+        // }
101
+
102
+        return number.toString();
31 103
     }
32 104
 }

+ 29
- 4
TableUtilities.java Прегледај датотеку

@@ -1,15 +1,40 @@
1
- 
2 1
 
3 2
 public class TableUtilities {
4 3
     public static String getSmallMultiplicationTable() {
5
-        return null;
4
+        
5
+        return getMultiplicationTable(5);
6 6
     }
7 7
 
8 8
     public static String getLargeMultiplicationTable() {
9
-        return null;
9
+        
10
+        return getMultiplicationTable(10);
10 11
     }
11 12
 
12 13
     public static String getMultiplicationTable(int tableSize) {
13
-        return null;
14
+        StringBuilder table = new StringBuilder();
15
+        
16
+        for(int row=1; row <= tableSize; row++){
17
+            
18
+            for(int column=1; column<= tableSize; column++){
19
+                
20
+                table.append( String.format("%3d |" , column*row));
21
+                
22
+            }
23
+            
24
+            table.append("\n");
25
+            
26
+        }
27
+        
28
+        return table.toString();
14 29
     }
15 30
 }
31
+
32
+/**
33
+StringBuilder
34
+for loop row
35
+nested for loop coloumn
36
+append string
37
+
38
+Take note of how the multiplication table works
39
+ **/
40
+

+ 37
- 8
TriangleUtilities.java Прегледај датотеку

@@ -1,21 +1,50 @@
1
- 
2 1
 
3 2
 public class TriangleUtilities {
4
-
5 3
     public static String getRow(int numberOfStars) {
6
-        return null;
4
+        StringBuilder triangle = new StringBuilder();
5
+        
6
+        for (int x = 0; x < numberOfStars; x++){
7
+             triangle.append(String.format("*"));
8
+        }
9
+        
10
+        return triangle.toString();
7 11
     }
8
-    
12
+
9 13
     public static String getTriangle(int numberOfRows) {
10
-        return null;
14
+        StringBuilder triangle = new StringBuilder();
15
+        
16
+        for (int x = 0; x < numberOfRows; x++){
17
+            triangle.append(String.format("*"));
18
+            triangle.append("\n");
19
+        }
20
+        
21
+        return triangle.toString();
11 22
     }
12 23
 
13
-
14 24
     public static String getSmallTriangle() {
15
-        return null;
25
+        StringBuilder triangle = new StringBuilder();
26
+
27
+        for (int x = 0; x <5; x++){
28
+            for (int y = 0; y <x; y++){
29
+                triangle.append(String.format("*"));
30
+            }
31
+            triangle.append("\n");
32
+        }
33
+
34
+        return triangle.toString();
16 35
     }
17 36
 
18 37
     public static String getLargeTriangle() {
19
-        return null;
38
+        StringBuilder triangle = new StringBuilder();
39
+
40
+        for (int x = 0; x <11; x++){
41
+            for (int y = 0; y <x; y++){
42
+                triangle.append(String.format("*"));
43
+            }
44
+            triangle.append("\n");
45
+        }
46
+
47
+        return triangle.toString();
20 48
     }
21 49
 }
50
+

+ 8
- 8
package.bluej Прегледај датотеку

@@ -10,17 +10,17 @@ dependency3.to=TableUtilities
10 10
 dependency3.type=UsesDependency
11 11
 editor.fx.0.height=722
12 12
 editor.fx.0.width=800
13
-editor.fx.0.x=537
14
-editor.fx.0.y=28
15
-objectbench.height=164
13
+editor.fx.0.x=240
14
+editor.fx.0.y=24
15
+objectbench.height=156
16 16
 objectbench.width=484
17 17
 package.divider.horizontal=0.6
18
-package.divider.vertical=0.7560627674750356
19
-package.editor.height=523
18
+package.divider.vertical=0.7552552552552553
19
+package.editor.height=496
20 20
 package.editor.width=382
21
-package.editor.x=20
22
-package.editor.y=57
23
-package.frame.height=759
21
+package.editor.x=100
22
+package.editor.y=24
23
+package.frame.height=724
24 24
 package.frame.width=508
25 25
 package.numDependencies=3
26 26
 package.numTargets=6