Step09 fix flow

Author: krivtsov

Makefile

@@ -19,6 +19,9 @@ startBalance:
 startProgress:
 	npm run babel-node -- src/bin/brain-progression.js
 
+startPrime:
+		npm run babel-node -- src/bin/brain-prime.js
+
 publish:
 	npm publish
 

package.json

@@ -9,7 +9,8 @@
     "brain-calc": "dist/bin/brain-calc.js",
     "brain-gcd": "dist/bin/brain-gcd.js",
     "brain-balance": "dist/bin/brain-balance.js",
-    "brain-progress": "dist/bin/brain-progression.js"
+    "brain-progress": "dist/bin/brain-progression.js",
+    "brain-progress": "dist/bin/brain-prime.js"
   },
   "scripts": {
     "build": "NODE_ENV=production babel src --out-dir dist --source-maps inline",

src/bin/brain-prime.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import runPrimeGame from '../games/prime';
+
+runPrimeGame();

src/games/balance.js

@@ -24,6 +24,7 @@ const correctAnswer = (expression) => {
   return Number(balanceNumber(arrayExp).join(''));
 };
 
-export default () => {
-  gameGo(ruleGcdGame, questionGcdGame, correctAnswer);
-};
+
+const exp = () => [questionGcdGame, correctAnswer];
+
+export default () => gameGo(ruleGcdGame, exp);

src/games/calc.js

@@ -47,6 +47,6 @@ const calculation = (expression) => {
 };
 
 
-export default () => {
-  gameGo(ruleCalcGame, questionCalc, calculation);
-};
+const exp = () => [questionCalc, calculation];
+
+export default () => gameGo(ruleCalcGame, exp);

src/games/even.js

@@ -1,16 +1,18 @@
 import { randomNumber, gameGo } from '..';
 
-const ruleEvenGame = 'Answer "yes" if number even otherwise answer "no".';
+const ruleEvenGame = 'Answer "yes" if number prime otherwise answer "no".';
 
 const questionEvenGame = () => randomNumber(1, 999);
 
-const correctAnswer = (num) => {
-  if (num % 2 === 0) {
+const isNum = (number) => {
+  if (number % 2 === 0) {
     return 'yes';
   }
   return 'no';
 };
 
-export default () => {
-  gameGo(ruleEvenGame, questionEvenGame, correctAnswer);
-};
+const correctAnswer = num => isNum(num);
+
+const exp = () => [questionEvenGame, correctAnswer];
+
+export default () => gameGo(ruleEvenGame, exp);

src/games/gcd.js

@@ -23,6 +23,6 @@ const correctAnswer = (expression) => {
   return gcd(number1, number2);
 };
 
-export default () => {
-  gameGo(ruleGcdGame, questionGcdGame, correctAnswer);
-};
+const exp = () => [questionGcdGame, correctAnswer];
+
+export default () => gameGo(ruleGcdGame, exp);

src/games/prime.js

@@ -0,0 +1,30 @@
+
+import { randomNumber, gameGo } from '..';
+
+const rulePrimeGame = 'Answer "yes" if number prime otherwise answer "no".';
+
+const findDivisor = (number, test) => {
+  if (test ** 2 > number) {
+    return number;
+  } if (number % test === 0) {
+    return test;
+  }
+  return findDivisor(number, test + 1);
+};
+
+const isPrime = (num) => {
+  if (num === findDivisor(num, 2)) {
+    return 'yes';
+  }
+  return 'no';
+};
+
+
+const questionPrimeGame = () => randomNumber(1, 999);
+
+const correctAnswer = num => isPrime(num);
+
+
+const exp = () => [questionPrimeGame, correctAnswer];
+
+export default () => gameGo(rulePrimeGame, exp);

src/games/progress.js

@@ -7,23 +7,24 @@ const numberStart = randomNumber(1, 50);
 const step = randomNumber(1, 9);
 const endRange = numberStart + (step * 10);
 const guessIndex = randomNumber(0, 9);
+const progressionConst = range(numberStart, endRange, step);
+
+// const progressGame = (arr, num) => {
+  // const guessNumber = () => arr[num];
+  // const progression = [arr.slice(0, num), '..', arr.slice(num + 1)].join(' ');
+  // const questionProgressGame = () => progression;
+  // return [questionProgressGame, guessNumber];
 
 const progressGame = () => {
-  const progressionConst = range(numberStart, endRange, step);
-  const guessNumber = progressionConst[guessIndex];
-  const progression = progressionConst;
-  progression[guessIndex] = '..';
-  const questionProgressGame = progression.join(' ');
+  const guessNumber = () => progressionConst[guessIndex];
+  const progression = [progressionConst.slice(0, guessIndex), '..', progressionConst.slice(guessIndex + 1)].join(' ');
+  const questionProgressGame = () => progression;
   return [questionProgressGame, guessNumber];
 };
 
-const [a, b] = progressGame();
-
-const questionProgressGame = () => a;
-
-const correctAnswer = () => b;
+// const exp = () => {
+//   progressGame(progressionConst, guessIndex);
+// };
+// не до делал чтобы вызвать функция со значениями.
 
-
-export default () => {
-  gameGo(ruleProgressGame, questionProgressGame, correctAnswer);
-};
+export default () => gameGo(ruleProgressGame, progressGame);

src/games/test.js

@@ -1,11 +1,13 @@
 import { randomNumber, gameGo } from '..';
 
 const ruleTestGame = 'It\'s a simple game, !!!!! enter the number';
-
 const questionTest = () => randomNumber(1, 999);
 
 const correctAnswer = num => Number(num);
 
+const exp = () => [questionTest, correctAnswer];
+
+
 export default () => {
-  gameGo(ruleTestGame, questionTest, correctAnswer);
+  gameGo(ruleTestGame, exp);
 };