Skip to content

Commit 8e7a133

Browse files
committed
Calc multiplication fix
1 parent a378085 commit 8e7a133

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public static int calculate(int number1, int number2, char operator) {
88
return switch (operator) {
99
case '+' -> number1 + number2;
1010
case '-' -> number1 - number2;
11-
default -> (number1 / 2) * (number2 / 2); // balancing difficulty
11+
default -> number1 * number2;
1212
};
1313
}
1414

@@ -24,11 +24,18 @@ public static void start() {
2424
var number2 = Engine.getRandomNumber(RANDOM_NUMBER_BOUND);
2525
char operator;
2626

27-
operator = switch (Engine.getRandomNumber(RANDOM_OPERATOR_BOUND)) {
28-
case 0 -> '+';
29-
case 1 -> '-';
30-
default -> '*';
31-
};
27+
switch (Engine.getRandomNumber(RANDOM_OPERATOR_BOUND)) {
28+
case 0:
29+
operator = '+';
30+
break;
31+
case 1:
32+
operator = '-';
33+
break;
34+
default:
35+
operator = '*';
36+
number1 = number1 / 2;
37+
number2 = number2 / 2;
38+
}
3239

3340
var correctAnswer = calculate(number1, number2, operator);
3441
questions[i] = number1 + " " + operator + " " + number2;

0 commit comments

Comments
 (0)