commit №8: 1.реализовал игру "Арифметическая прогрессия"

Ainur2006 · Ainur2006 · commit 309536068dce · 2026-03-25T15:02:38.000+03:00
а именно в ../scripts/brain_progression.py
2.дополнил pyproject.toml записью в секцию [project.scripts]
3.дополнил задачу в Makefile brain-progression
diff --git a/Makefile b/Makefile
@@ -8,6 +8,8 @@ brain-calc:
 	uv run brain-calc
 brain-gcd:
 	uv run brain-gcd
+brain-progression:
+	uv run brain-progression
 build:
 	uv build
 buildf:
diff --git a/README.md b/README.md
@@ -9,6 +9,8 @@
 
 [Asciinema brain-gcd](https://asciinema.org/a/nsbABxKD0RudYVcZ)
 
+[Asciinema brain-progression](https://asciinema.org/a/5qQxcpS4HDx28riO)
+
 
 <!-- >Тестовый текст
 
diff --git a/brain_games/cli.py b/brain_games/cli.py
@@ -1,15 +1,16 @@
-import prompt
+# import prompt
+# from prompt_toolkit import prompt
 
 
-def welcome_user():
-    """Запрашивает имя пользователя и возвращает строку с приветствием 
+# def welcome_user():
+#     """Запрашивает имя пользователя и возвращает строку с приветствием 
 
-    Функция:
-    -не принимает значения, но записывает имя пользователя
-    в переменную 'name' с сопутствующим текстом
-    -возвращает приветствие с именем пользователя
-    """
+#     Функция:
+#     -не принимает значения, но записывает имя пользователя
+#     в переменную 'name' с сопутствующим текстом
+#     -возвращает приветствие с именем пользователя
+#     """
 
-    name = prompt.string('May I have your name? ')
-    print(f'Hello, {name}!')
+#     name = prompt.string('May I have your name? ')
+#     print(f'Hello, {name}!')
 
diff --git a/brain_games/engine/__pycache__/game_engine.cpython-313.pyc b/brain_games/engine/__pycache__/game_engine.cpython-313.pyc
diff --git a/brain_games/engine/game_engine.py b/brain_games/engine/game_engine.py
@@ -1,11 +1,11 @@
 import prompt
+# from prompt_toolkit import prompt
 
-
-def run_game(initian_line: str, generate_round):
+def run_game(initial_line: str, generate_round):
     print("Welcome to the Brain Games!")
     name = prompt.string("May I have your name? ")
     print(f"Hello, {name}!")
-    print(initian_line)
+    print(initial_line)
     score_counter = 0
     while score_counter < 3:
         question, correct_answer = generate_round()
diff --git a/brain_games/scripts/__pycache__/brain_even.cpython-313.pyc b/brain_games/scripts/__pycache__/brain_even.cpython-313.pyc
diff --git a/brain_games/scripts/__pycache__/brain_games.cpython-313.pyc b/brain_games/scripts/__pycache__/brain_games.cpython-313.pyc
diff --git a/brain_games/scripts/__pycache__/brain_gcd.cpython-313.pyc b/brain_games/scripts/__pycache__/brain_gcd.cpython-313.pyc
diff --git a/brain_games/scripts/__pycache__/brain_progression.cpython-313.pyc b/brain_games/scripts/__pycache__/brain_progression.cpython-313.pyc
diff --git a/brain_games/scripts/brain_calc.py b/brain_games/scripts/brain_calc.py
@@ -1,4 +1,5 @@
 from random import randint
+
 from brain_games.engine.game_engine import run_game
 from brain_games.scripts.brain_even import random_number
 
diff --git a/brain_games/scripts/brain_even.py b/brain_games/scripts/brain_even.py
@@ -1,4 +1,5 @@
 from random import randint
+
 from brain_games.engine.game_engine import run_game
 
 
diff --git a/brain_games/scripts/brain_games.py b/brain_games/scripts/brain_games.py
@@ -1,15 +1,15 @@
-from brain_games.cli import welcome_user
+# from brain_games.cli import welcome_user
 
 
-def greet():
-    print('Welcome to the Brain Games!')
+# def greet():
+#     print('Welcome to the Brain Games!')
 
 
-def main():
-    greet()
-    welcome_user()
+# def main():
+#     greet()
+#     welcome_user()
 
 
-if __name__ == "__main__":
-    main()
+# if __name__ == "__main__":
+#     main()
 
diff --git a/brain_games/scripts/brain_gcd.py b/brain_games/scripts/brain_gcd.py
@@ -1,4 +1,3 @@
-from random import randint
 from brain_games.engine.game_engine import run_game
 from brain_games.scripts.brain_even import random_number
 
diff --git a/brain_games/scripts/brain_progression.py b/brain_games/scripts/brain_progression.py
@@ -0,0 +1,45 @@
+from random import randint, random
+
+from brain_games.engine.game_engine import run_game
+
+
+def current_element(start: int, index: int, step: int) -> int:
+    return start + index * step
+
+
+def progression_lenght() -> int:
+    if random() < 0.5:
+        return 10
+    return randint(5, 9)
+
+
+def progression_array() -> list:
+    len_arr = progression_lenght()
+    prog_arr = []
+    start = randint(1, 20)
+    step = randint(1, 5)
+    index = 0
+    while index < len_arr:
+        prog_arr.append(current_element(start, index, step))
+        index += 1
+    return prog_arr
+
+
+initial_line = "What number is missing in the progression?"
+
+
+def generate_round():
+    array = progression_array()
+    pass_number_index = randint(0, len(array) - 1)
+    correct_answer = str(array[pass_number_index])
+    array[pass_number_index] = ".."
+    question = " ".join(map(str, array))
+    return question, correct_answer
+
+
+def main():
+    run_game(initial_line, generate_round)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/demo.cast b/demo.cast
@@ -1,39 +1,28 @@
-{"version": 2, "width": 120, "height": 30, "timestamp": 1774185243, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
-[0.017868, "o", "\u001b[?2004h\u001b]0;ainur@SOCHNI: ~/python-project-49\u0007\u001b[01;32mainur@SOCHNI\u001b[00m:\u001b[01;34m~/python-project-49\u001b[00m$ "]
-[2.60612, "o", "m"]
-[2.714381, "o", "a"]
-[3.065461, "o", "k"]
-[3.176666, "o", "e"]
-[3.332014, "o", " "]
-[4.205289, "o", "b"]
-[4.448894, "o", "r"]
-[4.542843, "o", "a"]
-[4.752812, "o", "i"]
-[4.823297, "o", "n"]
-[5.487061, "o", "-"]
-[6.863702, "o", "g"]
-[7.17907, "o", "c"]
-[7.215863, "o", "d"]
-[7.779837, "o", "\r\n\u001b[?2004l\r"]
-[7.782555, "o", "make[1]: Entering directory '/home/ainur/python-project-49'\r\nuv run brain-gcd\r\n"]
-[7.836598, "o", "Welcome to the Brain Games!\r\nMay I have your name? "]
-[10.784897, "o", "a"]
-[10.914805, "o", "i"]
-[11.018603, "o", "n"]
-[11.191819, "o", "u"]
-[11.314598, "o", "r"]
-[11.893018, "o", "\r\nHello, ainur!\r\n"]
-[11.893163, "o", "Find the greatest common divisor of given numbers.\r\nQuestion: 38 67\r\nYour answer: "]
-[13.892137, "o", "1"]
-[14.037285, "o", "\r\n"]
-[14.037703, "o", "Correct!\r\nQuestion: 21 63\r\nYour answer: "]
-[17.284467, "o", "2"]
-[17.364849, "o", "1"]
-[17.706138, "o", "\r\nCorrect!\r\n"]
-[17.706826, "o", "Question: 92 43\r\nYour answer: "]
-[19.870097, "o", "1"]
-[20.021715, "o", "\r\n"]
-[20.022154, "o", "Correct!\r\nCongratulations, ainur!\r\n"]
-[20.031264, "o", "make[1]: Leaving directory '/home/ainur/python-project-49'\r\n"]
-[20.031698, "o", "\u001b[?2004h\u001b]0;ainur@SOCHNI: ~/python-project-49\u0007\u001b[01;32mainur@SOCHNI\u001b[00m:\u001b[01;34m~/python-project-49\u001b[00m$ "]
-[22.729363, "o", "\u001b[?2004l\r\r\nexit\r\n"]
+{"version": 2, "width": 120, "height": 30, "timestamp": 1774439790, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
+[0.019501, "o", "\u001b[?2004h\u001b]0;ainur@SOCHNI: ~/python-project-49\u0007\u001b[01;32mainur@SOCHNI\u001b[00m:\u001b[01;34m~/python-project-49\u001b[00m$ "]
+[2.126255, "o", "make brain-progression"]
+[2.87576, "o", "\r\n\u001b[?2004l\r"]
+[2.879166, "o", "uv run brain-progression\r\n"]
+[2.925576, "o", "Welcome to the Brain Games!\r\nMay I have your name? "]
+[4.072933, "o", "A"]
+[4.253252, "o", "i"]
+[4.316269, "o", "n"]
+[4.521686, "o", "u"]
+[4.603186, "o", "r"]
+[4.974364, "o", "\r\n"]
+[4.974796, "o", "Hello, Ainur!\r\nWhat number is missing in the progression?\r\nQuestion: .. 18 20 22 24\r\nYour answer: "]
+[7.572142, "o", "1"]
+[8.353747, "o", "6"]
+[8.604455, "o", "\r\n"]
+[8.604676, "o", "Correct!\r\n"]
+[8.605153, "o", "Question: 13 14 .. 16 17 18\r\nYour answer: "]
+[11.050206, "o", "1"]
+[11.308877, "o", "5"]
+[11.469688, "o", "\r\n"]
+[11.470018, "o", "Correct!\r\nQuestion: 10 15 20 25 30 35 40 45 50 ..\r\nYour answer: "]
+[13.941124, "o", "5"]
+[14.094552, "o", "5"]
+[14.224432, "o", "\r\n"]
+[14.224622, "o", "Correct!\r\nCongratulations, Ainur!\r\n"]
+[14.235962, "o", "\u001b[?2004h\u001b]0;ainur@SOCHNI: ~/python-project-49\u0007\u001b[01;32mainur@SOCHNI\u001b[00m:\u001b[01;34m~/python-project-49\u001b[00m$ "]
+[16.085438, "o", "\u001b[?2004l\r\r\nexit\r\n"]
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,3 +25,4 @@ brain-games = "brain_games.scripts.brain_games:main"
 brain-even = "brain_games.scripts.brain_even:main"
 brain-calc = "brain_games.scripts.brain_calc:main"
 brain-gcd = "brain_games.scripts.brain_gcd:main"
+brain-progression = "brain_games.scripts.brain_progression:main"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from random import randint`
	`2`	`+`
`2`	`3`	`from brain_games.engine.game_engine import run_game`
`3`	`4`	`from brain_games.scripts.brain_even import random_number`
`4`	`5`