modifited gen_num

Author: ttehasi

brain_games/games/brain_calc.py

@@ -1,15 +1,13 @@
-from random import randint, choice
-import brain_games.sample
+from brain_games.sample import gen_rand_num
+from brain_games.sample import samples
 
 
 CON_ANSWER = 'What is the result of the expression?'
 
 
-def type_brain_calc():
+def type_brain_calc(numbers):
     correct_answer = ''
-    first_number = randint(1, 25)
-    sec_number = randint(1, 25)
-    arithmetic_operation = choice(['+', '-', '*'])
+    first_number, sec_number, arithmetic_operation = numbers
     match arithmetic_operation:
         case '+':
             correct_answer = first_number + sec_number
@@ -22,8 +20,8 @@ def type_brain_calc():
 
 
 def main():
-    brain_games.sample.samples(CON_ANSWER, type_brain_calc(),
-                               type_brain_calc(), type_brain_calc())
+    samples(CON_ANSWER, type_brain_calc(gen_rand_num()),
+            type_brain_calc(gen_rand_num()), type_brain_calc(gen_rand_num()))
 
 
 if __name__ == '__main__':

brain_games/games/brain_even.py

@@ -1,20 +1,20 @@
-from random import randint
-import brain_games.sample
+from brain_games.sample import gen_rand_num
+from brain_games.sample import samples
 
 
 CON_ANSWER = 'Answer "yes" if the number is even, otherwise answer "no".'
 
 
-def type_brain_even():
-    first_number = randint(1, 50)
+def type_brain_even(numbers):
+    first_number, sec_number, arithmetic_operation = numbers
     corr_ans = 'yes' if first_number % 2 == 0 else 'no'
     return (corr_ans,
             f'Question: {first_number}')
 
 
 def main():
-    brain_games.sample.samples(CON_ANSWER, type_brain_even(),
-                               type_brain_even(), type_brain_even())
+    samples(CON_ANSWER, type_brain_even(gen_rand_num()),
+            type_brain_even(gen_rand_num()), type_brain_even(gen_rand_num()))
 
 
 if __name__ == '__main__':

brain_games/games/brain_gcd.py

@@ -1,13 +1,12 @@
-from random import randint
-import brain_games.sample
+from brain_games.sample import gen_rand_num
+from brain_games.sample import samples
 
 
 CON_ANSWER = 'Find the greatest common divisor of given numbers.'
 
 
-def type_brain_gcd():
-    frs_num = randint(1, 50)
-    sec_num = randint(1, 50)
+def type_brain_gcd(numbers):
+    frs_num, sec_num, arithmetic_operation = numbers
     re = []
     max_num = max(frs_num, sec_num)
     for i in range(1, max_num + 1):
@@ -18,8 +17,8 @@ def type_brain_gcd():
 
 
 def main():
-    brain_games.sample.samples(CON_ANSWER, type_brain_gcd(),
-                               type_brain_gcd(), type_brain_gcd())
+    samples(CON_ANSWER, type_brain_gcd(gen_rand_num()),
+            type_brain_gcd(gen_rand_num()), type_brain_gcd(gen_rand_num()))
 
 
 if __name__ == '__main__':

brain_games/games/brain_prime.py

@@ -1,12 +1,12 @@
-from random import randint
-import brain_games.sample
+from brain_games.sample import gen_rand_num
+from brain_games.sample import samples
 
 
 CON_ANSWER = 'Answer "yes" if given number is prime. Otherwise answer "no".'
 
 
-def type_brain_prime():
-    num = randint(1, 50)
+def type_brain_prime(numbers):
+    num, sec_number, arithmetic_operation = numbers
     re = []
     for i in range(1, num + 1):
         if num % i == 0:
@@ -17,8 +17,8 @@ def type_brain_prime():
 
 
 def main():
-    brain_games.sample.samples(CON_ANSWER, type_brain_prime(),
-                               type_brain_prime(), type_brain_prime())
+    samples(CON_ANSWER, type_brain_prime(gen_rand_num()),
+            type_brain_prime(gen_rand_num()), type_brain_prime(gen_rand_num()))
 
 
 if __name__ == '__main__':

brain_games/games/brain_progression.py

@@ -1,19 +1,20 @@
-from random import randint, choice
-import brain_games.sample
+import random
+from brain_games.sample import gen_rand_num
+from brain_games.sample import samples
 
 
 CON_ANSWER = 'What number is missing in the progression?'
 
 
-def type_brain_progress():
-    first_num = randint(1, 50)
+def type_brain_progress(numbers):
+    first_num, sec_number, arithmetic_operation = numbers
     re = []
-    range_progressing = randint(5, 10)
-    sec_num = randint(1, 5)
+    range_progressing = random.randint(5, 10)
+    sec_num = random.randint(1, 5)
     for _ in range(range_progressing):
         re.append(str(first_num))
         first_num += sec_num
-    index_replace_num = re.index(choice(re[1:]))
+    index_replace_num = re.index(random.choice(re[1:]))
     replace_num = re[index_replace_num - 1]
     re.insert(index_replace_num, '..')
     re.remove(re[index_replace_num - 1])
@@ -23,8 +24,9 @@ def type_brain_progress():
 
 
 def main():
-    brain_games.sample.samples(CON_ANSWER, type_brain_progress(),
-                               type_brain_progress(), type_brain_progress())
+    samples(CON_ANSWER, type_brain_progress(gen_rand_num()),
+            type_brain_progress(gen_rand_num()),
+            type_brain_progress(gen_rand_num()))
 
 
 if __name__ == '__main__':

brain_games/sample.py

@@ -1,7 +1,17 @@
 import prompt
+import random
+
+
 NUMBERS_OF_ATTEMPTS = 3
 
 
+def gen_rand_num():
+    frs_num = random.randint(1, 25)
+    sec_num = random.randint(1, 25)
+    arithmetic_operation = random.choice(['+', '-', '*'])
+    return frs_num, sec_num, arithmetic_operation
+
+
 def samples(condition_answer, answ_and_qest, answ_and_qest2, answ_and_qest3):
     print('Welcome to the Brain Games!')
     name = prompt.string('May I have your name? ')