OzoneAsai commited on
Commit
8ebee40
ยท
1 Parent(s): 61ce2c9

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +11 -13
app.py CHANGED
@@ -196,16 +196,17 @@ elif selected_function == "ๆ™ฎ้€šใฎ่จ˜่ฟฐๅผ่จˆ็ฎ—":
196
  st.latex(result)
197
  except Exception as e:
198
  st.error(f"ใ‚จใƒฉใƒผ: {e}")
 
199
  elif selected_function == "ๅ•้กŒ็”Ÿๆˆ":
200
- problem_options = st.selectbox("ๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„:", ["ๅ››ๅ‰‡ๆผ”็ฎ—", "ๅ› ๆ•ฐๅˆ†่งฃ", "ๆ–น็จ‹ๅผ"])
201
 
202
- if not problem_options:
203
  st.warning("ๅฐ‘ใชใใจใ‚‚1ใคใฎๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„ใ€‚")
204
  else:
205
  generated_problems = []
206
 
207
  # ๅ››ๅ‰‡ๆผ”็ฎ—ใฎๅ•้กŒ็”Ÿๆˆ
208
- if "ๅ››ๅ‰‡ๆผ”็ฎ—" in problem_options:
209
  # ไพ‹: 3 + 5 * 2
210
  num1 = random.randint(1, 10)
211
  num2 = random.randint(1, 10)
@@ -214,11 +215,11 @@ elif selected_function == "ๅ•้กŒ็”Ÿๆˆ":
214
  generated_problems.append(problem)
215
 
216
  # ๅ› ๆ•ฐๅˆ†่งฃใฎๅ•้กŒ็”Ÿๆˆ
217
- if "ๅ› ๆ•ฐๅˆ†่งฃ" in problem_options:
218
  # ไพ‹: x**2 + 5*x + 6
219
  a = random.randint(-10, 10)
220
  b = random.randint(-10, 10)
221
- init_problem = f"(x+ {a})*(x + {b})"
222
  expression = init_problem
223
  if expression:
224
  result = expand(expression)
@@ -227,21 +228,18 @@ elif selected_function == "ๅ•้กŒ็”Ÿๆˆ":
227
  generated_problems.append(result)
228
 
229
  # ๆ–น็จ‹ๅผใฎๅ•้กŒ็”Ÿๆˆ
230
- if "ๆ–น็จ‹ๅผ" in problem_options:
231
- # ไพ‹: x**2 - 9 = 0
232
- #a = random.randint(1, 5)
233
- #problem = f"x**2 - {a**2} = 0"
234
- # ไพ‹: x**2 + 5*x + 6
235
  a = random.randint(-10, 10)
236
  b = random.randint(-10, 10)
237
- init_problem = f"(x+ sqrt({a})*(x - sqrt({b}))"
238
  expression = init_problem
239
  if expression:
240
  result = expand(expression)
241
  st.success(f"ๅฑ•้–‹็ตๆžœ: {result}")
242
  st.latex(result)
243
- generated_problems.append(problem)
244
 
245
  st.success("็”Ÿๆˆใ•ใ‚ŒใŸๅ•้กŒ:")
246
  for idx, problem in enumerate(generated_problems, start=1):
247
- st.write(f"{idx}. {problem}")
 
196
  st.latex(result)
197
  except Exception as e:
198
  st.error(f"ใ‚จใƒฉใƒผ: {e}")
199
+ # ๅ•้กŒ็”Ÿๆˆ
200
  elif selected_function == "ๅ•้กŒ็”Ÿๆˆ":
201
+ problem_option = st.radio("ๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„:", ["ๅ››ๅ‰‡ๆผ”็ฎ—", "ๅ› ๆ•ฐๅˆ†่งฃ", "ๆ–น็จ‹ๅผ"])
202
 
203
+ if not problem_option:
204
  st.warning("ๅฐ‘ใชใใจใ‚‚1ใคใฎๅ•้กŒใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ธๆŠžใ—ใฆใใ ใ•ใ„ใ€‚")
205
  else:
206
  generated_problems = []
207
 
208
  # ๅ››ๅ‰‡ๆผ”็ฎ—ใฎๅ•้กŒ็”Ÿๆˆ
209
+ if problem_option == "ๅ››ๅ‰‡ๆผ”็ฎ—":
210
  # ไพ‹: 3 + 5 * 2
211
  num1 = random.randint(1, 10)
212
  num2 = random.randint(1, 10)
 
215
  generated_problems.append(problem)
216
 
217
  # ๅ› ๆ•ฐๅˆ†่งฃใฎๅ•้กŒ็”Ÿๆˆ
218
+ elif problem_option == "ๅ› ๆ•ฐๅˆ†่งฃ":
219
  # ไพ‹: x**2 + 5*x + 6
220
  a = random.randint(-10, 10)
221
  b = random.randint(-10, 10)
222
+ init_problem = f"(x + {a})*(x + {b})"
223
  expression = init_problem
224
  if expression:
225
  result = expand(expression)
 
228
  generated_problems.append(result)
229
 
230
  # ๆ–น็จ‹ๅผใฎๅ•้กŒ็”Ÿๆˆ
231
+ elif problem_option == "ๆ–น็จ‹ๅผ":
232
+ # ไพ‹: (x + sqrt(5))*(x - sqrt(2)) = 0
 
 
 
233
  a = random.randint(-10, 10)
234
  b = random.randint(-10, 10)
235
+ init_problem = f"(x + sqrt({abs(a)}))*(x - sqrt({abs(b)})) = 0"
236
  expression = init_problem
237
  if expression:
238
  result = expand(expression)
239
  st.success(f"ๅฑ•้–‹็ตๆžœ: {result}")
240
  st.latex(result)
241
+ generated_problems.append(result)
242
 
243
  st.success("็”Ÿๆˆใ•ใ‚ŒใŸๅ•้กŒ:")
244
  for idx, problem in enumerate(generated_problems, start=1):
245
+ st.write(f"{idx}. {problem}")