Skip to content

Commit bf85953

Browse files
committed
update Calculator.java
1 parent 9b718ae commit bf85953

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

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

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

3+
import hexlet.code.Engine;
4+
35
import java.util.Random;
46

57
public class Calculator {
8+
static final int COUNTSIGN = 3;
69
public static String[][] generateQA() {
7-
String[][] questionAnswer = new String[3][2];
10+
String[][] questionAnswer = new String[Engine.MAXROUNDCOUNTER][2];
811
for (int i = 0; i < questionAnswer.length; i++) {
912
String[] qa = generateSign();
1013
questionAnswer[i][0] = qa[0];
@@ -16,9 +19,9 @@ public static String[][] generateQA() {
1619
public static String[] generateSign() {
1720
String[] qas = new String[2];
1821
Random random = new Random();
19-
int firstNumber = random.nextInt(150);
20-
int secondNumber = random.nextInt(150);
21-
int randomNumberForSign = random.nextInt(3) + 1;
22+
int firstNumber = random.nextInt(Engine.MAXRANDOMNUMBER);
23+
int secondNumber = random.nextInt(Engine.MAXRANDOMNUMBER);
24+
int randomNumberForSign = random.nextInt(COUNTSIGN) + 1;
2225
switch (randomNumberForSign) {
2326
case 1:
2427
qas[0] = firstNumber + " + " + secondNumber;
@@ -32,6 +35,8 @@ public static String[] generateSign() {
3235
qas[0] = firstNumber + " * " + secondNumber;
3336
qas[1] = String.valueOf(firstNumber * secondNumber);
3437
break;
38+
default:
39+
break;
3540
}
3641
return qas;
3742
}

0 commit comments

Comments
 (0)