изменения на основании 3 ревью

Author: alexeichuprikov

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

@@ -3,9 +3,7 @@
 import java.util.Scanner;
 
 public class Engine {
-
     public static final int ROUNDS = 3;
-    //границы случайных чисел не были обозначены сделал от 1 до 100. требуется уточнение у аналитика
 
     public static void startGame(String optionDescription, String[][] questionsAndCorrectAnswers) {
         String userName = Cli.greet();

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

@@ -0,0 +1,15 @@
+package hexlet.code;
+
+public class Utils {
+    //границы случайных чисел не были обозначены сделал от 1 до 100. требуется уточнение у аналитика
+    public static final int MIN_NUMBER = 1;
+    public static final int MAX_NUMBER = 100;
+
+    public static int generateNumber(int min, int max) {
+        return (int) Math.floor(Math.random() * (max - min + 1)) + min;
+    }
+
+    public static int generateNumber() {
+        return generateNumber(MIN_NUMBER, MAX_NUMBER);
+    }
+}

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

@@ -1,19 +1,18 @@
 package hexlet.code.games;
 
 import hexlet.code.Engine;
+import hexlet.code.Utils;
 
 public class Calc {
-    public static final int MAX_NUMBER = 100;
-
     public static void play() {
         String optionDescription = "What is the result of the expression?";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int firstValue = (int) (Math.random() * MAX_NUMBER) + 1;
-            int secondValue = (int) (Math.random() * MAX_NUMBER) + 1;
+            int firstValue = Utils.generateNumber();
+            int secondValue = Utils.generateNumber();
             char[] signs = {'+', '-', '*'};
-            char randomSign = signs[(int) (Math.random() * signs.length)];
+            char randomSign = signs[Utils.generateNumber(0, signs.length - 1)];
 
             String question = firstValue + " " + randomSign + " " + secondValue;
             String correctAnswer = calculateForCorrectAnswer(firstValue, secondValue, randomSign);

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

@@ -1,16 +1,15 @@
 package hexlet.code.games;
 
 import hexlet.code.Engine;
+import hexlet.code.Utils;
 
 public class Even {
-    public static final int MAX_NUMBER = 100;
-
     public static void play() {
         String optionDescription = "Answer 'yes' if the number is even, otherwise answer 'no'.";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int random = (int) (Math.random() * MAX_NUMBER) + 1;
+            int random = Utils.generateNumber();
             String question = String.valueOf(random);
             boolean isEven = random % 2 == 0;
             String correctAnswer = isEven ? "yes" : "no";

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

@@ -1,28 +1,27 @@
 package hexlet.code.games;
 
 import hexlet.code.Engine;
+import hexlet.code.Utils;
 
 public class Gcd {
-    public static final int MAX_NUMBER = 100;
-
     public static void play() {
         String optionDescription = "Find the greatest common divisor of given numbers.";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int firstValue = (int) (Math.random() * MAX_NUMBER) + 1;
-            int secondValue = (int) (Math.random() * MAX_NUMBER) + 1;
+            int firstValue = Utils.generateNumber();
+            int secondValue = Utils.generateNumber();
 
             String question = firstValue + " " + secondValue;
-            String correctAnswer = String.valueOf(calculateForCorrectAnswer(firstValue, secondValue));
+            String correctAnswer = String.valueOf(gcd(firstValue, secondValue));
 
             questionsAndCorrectAnswers[i][0] = question;
             questionsAndCorrectAnswers[i][1] = correctAnswer;
         }
         Engine.startGame(optionDescription, questionsAndCorrectAnswers);
     }
 
-    public static int calculateForCorrectAnswer(int firstValue, int secondValue) {
+    public static int gcd(int firstValue, int secondValue) {
         while (secondValue != 0) {
             int tempAnswer = secondValue;
             secondValue = firstValue % secondValue;

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

@@ -1,19 +1,23 @@
 package hexlet.code.games;
 
 import hexlet.code.Engine;
+import hexlet.code.Utils;
 
 public class Prime {
-    public static final int MAX_NUMBER = 100;
-
     public static void play() {
         String optionDescription = "Answer 'yes' if given number is prime. Otherwise answer 'no'.";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int random = (int) (Math.random() * MAX_NUMBER) + 1;
+            int random = Utils.generateNumber();
 
             String question = String.valueOf(random);
-            String correctAnswer = logicPrime(random);
+            String correctAnswer;
+            if (isPrime(random)) {
+                correctAnswer = "yes";
+            } else {
+                correctAnswer = "no";
+            }
 
             questionsAndCorrectAnswers[i][0] = question;
             questionsAndCorrectAnswers[i][1] = correctAnswer;
@@ -22,15 +26,15 @@ public static void play() {
         Engine.startGame(optionDescription, questionsAndCorrectAnswers);
     }
 
-    public static String logicPrime(int random) {
+    public static boolean isPrime(int random) {
         if (random < 2) {
-            return "no";
+            return false;
         }
         for (int i = 2; i <= Math.sqrt(random); i++) {
             if (random % i == 0) {
-                return "no";
+                return false;
             }
         }
-        return "yes";
+        return true;
     }
 }

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

@@ -1,9 +1,9 @@
 package hexlet.code.games;
 
 import hexlet.code.Engine;
+import hexlet.code.Utils;
 
 public class Progression {
-    public static final int MAX_NUMBER = 100;
     private static final int STEP_COUNT = 10;
     private static final int VALUE_COUNT = 10;
 
@@ -12,9 +12,9 @@ public static void play() {
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int start = (int) (Math.random() * MAX_NUMBER) + 1;
-            int step = (int) (Math.random() * STEP_COUNT) + 1;
-            int hideIndex = (int) (Math.random() * VALUE_COUNT);
+            int start = Utils.generateNumber();
+            int step = Utils.generateNumber(Utils.MIN_NUMBER, STEP_COUNT);
+            int hideIndex = Utils.generateNumber(Utils.MIN_NUMBER, VALUE_COUNT);
 
             String[] sequence = addSequence(start, step, VALUE_COUNT);
             String correctAnswer = sequence[hideIndex];