Update app.py
Browse files
app.py
CHANGED
|
@@ -48,6 +48,7 @@ if selected_function == "因数分解":
|
|
| 48 |
# factored_expression = factor(expression)
|
| 49 |
|
| 50 |
st.success(f"因数分解結果: {factored_expression}")
|
|
|
|
| 51 |
|
| 52 |
|
| 53 |
|
|
@@ -65,6 +66,7 @@ elif selected_function == "展開":
|
|
| 65 |
if expression:
|
| 66 |
result = expand(expression)
|
| 67 |
st.success(f"展開結果: {result}")
|
|
|
|
| 68 |
|
| 69 |
# 方程式(Sympy)
|
| 70 |
# 方程式(Sympy)
|
|
@@ -75,6 +77,7 @@ elif selected_function == "方程式":
|
|
| 75 |
x = symbols('x', real=True)
|
| 76 |
solution = solve(Eq(eval(equation),0), x)
|
| 77 |
st.success(f"方程式の解: {solution}")
|
|
|
|
| 78 |
|
| 79 |
|
| 80 |
# 連立方程式(Sympy)
|
|
@@ -85,6 +88,7 @@ elif selected_function == "連立方程式":
|
|
| 85 |
x, y = symbols('x y', real=True)
|
| 86 |
solution = solve([Eq(eval(eq1), 0), Eq(eval(eq2), 0)], (x, y))
|
| 87 |
st.success(f"連立方程式の解: {solution}")
|
|
|
|
| 88 |
|
| 89 |
# nPm
|
| 90 |
elif selected_function == "nPm":
|
|
@@ -93,6 +97,7 @@ elif selected_function == "nPm":
|
|
| 93 |
if n >= m:
|
| 94 |
result = factorial(n) / factorial(n - m)
|
| 95 |
st.success(f"{n}P{m}の結果: {result}")
|
|
|
|
| 96 |
|
| 97 |
# nCm
|
| 98 |
elif selected_function == "nCm":
|
|
@@ -101,6 +106,7 @@ elif selected_function == "nCm":
|
|
| 101 |
if n >= m:
|
| 102 |
result = math.comb(n, m)
|
| 103 |
st.success(f"{n}C{m}の結果: {result}")
|
|
|
|
| 104 |
|
| 105 |
# 多項式への代入計算
|
| 106 |
elif selected_function == "多項式への代入計算":
|
|
@@ -111,6 +117,7 @@ elif selected_function == "多項式への代入計算":
|
|
| 111 |
poly = simplify(poly_expression)
|
| 112 |
result = poly.subs(x, value_to_substitute)
|
| 113 |
st.success(f"代入計算の結果: {result}")
|
|
|
|
| 114 |
|
| 115 |
# ふたつの関数の交点の計算
|
| 116 |
elif selected_function == "関数の交点":
|
|
@@ -132,6 +139,9 @@ elif selected_function == "関数の交点":
|
|
| 132 |
intersection_points = fsolve(equation_system, initial_guess)
|
| 133 |
|
| 134 |
st.success(f"関数の交点の座標: {tuple(intersection_points)}")
|
|
|
|
|
|
|
|
|
|
| 135 |
|
| 136 |
|
| 137 |
# 三平方の定理(空欄補充)
|
|
@@ -169,11 +179,13 @@ elif selected_function == "素因数分解":
|
|
| 169 |
if expression:
|
| 170 |
factored_expression = factor(expression)
|
| 171 |
st.success(f"素因数分解結果: {factored_expression}")
|
|
|
|
| 172 |
elif selected_function == "普通の記述式計算":
|
| 173 |
expression = st.text_input("計算したい数式を入力してください:")
|
| 174 |
if expression:
|
| 175 |
try:
|
| 176 |
result = parse_expr(expression)
|
| 177 |
st.success(f"計算結果: {result}")
|
|
|
|
| 178 |
except Exception as e:
|
| 179 |
st.error(f"エラー: {e}")
|
|
|
|
| 48 |
# factored_expression = factor(expression)
|
| 49 |
|
| 50 |
st.success(f"因数分解結果: {factored_expression}")
|
| 51 |
+
st.latex(factored_expression, *, help=None)
|
| 52 |
|
| 53 |
|
| 54 |
|
|
|
|
| 66 |
if expression:
|
| 67 |
result = expand(expression)
|
| 68 |
st.success(f"展開結果: {result}")
|
| 69 |
+
st.latex(result, *, help=None)
|
| 70 |
|
| 71 |
# 方程式(Sympy)
|
| 72 |
# 方程式(Sympy)
|
|
|
|
| 77 |
x = symbols('x', real=True)
|
| 78 |
solution = solve(Eq(eval(equation),0), x)
|
| 79 |
st.success(f"方程式の解: {solution}")
|
| 80 |
+
st.latex(solution, *, help=None)
|
| 81 |
|
| 82 |
|
| 83 |
# 連立方程式(Sympy)
|
|
|
|
| 88 |
x, y = symbols('x y', real=True)
|
| 89 |
solution = solve([Eq(eval(eq1), 0), Eq(eval(eq2), 0)], (x, y))
|
| 90 |
st.success(f"連立方程式の解: {solution}")
|
| 91 |
+
st.latex(solution, *, help=None)
|
| 92 |
|
| 93 |
# nPm
|
| 94 |
elif selected_function == "nPm":
|
|
|
|
| 97 |
if n >= m:
|
| 98 |
result = factorial(n) / factorial(n - m)
|
| 99 |
st.success(f"{n}P{m}の結果: {result}")
|
| 100 |
+
|
| 101 |
|
| 102 |
# nCm
|
| 103 |
elif selected_function == "nCm":
|
|
|
|
| 106 |
if n >= m:
|
| 107 |
result = math.comb(n, m)
|
| 108 |
st.success(f"{n}C{m}の結果: {result}")
|
| 109 |
+
st.latex(result, *, help=None)
|
| 110 |
|
| 111 |
# 多項式への代入計算
|
| 112 |
elif selected_function == "多項式への代入計算":
|
|
|
|
| 117 |
poly = simplify(poly_expression)
|
| 118 |
result = poly.subs(x, value_to_substitute)
|
| 119 |
st.success(f"代入計算の結果: {result}")
|
| 120 |
+
st.latex(result, *, help=None)
|
| 121 |
|
| 122 |
# ふたつの関数の交点の計算
|
| 123 |
elif selected_function == "関数の交点":
|
|
|
|
| 139 |
intersection_points = fsolve(equation_system, initial_guess)
|
| 140 |
|
| 141 |
st.success(f"関数の交点の座標: {tuple(intersection_points)}")
|
| 142 |
+
st.latex(tuple(intersection_points), *, help=None)
|
| 143 |
+
|
| 144 |
+
|
| 145 |
|
| 146 |
|
| 147 |
# 三平方の定理(空欄補充)
|
|
|
|
| 179 |
if expression:
|
| 180 |
factored_expression = factor(expression)
|
| 181 |
st.success(f"素因数分解結果: {factored_expression}")
|
| 182 |
+
st.latex(factored_expression, *, help=None)
|
| 183 |
elif selected_function == "普通の記述式計算":
|
| 184 |
expression = st.text_input("計算したい数式を入力してください:")
|
| 185 |
if expression:
|
| 186 |
try:
|
| 187 |
result = parse_expr(expression)
|
| 188 |
st.success(f"計算結果: {result}")
|
| 189 |
+
st.latex(result, *, help=None)
|
| 190 |
except Exception as e:
|
| 191 |
st.error(f"エラー: {e}")
|