Skip to content

Commit 5bffc2e

Browse files
committed
fix: упрощено формирование вопроса в Progression (использован String.join)
1 parent 7472918 commit 5bffc2e

1 file changed

Lines changed: 10 additions & 23 deletions

File tree

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

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,21 @@ private static String[] generateRound() {
2626
int length = Utils.generateNumber(MIN_LENGTH, MAX_LENGTH);
2727
int start = Utils.generateNumber(MIN_START, MAX_START);
2828
int step = Utils.generateNumber(MIN_STEP, MAX_STEP);
29-
int hiddenPosition = Utils.generateNumber(0, length - 1);
29+
int hiddenIndex = Utils.generateNumber(0, length - 1);
3030

31-
int[] progression = generateProgression(start, step, length);
31+
String[] progression = makeProgression(start, step, length);
32+
String correctAnswer = progression[hiddenIndex];
33+
progression[hiddenIndex] = "..";
34+
String question = String.join(" ", progression);
3235

33-
String question = hideElement(progression, hiddenPosition);
34-
35-
int hiddenNumber = progression[hiddenPosition];
36-
37-
return new String[] {question, Integer.toString(hiddenNumber)};
36+
return new String[] {question, correctAnswer};
3837
}
3938

40-
private static int[] generateProgression(int start, int step, int length) {
41-
int[] progression = new int[length];
39+
private static String[] makeProgression(int start, int step, int length) {
40+
String[] progression = new String[length];
4241
for (int i = 0; i < length; i++) {
43-
progression[i] = start + i * step;
42+
progression[i] = Integer.toString(start + i * step);
4443
}
4544
return progression;
4645
}
47-
48-
private static String hideElement(int[] progression, int hiddenPosition) {
49-
String[] result = new String[progression.length];
50-
for (int i = 0; i < progression.length; i++) {
51-
if (i == hiddenPosition) {
52-
result[i] = "..";
53-
} else {
54-
result[i] = Integer.toString(progression[i]);
55-
}
56-
}
57-
return String.join(" ", result);
58-
}
59-
}
46+
}

0 commit comments

Comments
 (0)