changes App.java, Calc.java, Engine.java, Even.java, Gcd.java, Prime.java, Progression.java

Author: xcenia9

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

@@ -28,19 +28,19 @@ public static void playerChoice(String choice) {
                 Cli.greeting();
                 break;
             case "2":
-                Even.gameEven();
+                Even.playEven();
                 break;
             case "3":
-                Calc.gameCalc();
+                Calc.playCalc();
                 break;
             case "4":
-                Gcd.gameGcd();
+                Gcd.playGcd();
                 break;
             case "5":
-                Progression.gameProgression();
+                Progression.playProgression();
                 break;
             case "6":
-                Prime.gamePrime();
+                Prime.playPrime();
                 break;
             case "0":
                 break;

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

@@ -1,14 +1,11 @@
 package hexlet.code;
 
 import java.util.Scanner;
+import java.util.function.Supplier;
 
 public class Engine {
     private static final int COUNT_OF_ROUNDS = 3;
 
-    public static int getCountOfRounds() {
-        return COUNT_OF_ROUNDS;
-    }
-
     public static void gameEngine(String exercise, String[][] questionAndAnswer) {
         Scanner sc = new Scanner(System.in);
         System.out.println("Welcome to the Brain Games!");
@@ -36,4 +33,11 @@ public static void gameEngine(String exercise, String[][] questionAndAnswer) {
             System.out.println("Congratulations, " + name + "!");
         }
     }
+    public static void runGame(String exercise, Supplier<String[]> questionAndAnswerSupplier) {
+        String[][] questionAndAnswer = new String[COUNT_OF_ROUNDS][2];
+        for (int i = 0; i < COUNT_OF_ROUNDS; i++) {
+            questionAndAnswer[i] = questionAndAnswerSupplier.get();
+        }
+        gameEngine(exercise, questionAndAnswer);
+    }
 }

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

@@ -26,12 +26,8 @@ public static int calculate(int a, int b, char operator) {
         };
     }
 
-    public static void gameCalc() {
+    public static void playCalc() {
         String exercise = "What is the result of the expression?";
-        String[][] questionAndAnswer = new String[Engine.getCountOfRounds()][2];
-        for (int i = 0; i < Engine.getCountOfRounds(); i++) {
-            questionAndAnswer[i] = getQuestionAndAnswer();
-        }
-        Engine.gameEngine(exercise, questionAndAnswer);
+        Engine.runGame(exercise, Calc::getQuestionAndAnswer);
     }
 }

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

@@ -16,13 +16,9 @@ private static String[] getQuestionAndAnswer() {
         return new String[]{question, correctAnswer};
     }
 
-    public static void gameEven() {
+    public static void playEven() {
         String exercise = "Answer 'yes' if the number is even, otherwise answer 'no'.";
-        String[][] questionAndAnswer = new String[Engine.getCountOfRounds()][2];
-        for (int i = 0; i < Engine.getCountOfRounds(); i++) {
-            questionAndAnswer[i] = getQuestionAndAnswer();
-        }
-        Engine.gameEngine(exercise, questionAndAnswer);
+        Engine.runGame(exercise, Even::getQuestionAndAnswer);
     }
 }
 

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

@@ -17,12 +17,8 @@ private static String[] getQuestionAndAnswer() {
         return new String[]{question, correctAnswer};
     }
 
-    public static void gameGcd() {
+    public static void playGcd() {
         String exercise = "Find the greatest common divisor of given numbers.";
-        String[][] questionAndAnswer = new String[Engine.getCountOfRounds()][2];
-        for (int i = 0; i < Engine.getCountOfRounds(); i++) {
-            questionAndAnswer[i] = getQuestionAndAnswer();
-        }
-        Engine.gameEngine(exercise, questionAndAnswer);
+        Engine.runGame(exercise, Gcd::getQuestionAndAnswer);
     }
 }

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

@@ -36,12 +36,9 @@ private static boolean isPrime(int number) {
         return true;
     }
 
-    public static void gamePrime() {
+    public static void playPrime() {
         String exercise = "Answer 'yes' if given number is prime. Otherwise answer 'no'.";
-        String[][] questionAndAnswer = new String[Engine.getCountOfRounds()][2];
-        for (int i = 0; i < Engine.getCountOfRounds(); i++) {
-            questionAndAnswer[i] = getQuestionAndAnswer();
-        }
-        Engine.gameEngine(exercise, questionAndAnswer);
+        Engine.runGame(exercise, Prime::getQuestionAndAnswer);
     }
+
 }

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

@@ -7,14 +7,22 @@ public class Progression {
     private static final int MIN_LENGTH = 5;
     private static final int MAX_LENGTH = 10;
 
+    private static int[] generateProgression(int length, int start, int step) {
+        int[] numbers = new int[length];
+        numbers[0] = start;
+        for (int i = 1; i < length; i++) {
+            numbers[i] = numbers[i - 1] + step;
+        }
+        return numbers;
+    }
+
     private static String[] getQuestionAndAnswer() {
         int randomLength = Utils.getRandomNumber(MIN_LENGTH, MAX_LENGTH);
-        int[] numbers = new int[randomLength];
-        int diff = Utils.getRandomNumber();
-        numbers[0] = Utils.getRandomNumber();
-        for (int i = 1; i < randomLength; i++) {
-            numbers[i] = numbers[i - 1] + diff;
-        }
+        int step = Utils.getRandomNumber();
+        int startNumber = Utils.getRandomNumber();
+
+        int[] numbers = generateProgression(randomLength, startNumber, step);
+
         int randomIndex = Utils.getRandomNumber(0, randomLength - 1);
         String correctAnswer = String.valueOf(numbers[randomIndex]);
         numbers[randomIndex] = -1;
@@ -25,12 +33,8 @@ private static String[] getQuestionAndAnswer() {
         return new String[] {question.trim(), correctAnswer};
     }
 
-    public static void gameProgression() {
+    public static void playProgression() {
         String exercise = "What number is missing in the progression?";
-        String[][] questionAndAnswer = new String[Engine.getCountOfRounds()][2];
-        for (int i = 0; i < Engine.getCountOfRounds(); i++) {
-            questionAndAnswer[i] = getQuestionAndAnswer();
-        }
-        Engine.gameEngine(exercise, questionAndAnswer);
+        Engine.runGame(exercise, Progression::getQuestionAndAnswer);
     }
 }