Просмотр исходного кода

Merge pull request #588 from exercism/548-fix

triangle: update starter implementation
FridaTveit 9 лет назад
Родитель
Сommit
4ba32d6b16

+ 5
- 5
exercises/triangle/src/example/java/Triangle.java Просмотреть файл

1
 import java.util.HashSet;
1
 import java.util.HashSet;
2
 import java.util.Set;
2
 import java.util.Set;
3
 
3
 
4
-public class Triangle {
4
+class Triangle {
5
 
5
 
6
     private double side1;
6
     private double side1;
7
     private double side2;
7
     private double side2;
8
     private double side3;
8
     private double side3;
9
 
9
 
10
-    public Triangle(double side1, double side2, double side3) throws TriangleException {
10
+    Triangle(double side1, double side2, double side3) throws TriangleException {
11
         this.side1 = side1;
11
         this.side1 = side1;
12
         this.side2 = side2;
12
         this.side2 = side2;
13
         this.side3 = side3;
13
         this.side3 = side3;
17
         }
17
         }
18
     }
18
     }
19
 
19
 
20
-    public TriangleKind getKind() {
20
+    TriangleKind getKind() {
21
         int uniqueSides = getNumberOfUniqueSides();
21
         int uniqueSides = getNumberOfUniqueSides();
22
 
22
 
23
         if (uniqueSides == 1) {
23
         if (uniqueSides == 1) {
43
         return side1 + side2 <= side3 || side1 + side3 <= side2 || side2 + side3 <= side1;
43
         return side1 + side2 <= side3 || side1 + side3 <= side2 || side2 + side3 <= side1;
44
     }
44
     }
45
 
45
 
46
-
47
-    public int getNumberOfUniqueSides() {
46
+    private int getNumberOfUniqueSides() {
48
         Set<Double> sides = new HashSet<>();
47
         Set<Double> sides = new HashSet<>();
49
 
48
 
50
         sides.add(side1);
49
         sides.add(side1);
53
 
52
 
54
         return sides.size();
53
         return sides.size();
55
     }
54
     }
55
+
56
 }
56
 }

+ 1
- 3
exercises/triangle/src/example/java/TriangleException.java Просмотреть файл

1
-public class TriangleException extends Exception {
1
+class TriangleException extends Exception {
2
 
2
 
3
-    public TriangleException() {
4
-    }
5
 }
3
 }

+ 11
- 0
exercises/triangle/src/main/java/Triangle.java Просмотреть файл

1
+class Triangle {
2
+
3
+    Triangle(double side1, double side2, double side3) throws TriangleException {
4
+        throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
5
+    }
6
+
7
+    TriangleKind getKind() {
8
+        throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
9
+    }
10
+
11
+}

+ 1
- 3
exercises/triangle/src/main/java/TriangleException.java Просмотреть файл

1
-public class TriangleException extends Exception {
1
+class TriangleException extends Exception {
2
 
2
 
3
-    public TriangleException() {
4
-    }
5
 }
3
 }