rayskeez21 пре 6 година
родитељ
комит
9c1f2de1e2
4 измењених фајлова са 85 додато и 42 уклоњено
  1. 43
    14
      NumberUtilities.java
  2. 11
    4
      TableUtilities.java
  3. 15
    8
      TriangleUtilities.java
  4. 16
    16
      package.bluej

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

@@ -1,32 +1,61 @@
1
- 
2
-
3 1
 
4 2
 public class NumberUtilities {
5
-    
6 3
     public static String getRange(int start) {
7
-        return null;
4
+        StringBuilder homeOn = new StringBuilder();
5
+        for(int i = 0; i < start; i++){
6
+            homeOn.append(i);
7
+
8
+        }
9
+        return "" + homeOn;
8 10
     }
9
-    
11
+
10 12
     public static String getRange(int start, int stop) {
11
-        return null;
13
+        StringBuilder onThe = new StringBuilder();
14
+        for(int t = start; t < stop; t++){
15
+            onThe.append(t);
16
+        }
17
+        return "" + onThe;
12 18
     }
13 19
 
14
-
15 20
     public static String getRange(int start, int stop, int step) {
16
-        return null;
21
+        StringBuilder stairs = new StringBuilder();
22
+        for(int g = start; g < stop; g+=step){
23
+            stairs.append(g);
24
+
25
+        }
26
+        return "" + stairs;
17 27
     }
18
-    
28
+
19 29
     public static String getEvenNumbers(int start, int stop) {
20
-        return null;
21
-    }
30
+        StringBuilder notOdd = new StringBuilder();
31
+        for(int e = start; e < stop; e++){
22 32
 
33
+            if(e%2 == 0){
34
+                notOdd.append(e);   
35
+            }
23 36
 
24
-    public static String getOddNumbers(int start, int stop) {
25
-        return null;
37
+        }
38
+        return "" + notOdd;
26 39
     }
27 40
 
41
+    public static String getOddNumbers(int start, int stop) {
42
+        StringBuilder notEven = new StringBuilder();
43
+        for(int o = start; o < stop; o++){
44
+
45
+            if(o%2 == 1){
46
+                notEven.append(o);
47
+            }
48
+        }
49
+        return "" + notEven;
50
+    }
28 51
 
29 52
     public static String getExponentiations(int start, int stop, int exponent) {
30
-        return null;
53
+        StringBuilder multiply = new StringBuilder();
54
+        for(int m = start; m <= stop; m++){
55
+            int divide = (int)Math.pow(m,exponent);
56
+            multiply.append(divide);
57
+
58
+        }
59
+        return "" + multiply;
31 60
     }
32 61
 }

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

@@ -1,15 +1,22 @@
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 7
     public static String getLargeMultiplicationTable() {
9
-        return null;
8
+        return getMultiplicationTable(10);
10 9
     }
11 10
 
12 11
     public static String getMultiplicationTable(int tableSize) {
13
-        return null;
12
+        StringBuilder multiTable = new StringBuilder();
13
+        for(int i = 1 ; i <= tableSize; i++){
14
+
15
+            for(int j = 1; j <= tableSize; j++){
16
+                multiTable.append(String.format("%3s |",(i * j)));
17
+            }
18
+            multiTable.append("\n");
19
+        }
20
+        return multiTable + "";
14 21
     }
15 22
 }

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

@@ -1,21 +1,28 @@
1
- 
2 1
 
3 2
 public class TriangleUtilities {
4
-
5 3
     public static String getRow(int numberOfStars) {
6
-        return null;
4
+        StringBuilder star = new StringBuilder();
5
+        for(int i = 0; i < numberOfStars; i++){
6
+            star.append("*");
7
+
8
+        }    
9
+        return star.toString();
7 10
     }
8
-    
11
+
9 12
     public static String getTriangle(int numberOfRows) {
10
-        return null;
11
-    }
13
+        StringBuilder row = new StringBuilder();
14
+        for(int t = 1;t < numberOfRows + 1; t++){
15
+            row.append(getRow(t) + "\n");   
12 16
 
17
+        }
18
+        return row.toString();
19
+    }
13 20
 
14 21
     public static String getSmallTriangle() {
15
-        return null;
22
+        return getTriangle(4);
16 23
     }
17 24
 
18 25
     public static String getLargeTriangle() {
19
-        return null;
26
+        return getTriangle(9);
20 27
     }
21 28
 }

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

@@ -1,27 +1,27 @@
1 1
 #BlueJ package file
2
-dependency1.from=NumberUtilitiesTest
3
-dependency1.to=NumberUtilities
2
+dependency1.from=TableUtilitiesTest
3
+dependency1.to=TableUtilities
4 4
 dependency1.type=UsesDependency
5 5
 dependency2.from=TriangleUtilitiesTest
6 6
 dependency2.to=TriangleUtilities
7 7
 dependency2.type=UsesDependency
8
-dependency3.from=TableUtilitiesTest
9
-dependency3.to=TableUtilities
8
+dependency3.from=NumberUtilitiesTest
9
+dependency3.to=NumberUtilities
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
16
-objectbench.width=484
17
-package.divider.horizontal=0.6
18
-package.divider.vertical=0.7560627674750356
19
-package.editor.height=523
20
-package.editor.width=382
21
-package.editor.x=20
22
-package.editor.y=57
23
-package.frame.height=759
24
-package.frame.width=508
13
+editor.fx.0.x=252
14
+editor.fx.0.y=23
15
+objectbench.height=154
16
+objectbench.width=483
17
+package.divider.horizontal=0.5549263873159683
18
+package.divider.vertical=0.7556904400606981
19
+package.editor.height=491
20
+package.editor.width=777
21
+package.editor.x=142
22
+package.editor.y=-932
23
+package.frame.height=717
24
+package.frame.width=903
25 25
 package.numDependencies=3
26 26
 package.numTargets=6
27 27
 package.showExtends=true