Skip to content

Commit c9efdbf

Browse files
committed
antimage
1 parent 41ab3b8 commit c9efdbf

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ public class Calc {
66
public static void play(Scanner scanner) {
77
Engine.greet(scanner);
88

9-
var randomNumberBound = 50;
10-
var randomOperatorBound = 3;
9+
final var RANDOM_NUMBER_BOUND = 50;
10+
final var RANDOM_OPERATOR_BOUND = 3;
1111

1212
while (Engine.isContinuing()) {
13-
var number1 = Engine.getRandomNumber(randomNumberBound);
14-
var number2 = Engine.getRandomNumber(randomNumberBound);
13+
var number1 = Engine.getRandomNumber(RANDOM_NUMBER_BOUND);
14+
var number2 = Engine.getRandomNumber(RANDOM_NUMBER_BOUND);
1515
char operator;
1616

17-
int correctAnswer = switch (Engine.getRandomNumber(randomOperatorBound)) {
17+
int correctAnswer = switch (Engine.getRandomNumber(RANDOM_OPERATOR_BOUND)) {
1818
case 0 -> {
1919
operator = '+';
2020
yield number1 + number2;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class Engine {
88
private static boolean defeated = false;
99
private static int currentRound = 1;
1010
private static final int FINAL_ROUND = 3;
11-
private static Random randomizer = new Random();
11+
private static final Random RANDOMIZER = new Random();
1212

1313
public static void greet(Scanner scanner) {
1414
System.out.println("Welcome to the Brain Games!");
@@ -22,7 +22,7 @@ public static boolean isContinuing() {
2222
}
2323

2424
public static int getRandomNumber(int bound) {
25-
return randomizer.nextInt(bound);
25+
return RANDOMIZER.nextInt(bound);
2626
}
2727

2828
public static void compareAnswers(String userAnswer, String correctAnswer) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ public static void play(Scanner scanner) {
77
Engine.greet(scanner);
88
System.out.println("Answer 'yes' if the number is even, otherwise answer 'no'.");
99

10-
var randomNumberBound = 100;
10+
final var RANDOM_NUMBER_BOUND = 100;
1111

1212
while (Engine.isContinuing()) {
13-
var randomNumber = Engine.getRandomNumber(randomNumberBound) + 1; // added 1 to avoid 0
13+
var randomNumber = Engine.getRandomNumber(RANDOM_NUMBER_BOUND) + 1; // added 1 to avoid 0
1414
var correctAnswer = randomNumber % 2 == 0 ? "yes" : "no";
1515

1616
System.out.println("Question: " + randomNumber);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ public static int getGCD(int a, int b) {
1010
public static void play(Scanner scanner) {
1111
Engine.greet(scanner);
1212

13-
var randomNumberBound = 100;
13+
final var RANDOM_NUMBER_BOUND = 100;
1414

1515
while (Engine.isContinuing()) {
16-
var number1 = Engine.getRandomNumber(randomNumberBound) + 1; // added 1 to avoid 0
17-
var number2 = Engine.getRandomNumber(randomNumberBound) + 1;
16+
var number1 = Engine.getRandomNumber(RANDOM_NUMBER_BOUND) + 1; // added 1 to avoid 0
17+
var number2 = Engine.getRandomNumber(RANDOM_NUMBER_BOUND) + 1;
1818
int correctAnswer = getGCD(number1, number2);
1919

2020
System.out.println("Find the greatest common divisor of given numbers.");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public static void play(Scanner scanner) {
2121
Engine.greet(scanner);
2222
System.out.println("Answer 'yes' if given number is prime. Otherwise answer 'no'.");
2323

24-
var randomNumberBound = 82; // multiplication table range
24+
final var RANDOM_NUMBER_BOUND = 82; // multiplication table range
2525

2626
while (Engine.isContinuing()) {
27-
var randomNumber = Engine.getRandomNumber(randomNumberBound);
27+
var randomNumber = Engine.getRandomNumber(RANDOM_NUMBER_BOUND);
2828
var correctAnswer = isPrime(randomNumber) ? "yes" : "no";
2929

3030
System.out.println("Question: " + randomNumber);

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
public class Progression {
77
public static int[] getRandomProgression() {
8-
var progressionSize = 10;
9-
var randomElementOfProgressionBound = 20;
10-
var randomStepBound = 10;
8+
final var PROGRESSION_SIZE = 10;
9+
final var RANDOM_ELEMENT_OF_PROGRESSION_BOUND = 20;
10+
final var RANDOM_STEP_BOUND = 10;
1111

12-
int[] progression = new int[progressionSize];
13-
progression[0] = Engine.getRandomNumber(randomElementOfProgressionBound);
14-
var step = Engine.getRandomNumber(randomStepBound) + 1;
12+
int[] progression = new int[PROGRESSION_SIZE];
13+
progression[0] = Engine.getRandomNumber(RANDOM_ELEMENT_OF_PROGRESSION_BOUND);
14+
var step = Engine.getRandomNumber(RANDOM_STEP_BOUND) + 1;
1515

16-
for (var i = 1; i < progressionSize; i++) {
16+
for (var i = 1; i < PROGRESSION_SIZE; i++) {
1717
progression[i] = progression[i - 1] + step;
1818
}
1919

@@ -23,11 +23,11 @@ public static int[] getRandomProgression() {
2323
public static void play(Scanner scanner) {
2424
Engine.greet(scanner);
2525

26-
var randomHiddenElementBound = 10;
26+
final var RANDOM_HIDDEN_ELEMENT_BOUND = 10;
2727

2828
while (Engine.isContinuing()) {
2929
int[] progression = getRandomProgression();
30-
var hiddenElement = progression[Engine.getRandomNumber(randomHiddenElementBound)];
30+
var hiddenElement = progression[Engine.getRandomNumber(RANDOM_HIDDEN_ELEMENT_BOUND)];
3131
var correctAnswer = Integer.toString(hiddenElement);
3232

3333
StringJoiner progressionForQuestion = new StringJoiner(" ");

0 commit comments

Comments
 (0)