check 4

s-gala · s-gala · commit 100e69ee1a5a · 2025-02-03T00:17:33.000+03:00
diff --git a/README.md b/README.md
@@ -1,3 +1,24 @@
+### Hexlet tests and linter status:
+[![Actions Status](https://github.com/s-gala/python-project-49/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/s-gala/python-project-49/actions)
+
+### CodeClimate 
+[![Maintainability](https://api.codeclimate.com/v1/badges/487e17fe16141caa4b2a/maintainability)](https://codeclimate.com/github/s-gala/python-project-49/maintainability)
+
+### Asciinema even
+[![asciicast]( https://asciinema.org/a/wRnu8Sf53kCCvUfgqQixs0EPh.svg )( https://asciinema.org/a/wRnu8Sf53kCCvUfgqQixs0EPh )
+
+### Asciinema calc
+[![asciicast]( https://asciinema.org/a/S9Bly86EkmrpnTJhsAJU8pQDl.svg )( https://asciinema.org/a/S9Bly86EkmrpnTJhsAJU8pQDl )
+
+### Asciinema gcd
+[![asciicast]( https://asciinema.org/a/L5FDJeBgVySllsh5oELOwTtKa.svg )( https://asciinema.org/a/L5FDJeBgVySllsh5oELOwTtKa )
+
+### Asciinema progression
+[![asciicast]( https://asciinema.org/a/geOtpvl2IneSE65iIyp3BSoGY.svg )( https://asciinema.org/a/geOtpvl2IneSE65iIyp3BSoGY ))
+
+### Asciinema prime 
+[![asciicast]( https://asciinema.org/a/j2PgQoMiKCmVM1duYVp8pnN3i.svg )( https://asciinema.org/a/j2PgQoMiKCmVM1duYVp8pnN3i )
+
 ### Brain-games
 The game "Brain-games" includes 5 games. 
 To win each game, you need to give 3 correct answers.
@@ -25,12 +46,6 @@ You need to answer "yes" if given number is prime. Otherwise answer "no".
 * brain-progression
 * brain-prime
 
-### Hexlet tests and linter status:
-[![Actions Status](https://github.com/s-gala/python-project-49/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/s-gala/python-project-49/actions)
-
-### CodeClimate 
-[![Maintainability](https://api.codeclimate.com/v1/badges/487e17fe16141caa4b2a/maintainability)](https://codeclimate.com/github/s-gala/python-project-49/maintainability)
-
 ### This project use:
 * Python >= 3.10
 * prompt >= 0.4.1
@@ -46,18 +61,3 @@ You need to answer "yes" if given number is prime. Otherwise answer "no".
 * cd pyton-project-49
 * cd ../
 * rm -rf python-project-49
-
-### Asciinema even
-[![asciicast]( https://asciinema.org/a/wRnu8Sf53kCCvUfgqQixs0EPh )
-
-### Asciinema calc
-[![asciicast]( https://asciinema.org/a/S9Bly86EkmrpnTJhsAJU8pQDl )
-
-### Asciinema gcd
-[![asciicast]( https://asciinema.org/a/L5FDJeBgVySllsh5oELOwTtKa )
-
-### Asciinema progression
-[![asciicast]( https://asciinema.org/a/geOtpvl2IneSE65iIyp3BSoGY )
-
-### Asciinema prime
-[![asciicast](  https://asciinema.org/a/j2PgQoMiKCmVM1duYVp8pnN3i )
diff --git a/brain_games/consts.py b/brain_games/consts.py
diff --git a/brain_games/engine.py b/brain_games/engine.py
@@ -1,13 +1,14 @@
 import prompt
 
+NUMBER_OF_ROUNDS = 3
 
-def game_engine(game):
+
+def game_engine(INSTRUCTION, game):
     
     name = prompt.string('Welcome to the Brain Games!\nMay I have your name? ')
-    print(f'Hello, {name}!')
-    print(game.INSTRUCTION)
-    for _ in range(3):
-        random_question, right_answer = game.get_question_answer()
+    print(f'Hello, {name}!\n{INSTRUCTION}')
+    for _ in range(NUMBER_OF_ROUNDS):
+        random_question, right_answer = game()
         print(f"Question: {random_question}")
         answer = prompt.string('Your answer: ')
         if right_answer == answer:
@@ -17,4 +18,4 @@ def game_engine(game):
             print(f"Correct answer was '{right_answer}'.")
             print(f"Let's try again, {name}!")
             return
-    return print(f"Congratulations, {name}!")
+    print(f"Congratulations, {name}!")
diff --git a/brain_games/games/calc.py b/brain_games/games/calc.py
@@ -1,12 +1,23 @@
-from brain_games import utils
-from brain_games.games import consts
+import random
+
+from brain_games import consts
+from brain_games.engine import game_engine
+from brain_games.utils import get_random_number
 
 INSTRUCTION = consts.INSTRUCTION_CALC
 
 
 def get_question_answer():
-    x, y = utils.get_random_number(1, 100), utils.get_random_number(1, 100)
-    sign, operator_metod = utils.get_random_operator()
-    random_question = f'{x}{sign}{y}'
-    right_answer = str(operator_metod(x, y)) 
+    first_num, second_num = get_random_number(1, 100), get_random_number(1, 100)
+    math_operation = [('+', first_num + second_num), 
+                   ('-', first_num - second_num),
+                   ('*', first_num * second_num),
+    ]
+    random_math_operation = random.choice(math_operation)
+    random_question = f'{first_num}{random_math_operation[0]}{second_num}'
+    right_answer = str(random_math_operation[1]) 
     return random_question, right_answer
+
+
+def start_calc():
+    return game_engine(INSTRUCTION, get_question_answer)
diff --git a/brain_games/games/even.py b/brain_games/games/even.py
@@ -1,10 +1,19 @@
-from brain_games.games import consts
+from brain_games import consts
+from brain_games.engine import game_engine
+from brain_games.utils import get_random_number
 
 INSTRUCTION = consts.INSTRUCTION_EVEN
 
 
 def get_question_answer():
-    from brain_games import utils
-    random_question = utils.get_random_number(1, 100)
-    right_answer = 'yes' if random_question % 2 == 0 else 'no'
+    random_question = get_random_number(1, 100)
+    right_answer = 'yes' if is_even(random_question) else 'no'
     return random_question, right_answer
+
+
+def is_even(num):
+    return num % 2 == 0
+
+
+def start_even():
+    return game_engine(INSTRUCTION, get_question_answer)
diff --git a/brain_games/games/gcd.py b/brain_games/games/gcd.py
@@ -1,14 +1,18 @@
 import math
 
-from brain_games.games import consts
+from brain_games import consts
+from brain_games.engine import game_engine
+from brain_games.utils import get_random_number
 
 INSTRUCTION = consts.INSTRUCTION_GCD
 
 
 def get_question_answer():
-    from brain_games import utils
-    x = utils.get_random_number(1, 100)
-    y = utils.get_random_number(1, 100)
-    random_question = f'{x} {y}'
-    right_answer = str(math.gcd(x, y))
+    first_num, second_num = get_random_number(1, 100), get_random_number(1, 100)
+    random_question = f'{first_num} {second_num}'
+    right_answer = str(math.gcd(first_num, second_num))
     return random_question, right_answer
+
+
+def start_gcd():
+    return game_engine(INSTRUCTION, get_question_answer)
diff --git a/brain_games/games/prime.py b/brain_games/games/prime.py
@@ -1,14 +1,23 @@
-from brain_games.games import consts
+from brain_games import consts
+from brain_games.engine import game_engine
+from brain_games.utils import get_random_number
 
 INSTRUCTION = consts.INSTRUCTION_PRIME
 
 
 def get_question_answer():
-    from brain_games import utils
-    random_question = utils.get_random_number(1, 100)
-    k = 0
-    for i in range(2, random_question // 2 + 1):
-        if (random_question % i == 0):
-            k = k + 1
-    right_answer = 'yes' if (k <= 0) else 'no'
+    random_question = get_random_number(1, 100)
+    right_answer = 'yes' if is_prime(random_question) else 'no'
     return random_question, right_answer
+
+    
+def is_prime(num):
+    acc = 0
+    for i in range(2, int(num ** (0.5))):
+        if (num % i == 0):
+            acc = acc + 1
+    return acc == 0
+
+
+def start_prime():
+    return game_engine(INSTRUCTION, get_question_answer)
diff --git a/brain_games/games/progression.py b/brain_games/games/progression.py
@@ -1,18 +1,21 @@
-from brain_games import utils
-from brain_games.games import consts
+from brain_games import consts
+from brain_games.engine import game_engine
+from brain_games.utils import get_random_number
 
 INSTRUCTION = consts.INSTRUCTION_PROGRESSION
 
 
 def get_question_answer():
-    x = utils.get_random_number(5, 11)
-    begin = utils.get_random_number(1, 40)
-    step = utils.get_random_number(1, int((100 - begin) / x - 1))
-    progression = (list(range(begin, 100, step)[:x]))
-    i = utils.get_random_number(0, len(progression) - 1)
-    right_answer = str(progression[i])
-    progression[i] = '..'
-    random_question = ''
-    for item in progression:
-        random_question = random_question + ' ' + str(item)
+    length_progression = get_random_number(5, 11)
+    begin = get_random_number(1, 40)
+    step = get_random_number(1, int((100 - begin) / length_progression - 1))
+    progression = (list(range(begin, 100, step)[:length_progression]))
+    index_hidden_num = get_random_number(0, len(progression) - 1)
+    right_answer = str(progression[index_hidden_num])
+    progression[index_hidden_num] = '..'
+    random_question = ' '.join(str(num) for num in progression)
     return random_question, right_answer
+
+
+def start_progression():
+    return game_engine(INSTRUCTION, get_question_answer)
diff --git a/brain_games/scripts/__pycache__/brain_calc.cpython-312.pyc b/brain_games/scripts/__pycache__/brain_calc.cpython-312.pyc
diff --git a/brain_games/scripts/__pycache__/brain_gcd.cpython-312.pyc b/brain_games/scripts/__pycache__/brain_gcd.cpython-312.pyc
diff --git a/brain_games/scripts/__pycache__/brain_prime.cpython-312.pyc b/brain_games/scripts/__pycache__/brain_prime.cpython-312.pyc
diff --git a/brain_games/scripts/__pycache__/brain_progression.cpython-312.pyc b/brain_games/scripts/__pycache__/brain_progression.cpython-312.pyc
diff --git a/brain_games/scripts/brain_calc.py b/brain_games/scripts/brain_calc.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 
+from brain_games.games.calc import start_calc
+
+
 def main():
-    from brain_games.engine import game_engine
-    from brain_games.games import calc
-    game_engine(calc) 
+    start_calc()
+    
       
-             
 if __name__ == '__main__':
     main() 
diff --git a/brain_games/scripts/brain_even.py b/brain_games/scripts/brain_even.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 
+from brain_games.games.even import start_even
 
-def main():
-    from brain_games.engine import game_engine
-    from brain_games.games import even
 
-    game_engine(even)
+def main():
+    start_even()
 
 
 if __name__ == '__main__':
diff --git a/brain_games/scripts/brain_games.py b/brain_games/scripts/brain_games.py
@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
+from brain_games.cli import welcome_user
+
 
 def main():
-    from .. import cli
-    cli.welcome_user() 
+    welcome_user()
+    return
 
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/brain_games/scripts/brain_gcd.py b/brain_games/scripts/brain_gcd.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-def main():
-    from brain_games.engine import game_engine
-    from brain_games.games import gcd
+from brain_games.games.gcd import start_gcd
+
 
-    game_engine(gcd)
+def main():
+    start_gcd()
 
 
 if __name__ == '__main__':
diff --git a/brain_games/scripts/brain_prime.py b/brain_games/scripts/brain_prime.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 
-def main():
-    from brain_games.engine import game_engine
-    from brain_games.games import prime
+from brain_games.games.prime import start_prime
+
 
-    game_engine(prime)
+def main():
+    
+    start_prime()
 
 
 if __name__ == '__main__':
diff --git a/brain_games/scripts/brain_progression.py b/brain_games/scripts/brain_progression.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 
-def main():
-    from brain_games.engine import game_engine
-    from brain_games.games import progression
+from brain_games.games.progression import start_progression
+
 
-    game_engine(progression)
+def main():
+    
+    start_progression()
 
 
 if __name__ == '__main__':
diff --git a/brain_games/utils.py b/brain_games/utils.py
@@ -1,17 +1,5 @@
-import operator
-import random
 from random import randint
 
 
 def get_random_number(begin, end):
     return randint(begin, end)
-
-
-def get_random_operator():
-    math_symbol = {'+': operator.add,
-                   '-': operator.sub,
-                   '*': operator.mul}
-    sign = random.choice(list(math_symbol.keys()))
-    operator_metod = math_symbol.get(sign)
-    return sign, operator_metod
-    
