Skip to content

Commit 85422da

Browse files
committed
changed Engine.java and Makefile, Progression.java
1 parent e139520 commit 85422da

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

app/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
run-dist:
2-
./build/install/app/bin/app
2+
./build/install/app/bin/app
3+
lint:
4+
./gradlew checkstyleMain

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public static void gameEngine(String exercise, String[][] questionAndAnswer) {
2828
System.out.println("'" + answer + "' is wrong answer ;(. Correct answer was '" + correctAnswer + "'");
2929
System.out.println("Let's try again, " + name + "!");
3030
break;
31-
} System.out.println("Correct!");
31+
}
32+
System.out.println("Correct!");
3233
count++;
3334
}
3435
if (count == COUNT_OF_ROUNDS) {

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,12 @@ private static String[] getQuestionAndAnswer() {
1717
}
1818
int randomIndex = Utils.getRandomNumber(0, randomLength - 1);
1919
String correctAnswer = String.valueOf(numbers[randomIndex]);
20+
numbers[randomIndex] = -1;
21+
String question = String.join(" ", java.util.Arrays.stream(numbers)
22+
.mapToObj(num -> num == -1 ? ".." : String.valueOf(num))
23+
.toArray(String[]::new));
2024

21-
StringBuilder questionBuilder = new StringBuilder();
22-
for (int i = 0; i < randomLength; i++) {
23-
if (i == randomIndex) {
24-
questionBuilder.append(".. ");
25-
} else {
26-
questionBuilder.append(numbers[i]).append(" ");
27-
}
28-
}
29-
30-
String question = questionBuilder.toString().trim();
31-
return new String[] {question, correctAnswer};
25+
return new String[] {question.trim(), correctAnswer};
3226
}
3327

3428
public static void gameProgression() {

0 commit comments

Comments
 (0)