#38 finished a while ago just pulling @rjsmall90

オープン
rjsmall90 が 1 個のコミットを rjsmall90/CR-MicroLabs-Loops-NumbersTrianglesTables:master から master へマージしようとしています
共有4 個のファイルを変更した76 個の追加39 個の削除を含む
  1. 36
    15
      NumberUtilities.java
  2. 11
    3
      TableUtilities.java
  3. 16
    8
      TriangleUtilities.java
  4. 13
    13
      package.bluej

+ 36
- 15
NumberUtilities.java ファイルの表示

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

+ 11
- 3
TableUtilities.java ファイルの表示

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

+ 16
- 8
TriangleUtilities.java ファイルの表示

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

+ 13
- 13
package.bluej ファイルの表示

1
 #BlueJ package file
1
 #BlueJ package file
2
-dependency1.from=NumberUtilitiesTest
3
-dependency1.to=NumberUtilities
2
+dependency1.from=TableUtilitiesTest
3
+dependency1.to=TableUtilities
4
 dependency1.type=UsesDependency
4
 dependency1.type=UsesDependency
5
 dependency2.from=TriangleUtilitiesTest
5
 dependency2.from=TriangleUtilitiesTest
6
 dependency2.to=TriangleUtilities
6
 dependency2.to=TriangleUtilities
7
 dependency2.type=UsesDependency
7
 dependency2.type=UsesDependency
8
-dependency3.from=TableUtilitiesTest
9
-dependency3.to=TableUtilities
8
+dependency3.from=NumberUtilitiesTest
9
+dependency3.to=NumberUtilities
10
 dependency3.type=UsesDependency
10
 dependency3.type=UsesDependency
11
-editor.fx.0.height=722
12
-editor.fx.0.width=800
13
-editor.fx.0.x=537
14
-editor.fx.0.y=28
11
+editor.fx.0.height=777
12
+editor.fx.0.width=1079
13
+editor.fx.0.x=0
14
+editor.fx.0.y=23
15
 objectbench.height=164
15
 objectbench.height=164
16
 objectbench.width=484
16
 objectbench.width=484
17
 package.divider.horizontal=0.6
17
 package.divider.horizontal=0.6
18
-package.divider.vertical=0.7560627674750356
19
-package.editor.height=523
18
+package.divider.vertical=0.7436281859070465
19
+package.editor.height=489
20
 package.editor.width=382
20
 package.editor.width=382
21
-package.editor.x=20
22
-package.editor.y=57
23
-package.frame.height=759
21
+package.editor.x=573
22
+package.editor.y=23
23
+package.frame.height=725
24
 package.frame.width=508
24
 package.frame.width=508
25
 package.numDependencies=3
25
 package.numDependencies=3
26
 package.numTargets=6
26
 package.numTargets=6