File tree Expand file tree Collapse file tree 5 files changed +28
-24
lines changed
app/src/main/java/hexlet/code Expand file tree Collapse file tree 5 files changed +28
-24
lines changed Original file line number Diff line number Diff line change @@ -22,6 +22,9 @@ public static void main(String[] args) {
2222 case "4" -> Engine .engine ("GCD" );
2323 case "5" -> Engine .engine ("Progression" );
2424 case "6" -> Engine .engine ("Prime" );
25+ default -> {
26+ return ;
27+ }
2528 }
2629 }
2730}
Original file line number Diff line number Diff line change 11package hexlet .code ;
22
33import java .util .Scanner ;
4- import hexlet .code .games .*;
54import hexlet .code .games .Even ;
5+ import hexlet .code .games .Calc ;
6+ import hexlet .code .games .Gcd ;
7+ import hexlet .code .games .Progression ;
8+ import hexlet .code .games .Prime ;
9+
610
711public class Engine {
812
@@ -15,36 +19,31 @@ static void engine(String nameOfTheGame) { // Метод получает пар
1519 for (int i = 0 ; i < numberOfRounds ; i ++) {
1620
1721 String note = "" ; // Строковая переменная хранящая условие игры
18- String question ="" ; // Строковая переменная хранящая вопрос
22+ String question = "" ; // Строковая переменная хранящая вопрос
1923 StringBuilder rightAnswer = new StringBuilder (); // Переменная хранящая правильный ответ
2024
2125
2226 switch (nameOfTheGame ) {
23- case "Even" : {
27+ case "Even" :
2428 note = Even .introductoryNote ();
2529 question = Even .question (rightAnswer );
2630 break ;
27- }
28- case "Calc" : {
31+ case "Calc" :
2932 note = Calc .introductoryNote ();
3033 question = Calc .question (rightAnswer );
3134 break ;
32- }
33- case "GCD" : {
35+ case "GCD" :
3436 note = Gcd .introductoryNote ();
3537 question = Gcd .question (rightAnswer );
3638 break ;
37- }
38- case "Progression" : {
39+ case "Progression" :
3940 note = Progression .introductoryNote ();
4041 question = Progression .question (rightAnswer );
4142 break ;
42- }
43- case "Prime" : {
43+ case "Prime" :
4444 note = Prime .introductoryNote ();
4545 question = Prime .question (rightAnswer );
4646 break ;
47- }
4847 default : return ;
4948 }
5049 System .out .println (note );
Original file line number Diff line number Diff line change @@ -19,8 +19,8 @@ static void game() {
1919 if (playerAnswer .equals (rightAnswer )) {
2020 System .out .println ("Correct!" );
2121 } else {
22- System .out .println ("'" + playerAnswer + "' is wrong answer ;(. Correct answer was '" + rightAnswer + "'. \n " +
23- "Let's try again, " + playerName + "!" );
22+ System .out .println ("'" + playerAnswer + "' is wrong answer ;(. Correct answer was '"
23+ + rightAnswer + "'. \n " + "Let's try again, " + playerName + "!" );
2424 return ;
2525 }
2626 }
Original file line number Diff line number Diff line change @@ -18,11 +18,12 @@ public static String question(StringBuilder rightAnswer) {
1818 case 1 -> "-" ;
1919 default -> "*" ;
2020 };
21- int number1 , number2 ;
22- if (operator == 2 ) {
21+ int number1 ;
22+ int number2 ;
23+ if (operator == 2 ) {
2324 number1 = rnd .nextInt (21 ) - 10 ; // получение первого числа в диапазоне от -10 до 10 для
2425 // операции умножения
25- number2 = rnd .nextInt (21 ) -10 ; // получение второго числа в диапазоне от -10 до 10 для
26+ number2 = rnd .nextInt (21 ) - 10 ; // получение второго числа в диапазоне от -10 до 10 для
2627 // операции умножения
2728 } else {
2829 number1 = rnd .nextInt (201 ) - 100 ; // получение первого числа в диапазоне от -100 до 100 для
@@ -32,12 +33,13 @@ public static String question(StringBuilder rightAnswer) {
3233 }
3334
3435 // Формирование правильного ответа
35- rightAnswer .append (switch (operator ) {
36- case 0 -> String .valueOf (number1 + number2 );
37- case 1 -> String .valueOf (number1 - number2 );
38- default -> String .valueOf (number1 * number2 );
39- }
40- );
36+ rightAnswer .append (
37+ switch (operator ) {
38+ case 0 -> String .valueOf (number1 + number2 );
39+ case 1 -> String .valueOf (number1 - number2 );
40+ default -> String .valueOf (number1 * number2 );
41+ }
42+ );
4143 return number1 + " " + operatorSting + " " + number2 ; // Формирование строки с заданием
4244 }
4345
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ public static String introductoryNote() { // Метод получает пар
1212 // Метод формирует вопрос и правильный ответ
1313 public static String question (StringBuilder rightAnswer ) {
1414 SecureRandom rnd = new SecureRandom ();
15- final int lenProgression = rnd .nextInt (10 ) +6 ; // устанавливаем длину прогрессии 6..15 номеров
15+ final int lenProgression = rnd .nextInt (10 ) + 6 ; // устанавливаем длину прогрессии 6..15 номеров
1616 final int step = rnd .nextInt (10 ) + 1 ; // Шаг прогрессии
1717 int sequenceNumber = rnd .nextInt (lenProgression ); // Порядковый номер искомого числа
1818 String stringProgression = "" ; // Строка хранящая прогрессию
You can’t perform that action at this time.
0 commit comments