Simplificationing Calculator, Even, Gcd; editioning App, Engine, README; adding Progression;

Author: Antojkv

README.md

@@ -11,3 +11,5 @@
 "Calculator" https://asciinema.org/a/QIkWy2KinHzcdj0LULvdMOfM0
 
 "GCD" https://asciinema.org/a/anWD6GPnBTcWTBLCfvbMGZeV6
+
+"Progression" https://asciinema.org/a/4cwJUcnV4TcEFSpdqMrIa3xjf

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

@@ -3,6 +3,7 @@
 import hexlet.code.games.Calculator;
 import hexlet.code.games.Even;
 import hexlet.code.games.Gcd;
+import hexlet.code.games.Progression;
 import java.util.Scanner;
 
 class App {
@@ -12,6 +13,7 @@ public static void main(String[] args) {
         System.out.println("2 - Even");
         System.out.println("3 - Calculator");
         System.out.println("4 - GCD");
+        System.out.println("5 - Progression");
         System.out.println("0 - Exit");
 
         Scanner scanner = new Scanner(System.in);
@@ -31,6 +33,9 @@ public static void main(String[] args) {
             case "4":
                 Gcd.startGame();
                 break;
+            case "5":
+                Progression.startGame();
+                break;
             case "0":
                 System.out.println("Goodbye!");
                 break;

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

@@ -3,8 +3,7 @@
 import java.util.Scanner;
 
 public class Engine {
-    private static final int ROUNDS = 3;
-    private static final Scanner SCANNER = new Scanner(System.in);
+    public static final int ROUNDS = 3;
 
     public static int getRoundsCount() {
         return ROUNDS;
@@ -14,14 +13,15 @@ public static void run(String description, String[][] data) {
         System.out.println("Welcome to the Brain Games!");
         String userName = Cli.greetUser();
         System.out.println(description);
+        Scanner scanner = new Scanner(System.in);
 
         for (int i = 0; i < ROUNDS; i++) {
             String question = data[i][0];
             String correctAnswer = data[i][1];
 
             System.out.println("Question: " + question);
             System.out.print("Your answer: ");
-            String answer = SCANNER.next();
+            String answer = scanner.next();
 
             if (answer.equalsIgnoreCase(correctAnswer)) {
                 System.out.println("Correct!");

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

@@ -4,8 +4,6 @@
 import java.security.SecureRandom;
 
 public class Calculator {
-    private static final String DESCRIPTION = "What is the result of the expression?";
-    private static final char[] OPERATORS = {'+', '-', '*'};
 
     public static int calculate(int operand1, int operand2, char operator) {
         switch (operator) {
@@ -21,13 +19,16 @@ public static int calculate(int operand1, int operand2, char operator) {
     }
 
     public static void startGame() {
+        String description = "What is the result of the expression?";
+        char[] operators = {'+', '-', '*'};
         String[][] data = new String[Engine.getRoundsCount()][2];
         SecureRandom random = new SecureRandom();
 
+
         for (int i = 0; i < Engine.getRoundsCount(); i++) {
             int number1 = random.nextInt(100) + 1;
             int number2 = random.nextInt(100) + 1;
-            char operator = OPERATORS[random.nextInt(OPERATORS.length)];
+            char operator = operators[random.nextInt(operators.length)];
 
             String question = number1 + " " + operator + " " + number2;
             String correctAnswer = String.valueOf(calculate(number1, number2, operator));
@@ -36,8 +37,6 @@ public static void startGame() {
             data[i][1] = correctAnswer;
         }
 
-        Engine.run(DESCRIPTION, data);
+        Engine.run(description, data);
     }
 }
-
-

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

@@ -4,27 +4,20 @@
 import java.security.SecureRandom;
 
 public class Even {
-    private static final String DESCRIPTION = "Answer 'yes' if the number is even, otherwise answer 'no'.";
-
-
-    private static boolean isEven(int number) {
-        return number % 2 == 0;
-    }
     public static void startGame() {
+        String description = "Answer 'yes' if the number is even, otherwise answer 'no'.";
         String[][] data = new String[Engine.getRoundsCount()][2];
         SecureRandom random = new SecureRandom();
 
+
         for (int i = 0; i < Engine.getRoundsCount(); i++) {
             int number = random.nextInt(100) + 1;
             String question = String.valueOf(number);
-            String correctAnswer = isEven(number) ? "yes" : "no";
+            String correctAnswer = number % 2 == 0 ? "yes" : "no";
 
             data[i][0] = question;
             data[i][1] = correctAnswer;
         }
-
-        Engine.run(DESCRIPTION, data);
+        Engine.run(description, data);
     }
-
-
 }

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

@@ -4,7 +4,7 @@
 import java.security.SecureRandom;
 
 public class Gcd {
-    private static final String DESCRIPTION = "Find the greatest common divisor of given numbers.";
+
 
     private static int isGCD(int a, int b) {
         while (b != 0) {
@@ -16,6 +16,7 @@ private static int isGCD(int a, int b) {
     }
 
     public static void startGame() {
+        String description = "Find the greatest common divisor of given numbers.";
         String[][] data = new String[Engine.getRoundsCount()][2];
         SecureRandom random = new SecureRandom();
 
@@ -28,7 +29,6 @@ public static void startGame() {
             data[i][0] = question;
             data[i][1] = correctAnswer;
         }
-        Engine.run(DESCRIPTION, data);
+        Engine.run(description, data);
     }
-
 }

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

@@ -0,0 +1,39 @@
+package hexlet.code.games;
+
+import hexlet.code.Engine;
+import java.security.SecureRandom;
+
+public class Progression {
+    public static String[] generateProgression(int start, int step, int length) {
+        String[] progression = new String[length];
+        for (int index = 0; index < length; index++) {
+            progression[index] = String.valueOf(start + index * step);
+        }
+        return progression;
+    }
+
+    public static void startGame() {
+        String description = "What number is missing in the progression?";
+        String[][] data = new String[Engine.getRoundsCount()][2];
+        SecureRandom random = new SecureRandom();
+
+
+        for (int i = 0; i < Engine.getRoundsCount(); i++) {
+            int start = random.nextInt(50) + 1;
+            int step = random.nextInt(10) + 1;
+            int hiddenIndex = random.nextInt(10);
+
+            String[] progression = generateProgression(start, step, 10);
+            String correctAnswer = progression[hiddenIndex];
+            progression[hiddenIndex] = "..";
+
+            String question = String.join(" ", progression);
+
+
+            data[i][0] = question;
+            data[i][1] = correctAnswer;
+        }
+        Engine.run(description, data);
+    }
+}
+