fixed char[] in Calc, fixed int in Calc and Gcd

Author: DashProsh

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

@@ -10,7 +10,7 @@ public class Calc {
     private static final int MAX_RANDOM_NUMBER1 = 19;
     private static final int MAX_RANDOM_NUMBER2 = 9;
 
-    public static String calculateResult(int randomNumber1, int randomNumber2, String randomOperator) {
+    public static int calculateResult(int randomNumber1, int randomNumber2, String randomOperator) {
 
         int resultOfExpression;
 
@@ -29,29 +29,29 @@ public static String calculateResult(int randomNumber1, int randomNumber2, Strin
             }
             default -> throw new IllegalStateException("Unexpected value: " + randomOperator);
         }
-        return String.valueOf(resultOfExpression);
+        return resultOfExpression;
     }
 
 
     public static String[] dataForGame(int randomNumber1, int randomNumber2, String randomOperator) {
 
         String question = randomNumber1 + " " + randomOperator + " " + randomNumber2;
-        String correctAnswer = calculateResult(randomNumber1, randomNumber2, randomOperator);
+        String correctAnswer = String.valueOf(calculateResult(randomNumber1, randomNumber2, randomOperator));
         return new String[]{question, correctAnswer};
     }
 
 
     public static String[][] prepareData() {
 
         String[][] eachRound = new String[Engine.ROUNDS][2];
-        String[] operators = {"+", "-", "*"};
+        char[] operators = "+-*".toCharArray();
         Random rand = new Random();
 
         for (var i = 0; i < Engine.ROUNDS; i++) {
 
             int randomNumber1 = Utils.getRandomInt(MAX_RANDOM_NUMBER1);
             int randomNumber2 = Utils.getRandomInt(MAX_RANDOM_NUMBER2);
-            String randomOperator = operators[rand.nextInt(operators.length)];
+            String randomOperator = String.valueOf(operators[rand.nextInt(operators.length)]);
 
             eachRound[i] = dataForGame(randomNumber1, randomNumber2, randomOperator);
         }

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

@@ -10,19 +10,19 @@ public class Gcd {
     private static final int MAX_RANDOM_COMMON = 10;
     private static final int MAX_RANDOM_NUMBER = 10;
 
-    public static String findGCD(int randomNumber1, int randomNumber2) {
+    public static BigInteger findGCD(int randomNumber1, int randomNumber2) {
         BigInteger bigA = BigInteger.valueOf(randomNumber1);
         BigInteger bigB = BigInteger.valueOf(randomNumber2);
 
-        String gcd = String.valueOf((bigA).gcd(bigB));
+        BigInteger gcd = ((bigA).gcd(bigB));
         return gcd;
     }
 
 
     public static String[] dataForGame(int randomNumber1, int randomNumber2) {
 
         String question = randomNumber1 + " " + randomNumber2;
-        String correctAnswer = findGCD(randomNumber1, randomNumber2);
+        String correctAnswer = String.valueOf(findGCD(randomNumber1, randomNumber2));
 
         return new String[]{question, correctAnswer};
     }

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

@@ -64,60 +64,3 @@ public static void transferDataToEngine() {
         Engine.skeletonOfGames(mainGameQuestion, rounds);
     }
 }
-
-
-
-//public class Progression {
-//
-//    private static final int MIN_ARRAY_LENGTH = 5;
-//    private static final int MAX_STEP = 9;
-//    private static final int MAX_START_VALUE = 14;
-//
-//    public static String createProgression() {
-//
-//
-//    }
-//
-//    public static String[] dataForGame() {
-//
-//        int arrayLength = Utils.getRandomInt(MIN_ARRAY_LENGTH) + MIN_ARRAY_LENGTH;
-//        int[] array = new int[arrayLength];
-//
-//        int step = Utils.getRandomInt(MAX_STEP);
-//        int start = Utils.getRandomInt(MAX_START_VALUE);
-//
-//        for (int j = 0; j < arrayLength; j++) {
-//            array[j] = start + j * step;
-//        }
-//
-//        int indexFromArray = Utils.getRandomInt(MIN_ARRAY_LENGTH - 1);
-//
-//        String arrayToString = Arrays.toString(array);
-//        String elementToHide = String.valueOf(array[indexFromArray]);
-//        String oneElement = "\\b" + elementToHide + "\\b";
-//        String arrayHideNumber = arrayToString.replaceFirst(oneElement, "..");
-//        arrayHideNumber = arrayHideNumber.replace("[", "").replace("]", "")
-//                .replace(",", "");
-//
-//        String question = arrayHideNumber;
-//        String correctAnswer = String.valueOf(array[indexFromArray]);
-//
-//        return new String[]{question, correctAnswer};
-//    }
-//
-//    public static String[][] prepareDataForEngine() {
-//
-//        String[][] eachRound = new String[Engine.ROUNDS][2];
-//
-//        for (var i = 0; i < Engine.ROUNDS; i++) {
-//            eachRound[i] = dataForGame();
-//        }
-//        return eachRound;
-//    }
-//
-//    public static void transferDataToEngine() {
-//        String mainGameQuestion = "What number is missing in the progression?";
-//        String[][] rounds = prepareDataForEngine();
-//        Engine.skeletonOfGames(mainGameQuestion, rounds);
-//    }
-//}