OzoneAsai commited on
Commit
6ee71a6
ยท
1 Parent(s): 90f1528

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +37 -29
app.py CHANGED
@@ -198,50 +198,58 @@ elif selected_function == "ๆ™ฎ้€šใฎ่จ˜่ฟฐๅผ่จˆ็ฎ—":
198
  st.error(f"ใ‚จใƒฉใƒผ: {e}")
199
  # ๅ•้กŒ็”Ÿๆˆ
200
  # ๅ•้กŒ็”Ÿๆˆ
 
201
  elif selected_function == "ๅ•้กŒ็”Ÿๆˆ":
202
  problem_option = st.radio("ๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„:", ["ๅ››ๅ‰‡ๆผ”็ฎ—", "ๅ› ๆ•ฐๅˆ†่งฃ", "ๆ–น็จ‹ๅผ"])
203
 
204
  if not problem_option:
205
  st.warning("ๅฐ‘ใชใใจใ‚‚1ใคใฎๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„ใ€‚")
206
  else:
207
- # ๅ››ๅ‰‡ๆผ”็ฎ—ใฎๅ•้กŒ็”Ÿๆˆ
208
- if problem_option == "ๅ››ๅ‰‡ๆผ”็ฎ—":
209
- st.subheader("ๅ››ๅ‰‡ๆผ”็ฎ—ใฎๅ•้กŒ็”Ÿๆˆ")
210
- num1 = st.number_input("็ฌฌ1้ …ใฎๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", min_value=-100, max_value=100, step=1)
211
- num2 = st.number_input("็ฌฌ2้ …ใฎๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", min_value=-100, max_value=100, step=1)
212
- operator = st.selectbox("ๆผ”็ฎ—ๅญใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„:", ["+", "-", "*", "/"])
213
- generate_button = st.button("ๅ•้กŒ็”Ÿๆˆ")
214
-
215
- if generate_button:
 
 
 
 
 
 
 
216
  problem = f"{num1} {operator} {num2}"
217
- st.success(f"็”Ÿๆˆใ•ใ‚ŒใŸๅ•้กŒ: {problem}")
218
-
219
- # ๅ› ๆ•ฐๅˆ†่งฃใฎๅ•้กŒ็”Ÿๆˆ
220
- elif problem_option == "ๅ› ๆ•ฐๅˆ†่งฃ":
221
- st.subheader("ๅ› ๆ•ฐๅˆ†่งฃใฎๅ•้กŒ็”Ÿๆˆ")
222
- a = st.number_input("ไฟ‚ๆ•ฐaใฎๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", min_value=-10, max_value=10, step=1)
223
- b = st.number_input("ไฟ‚ๆ•ฐbใฎๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", min_value=-10, max_value=10, step=1)
224
- generate_button = st.button("ๅ•้กŒ็”Ÿๆˆ")
225
-
226
- if generate_button:
227
  init_problem = f"(x + {a})*(x + {b})"
228
  expression = init_problem
229
  if expression:
230
  result = expand(expression)
231
- st.success(f"็”Ÿๆˆใ•ใ‚ŒใŸๅ•้กŒ: {result}")
232
  st.latex(result)
 
233
 
234
- # ๆ–น็จ‹ๅผใฎๅ•้กŒ็”Ÿๆˆ
235
- elif problem_option == "ๆ–น็จ‹ๅผ":
236
- st.subheader("ๆ–น็จ‹ๅผใฎๅ•้กŒ็”Ÿๆˆ")
237
- a = st.number_input("ไฟ‚ๆ•ฐaใฎๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", min_value=-10, max_value=10, step=1)
238
- b = st.number_input("ไฟ‚ๆ•ฐbใฎๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", min_value=-10, max_value=10, step=1)
239
- generate_button = st.button("ๅ•้กŒ็”Ÿๆˆ")
240
-
241
- if generate_button:
242
  init_problem = f"(x + sqrt({abs(a)}))*(x - sqrt({abs(b)})) = 0"
