Skip to content

Commit 7f2f7cd

Browse files
author
Aleksandr Pronichev
committed
add Utils.java and update Even.java
1 parent d448ef3 commit 7f2f7cd

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package hexlet.code;
2+
3+
import java.util.Random;
4+
5+
public class Utils {
6+
public static int getRandomInt(int minNumber, int maxNumber) {
7+
Random random = new Random();
8+
int randomNumber = random.nextInt(maxNumber - minNumber + 1) + minNumber;
9+
return randomNumber;
10+
}
11+
}

app/src/main/java/hexlet/code/games/Even.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package hexlet.code.games;
22

33
import hexlet.code.Engine;
4+
import hexlet.code.Utils;
45

56
public class Even {
67

78
private static final String RULES = "Answer 'yes' if the number is even, otherwise answer 'no'.";
9+
private static final int MIN_NUMBER = 1;
810
private static final int MAX_NUMBER = 100;
911

1012
public static void gameEven() {
@@ -15,13 +17,17 @@ public static void gameEven() {
1517
public static String[][] generateData() {
1618
String[][] questionsAndAnswers = new String[Engine.ROUNDS][2];
1719
for (int i = 0; i < Engine.ROUNDS; i++) {
18-
int number = (int) (Math.random() * MAX_NUMBER);
20+
int number = Utils.getRandomInt(MIN_NUMBER, MAX_NUMBER);
1921
String question = Integer.toString(number);
20-
String correctAnswer = (number % 2 == 0) ? "yes" : "no";
22+
String correctAnswer = isEven(number);
2123
questionsAndAnswers[i][0] = question;
2224
questionsAndAnswers[i][1] = correctAnswer;
2325
}
2426
return questionsAndAnswers;
2527
}
28+
29+
public static String isEven(int number) {
30+
return (number % 2 == 0) ? "yes" : "no";
31+
}
2632
}
2733

0 commit comments

Comments
 (0)