Update app.py

app.py

@@ -16,77 +16,81 @@ selected_function = st.sidebar.selectbox("問題形式を選択", ["因数分解
 x = symbols("x")
 
 
-def factor_expression(expression):
-    x = symbols('x')
-    factored_expression = factor(expression)
-
-    st.success(f"因数分解結果: {factored_expression}")
-    st.latex(factored_expression)
-
-
 def generate_equation():
-    x = symbols('x')
-    generated_problems = []
-    # 例: x**2 + 5*x + 6
     wh = random.choice([1, 2])
+    AExpression, sAExpression = None, None
+
     if wh == 1:
-        a = random.randint(min_value, max_value)
-        b = random.randint(min_value, max_value)
+        a, b = [random.randint(min_value, max_value) for _ in range(2)]
         init_problem = f"(x + {a})*(x + {b})"
         AExpression = expand(init_problem)
-        sAExpression = None  # sAExpression を初期化
-    if wh == 2:
-        a = random.randint(min_value, max_value)
-        b = random.randint(min_value, max_value)
+    elif wh == 2:
+        a, b = [random.randint(min_value, max_value) for _ in range(2)]
         init_problem = f"{a}*x + {b}"
         AExpression = expand(init_problem)
-        a = random.randint(min_value, max_value)
-        b = random.randint(min_value, max_value)
+
+        a, b = [random.randint(min_value, max_value) for _ in range(2)]
         Secondarial_init_problem = f"{a}*x + {b}"
         sAExpression = expand(Secondarial_init_problem)
-    # 方程式の作成
-    equation = Eq(AExpression, sAExpression)
 
-    return equation
+    return Eq(AExpression, sAExpression)
 
 
-# 因数分解
-if selected_function == "因数分解":
-    min_value = st.number_input("乱数の最小値を入力してください:", value=-10)
-    max_value = st.number_input("乱数の最大値を入力してください:", value=10)
+def generate_problem():
+    a, b = [random.randint(min_value, max_value) for _ in range(2)]
 
-    # 生成ボタン
-    generate_button = st.button("問題を生成する")
+    if selected_function == "因数分解":
+        expression = expand(f"(x + {a})*(x + {b})")
+    elif selected_function == "方程式":
+        expression = generate_equation()
+
+    return expression
 
-    if generate_button:
-        generated_problems = []
-        # 例: x**2 + 5*x + 6
-        a = random.randint(min_value, max_value)
-        b = random.randint(min_value, max_value)
-        init_problem = f"(x + {a})*(x + {b})"
-        expression = expand(init_problem)
-        if expression:
-            st.success(f"問題: {expression}")
-            st.latex(expression)
 
-if selected_function == "方程式":
+# 問題生成ボタン
+generate_button = st.button("問題を生成する")
+
+if generate_button:
     min_value = st.number_input("乱数の最小値を入力してください:", value=-10)
     max_value = st.number_input("乱数の最大値を入力してください:", value=10)
 
-    # 生成ボタン
-    generate_button = st.button("問題を生成する")
-    if generate_button:
-        # 方程式の生成
-        equation = generate_equation()
+    expression = generate_problem()
+
+    # 生成した問題の表示
+    st.success(f"生成した問題: {expression}")
+    st.latex(expression)
 
-        # 生成した方程式の表示
-        st.success(f"生成した方程式: {equation}")
-        st.latex(equation)
+    # 解を求めるボタン
+    solve_button = st.button("解を求める")
 
-        # 解を求めるボタン
-        solve_button = st.button("解を求める")
+    if solve_button and selected_function == "方程式":
+        # 方程式の解を求める
+        solutions = solve(expression)
+        st.success(f"方程式の解: {solutions}")
+
+#
+    #
+    #
+    #
+    #
+    #
+
+# 因数分解
+#if selected_function == "因数分解":
+ #   min_value = st.number_input("乱数の最小値を入力してください:", value=-10)
+  #  max_value = st.number_input("乱数の最大値を入力してください:", value=10)
+#
+ #   # 生成ボタン
+  #  generate_button = st.button("問題を生成する")
+#
+ #   if generate_button:
+  #      generated_problems = []
+   #     # 例: x**2 + 5*x + 6
+    #    a = random.randint(min_value, max_value)
+     #   b = random.randint(min_value, max_value)
+      #  init_problem = f"(x + {a})*(x + {b})"
+       # expression = expand(init_problem)
+        #if expression:
+         #   st.success(f"問題: {expression}")
+          #  st.latex(expression)
 
-        if solve_button:
-            # 方程式の解を求める
-            solutions = solve(equation)
-            st.success(f"方程式の解: {solutions}")