243
  expression = init_problem
244
  if expression:
245
  result = expand(expression)
246
- st.success(f"็”Ÿๆˆใ•ใ‚ŒใŸๅ•้กŒ: {result}")
247
  st.latex(result)
 
 
 
 
 
 
198
  st.error(f"ใ‚จใƒฉใƒผ: {e}")
199
  # ๅ•้กŒ็”Ÿๆˆ
200
  # ๅ•้กŒ็”Ÿๆˆ
201
+ # ๅ•้กŒ็”Ÿๆˆ
202
  elif selected_function == "ๅ•้กŒ็”Ÿๆˆ":
203
  problem_option = st.radio("ๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„:", ["ๅ››ๅ‰‡ๆผ”็ฎ—", "ๅ› ๆ•ฐๅˆ†่งฃ", "ๆ–น็จ‹ๅผ"])
204
 
205
  if not problem_option:
206
  st.warning("ๅฐ‘ใชใใจใ‚‚1ใคใฎๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„ใ€‚")
207
  else:
208
+ # ไนฑๆ•ฐใฎ็”Ÿๆˆ็ฏ„ๅ›ฒๆŒ‡ๅฎš
209
+ min_value = st.number_input("ไนฑๆ•ฐใฎๆœ€ๅฐๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", value=-10)
210
+ max_value = st.number_input("ไนฑๆ•ฐใฎๆœ€ๅคงๅ€คใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„:", value=10)
211
+
212
+ # ็”Ÿๆˆใƒœใ‚ฟใƒณ
213
+ generate_button = st.button("ๅ•้กŒใ‚’็”Ÿๆˆใ™ใ‚‹")
214
+
215
+ if generate_button:
216
+ generated_problems = []
217
+
218
+ # ๅ››ๅ‰‡ๆผ”็ฎ—ใฎๅ•้กŒ็”Ÿๆˆ
219
+ if problem_option == "ๅ››ๅ‰‡ๆผ”็ฎ—":
220
+ # ไพ‹: 3 + 5 * 2
221
+ num1 = random.randint(min_value, max_value)
222
+ num2 = random.randint(min_value, max_value)
223
+ operator = random.choice(["+", "-", "*", "/"])
224
  problem = f"{num1} {operator} {num2}"
225
+ generated_problems.append(problem)
226
+
227
+ # ๅ› ๆ•ฐๅˆ†่งฃใฎๅ•้กŒ็”Ÿๆˆ
228
+ elif problem_option == "ๅ› ๆ•ฐๅˆ†่งฃ":
229
+ # ไพ‹: x**2 + 5*x + 6
230
+ a = random.randint(min_value, max_value)
231
+ b = random.randint(min_value, max_value)
 
 
 
232
  init_problem = f"(x + {a})*(x + {b})"
233
  expression = init_problem
234
  if expression:
235
  result = expand(expression)
236
+ st.success(f"ๅ•้กŒ: {result}")
237
  st.latex(result)
238
+ generated_problems.append(result)
239
 
240
+ # ๆ–น็จ‹ๅผใฎๅ•้กŒ็”Ÿๆˆ
241
+ elif problem_option == "ๆ–น็จ‹ๅผ":
242
+ # ไพ‹: (x + sqrt(5))*(x - sqrt(2)) = 0
243
+ a = random.randint(min_value, max_value)
244
+ b = random.randint(min_value, max_value)
 
 
 
245
  init_problem = f"(x + sqrt({abs(a)}))*(x - sqrt({abs(b)})) = 0"
246
  expression = init_problem
247
  if expression:
248
  result = expand(expression)
249
+ st.success(f"ๅฑ•้–‹็ตๆžœ: {result}")
250
  st.latex(result)
251
+ generated_problems.append(result)
252
+
253
+ st.success("็”Ÿๆˆใ•ใ‚ŒใŸๅ•้กŒ:")
254
+ for idx, problem in enumerate(generated_problems, start=1):
255
+ st.write(f"{idx}. {problem}")