Skip to content

Commit 9c9d96d

Browse files
DashProshDashProsh
committed
added massive for [questions and answers]
1 parent 19b26dc commit 9c9d96d

File tree

6 files changed

+55
-49
lines changed

6 files changed

+55
-49
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
public class Engine {
66
public static final int ROUNDS = 10;
77

8-
public static void skeletonOfGames(String mainGameQuestion, String[] question, String[] correctAnswer) {
8+
public static void skeletonOfGames(String mainGameQuestion,String[][] eachRound) {
99

1010
Scanner scanner = new Scanner(System.in);
1111
System.out.println("""
@@ -17,16 +17,16 @@ public static void skeletonOfGames(String mainGameQuestion, String[] question, S
1717
System.out.println(mainGameQuestion);
1818

1919
for (var i = 0; i < ROUNDS; i++) {
20-
System.out.println("Question: " + question[i]);
20+
System.out.println("Question: " + eachRound[i][0]);
2121
System.out.println("Your answer: ");
2222
String userAnswer = scanner.nextLine();
2323

24-
if (userAnswer.equals(correctAnswer[i])) {
24+
if (userAnswer.equals(eachRound[i][1])) {
2525
System.out.println("Correct!");
2626

2727
} else {
2828
System.out.println("'" + userAnswer + "'" + "is wrong answer ;(. "
29-
+ "Correct answer was " + "'" + correctAnswer[i] + "'" + ". \n"
29+
+ "Correct answer was " + "'" + eachRound[i][1] + "'" + ". \n"
3030
+ "Let's try again, "
3131
+ name
3232
+ "!");

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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
import java.util.List;
88
import java.util.Random;
99

10-
1110
public class Calc {
12-
public static int calc() {
11+
public static void calc() {
1312

14-
//Random random = new Random();
1513
String mainGameQuestion = "What is the result of the expression?";
1614

17-
String[] question = new String[Engine.ROUNDS];
18-
String[] correctAnswer = new String[Engine.ROUNDS];
15+
String[][] eachRound = new String[Engine.ROUNDS][2];
1916

2017
for (var i = 0; i < Engine.ROUNDS; i++) {
2118
final int maxRandomNumber1 = 19;
@@ -30,20 +27,21 @@ public static int calc() {
3027

3128
List<String> randomExpression = Arrays.asList(plus, minus, mult);
3229
Random rand = new Random();
33-
String randomQuestion = randomExpression.get(rand.nextInt(randomExpression.size()));
3430

35-
question[i] = randomQuestion;
31+
String question = randomExpression.get(rand.nextInt(randomExpression.size()));
32+
String correctAnswer;
3633

37-
if (randomQuestion.equals(plus)) {
38-
correctAnswer[i] = String.valueOf(randomNumber1 + randomNumber2);
39-
} else if (randomQuestion.equals(minus)) {
40-
correctAnswer[i] = String.valueOf(randomNumber1 - randomNumber2);
34+
if (question.equals(plus)) {
35+
correctAnswer = String.valueOf(randomNumber1 + randomNumber2);
36+
} else if (question.equals(minus)) {
37+
correctAnswer = String.valueOf(randomNumber1 - randomNumber2);
4138
} else {
42-
correctAnswer[i] = String.valueOf(randomNumber1 * randomNumber2);
39+
correctAnswer = String.valueOf(randomNumber1 * randomNumber2);
4340
}
41+
eachRound[i][0] = question;
42+
eachRound[i][1] = correctAnswer;
4443
}
45-
Engine.skeletonOfGames(mainGameQuestion, question, correctAnswer);
46-
return 0;
44+
Engine.skeletonOfGames(mainGameQuestion, eachRound);
45+
//return 0;
4746
}
48-
4947
}

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,25 @@
44
import hexlet.code.Utils;
55

66
public class Even {
7-
public static int even() {
7+
public static void even() {
88

99
String mainGameQuestion = "Answer 'yes' if the number is even, otherwise answer 'no'.";
1010

11-
String[] question = new String[Engine.ROUNDS];
12-
String[] correctAnswer = new String[Engine.ROUNDS];
11+
String[][] eachRound = new String[Engine.ROUNDS][2];
1312

14-
for (var i = 0; i < Engine.ROUNDS; i++) {
13+
for (int i = 0; i < Engine.ROUNDS; i++) {
1514

1615
final int maxRandomNumber = 99;
1716
int randomNumber = Utils.getRandomInt(maxRandomNumber);
18-
question[i] = Integer.toString(randomNumber);
19-
correctAnswer[i] = (randomNumber % 2 == 0) ? "yes" : "no";
17+
18+
String question = Integer.toString(randomNumber);
19+
String correctAnswer = (randomNumber % 2 == 0) ? "yes" : "no";
20+
21+
eachRound[i][0] = question;
22+
eachRound[i][1] = correctAnswer;
23+
2024
}
21-
Engine.skeletonOfGames(mainGameQuestion, question, correctAnswer);
22-
return 0;
25+
Engine.skeletonOfGames(mainGameQuestion, eachRound);
26+
//return 0;
2327
}
2428
}

‎app/src/main/java/hexlet/code/games/Gcd.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88

99

1010
public class Gcd {
11-
public static int gcd() {
11+
public static void gcd() {
1212

1313
String mainGameQuestion = "Find the greatest common divisor of given numbers.";
1414

15-
String[] question = new String[Engine.ROUNDS];
16-
String[] correctAnswer = new String[Engine.ROUNDS];
15+
String[][] eachRound = new String[Engine.ROUNDS][2];
1716

1817
for (var i = 0; i < Engine.ROUNDS; i++) {
1918

@@ -29,10 +28,13 @@ public static int gcd() {
2928

3029
String gcd = String.valueOf((bigA).gcd(bigB));
3130

32-
question[i] = randomNumber1 + " " + randomNumber2;
33-
correctAnswer[i] = gcd;
31+
String question = randomNumber1 + " " + randomNumber2;
32+
String correctAnswer = gcd;
33+
34+
eachRound[i][0] = question;
35+
eachRound[i][1] = correctAnswer;
3436
}
35-
Engine.skeletonOfGames(mainGameQuestion, question, correctAnswer);
36-
return 0;
37+
Engine.skeletonOfGames(mainGameQuestion, eachRound);
38+
//return 0;
3739
}
3840
}

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
import hexlet.code.Utils;
55

66
public class Prime {
7-
public static int prime() {
7+
public static void prime() {
88

99
String mainGameQuestion = "Answer 'yes' if given number is prime. Otherwise answer 'no'.";
1010

11-
String[] question = new String[Engine.ROUNDS];
12-
String[] correctAnswer = new String[Engine.ROUNDS];
11+
String[][] eachRound = new String[Engine.ROUNDS][2];
1312

1413
for (var i = 0; i < Engine.ROUNDS; i++) {
1514

1615
final int maxRandomNumber = 20;
1716

1817
int randomNumber = Utils.getRandomInt(maxRandomNumber) + 1;
19-
question[i] = Integer.toString(randomNumber);
18+
String question = Integer.toString(randomNumber);
2019

2120
boolean isPrime = true;
2221

@@ -28,9 +27,12 @@ public static int prime() {
2827
isPrime = true;
2928

3029
}
31-
correctAnswer[i] = isPrime ? "yes" : "no";
30+
String correctAnswer = isPrime ? "yes" : "no";
31+
32+
eachRound[i][0] = question;
33+
eachRound[i][1] = correctAnswer;
3234
}
33-
Engine.skeletonOfGames(mainGameQuestion, question, correctAnswer);
34-
return 0;
35+
Engine.skeletonOfGames(mainGameQuestion, eachRound);
36+
//return 0;
3537
}
3638
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import java.util.Arrays;
77

88
public class Progression {
9-
public static int progression() {
9+
public static void progression() {
1010

1111
String mainGameQuestion = "What number is missing in the progression?";
1212

13-
String[] question = new String[Engine.ROUNDS];
14-
String[] correctAnswer = new String[Engine.ROUNDS];
13+
String[][] eachRound = new String[Engine.ROUNDS][2];
1514

1615
for (var i = 0; i < Engine.ROUNDS; i++) {
1716

@@ -38,12 +37,13 @@ public static int progression() {
3837
arrayHideNumber = arrayHideNumber.replace("[", "").replace("]", "")
3938
.replace(",", "");
4039

41-
question[i] = arrayHideNumber;
42-
correctAnswer[i] = String.valueOf(array[indexFromArray]);
40+
String question = arrayHideNumber;
41+
String correctAnswer = String.valueOf(array[indexFromArray]);
4342

43+
eachRound[i][0] = question;
44+
eachRound[i][1] = correctAnswer;
4445
}
45-
Engine.skeletonOfGames(mainGameQuestion, question, correctAnswer);
46-
return 0;
46+
Engine.skeletonOfGames(mainGameQuestion, eachRound);
47+
//return 0;
4748
}
48-
4949
}

0 commit comments

Comments
 (0)