OzoneAsai commited on
Commit
93d1180
ยท
verified ยท
1 Parent(s): 3057500

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +35 -26
app.py CHANGED
@@ -12,11 +12,15 @@ def main():
12
  complement_operation()
13
 
14
  def parse_set(input_str):
15
- try:
16
- return set(map(int, input_str.split(',')))
17
- except ValueError:
18
- st.error("ๅ…ฅๅŠ›ใŒๆญฃใ—ใใ‚ใ‚Šใพใ›ใ‚“ใ€‚ใ‚ซใƒณใƒžๅŒบๅˆ‡ใ‚Šใฎๆ•ดๆ•ฐใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„ใ€‚")
19
- return set()
 
 
 
 
20
 
21
  def set_operations():
22
  st.header("้›†ๅˆใฎๆ“ไฝœ")
@@ -36,24 +40,28 @@ def set_operations():
36
  set2 = parse_set(set2)
37
  set3 = parse_set(set3)
38
 
39
- # ้›†ๅˆใฎๆ“ไฝœ
40
- st.subheader("้›†ๅˆใฎๆ“ไฝœ็ตๆžœ")
 
41
 
42
- st.subheader("ๅ’Œ้›†ๅˆ")
43
- union = set1.union(set2, set3)
44
- st.write(union)
45
 
46
- st.subheader("็ฉ้›†ๅˆ")
47
- intersection = set1.intersection(set2, set3)
48
- st.write(intersection)
 
 
 
49
 
50
- st.subheader("ๅทฎ้›†ๅˆ")
51
- difference = set1.difference(set2, set3)
52
- st.write(difference)
53
 
54
- st.subheader("ๅฏพ็งฐๅทฎ")
55
- symmetric_difference = set1.symmetric_difference(set2)
56
- st.write(symmetric_difference)
57
 
58
  def complement_operation():
59
  st.header("่ฃœ้›†ๅˆใฎ่จˆ็ฎ—")
@@ -74,13 +82,14 @@ def complement_operation():
74
  # ๅ…ฅๅŠ›ใ•ใ‚ŒใŸๆ–‡ๅญ—ๅˆ—ใ‚’้›†ๅˆใซๅค‰ๆ›
75
  universe_set = parse_set(universe)
76
 
77
- # ่ฃœ้›†ๅˆใฎ่จˆ็ฎ—
78
- st.subheader("่ฃœ้›†ๅˆใฎ่จˆ็ฎ—็ตๆžœ")
79
- for i in range(num_steps):
80
- current_range = range(initial_value, initial_value + step)
81
- complement = universe_set.difference(current_range)
82
- st.write(f"่ฃœ้›†ๅˆ({initial_value} - {initial_value + step - 1})", complement)
83
- initial_value += step
 
84
 
85
  if __name__ == "__main__":
86
  main()
 
12
  complement_operation()
13
 
14
  def parse_set(input_str):
15
+ if input_str:
16
+ try:
17
+ return set(map(int, input_str.split(',')))
18
+ except ValueError:
19
+ st.error("ๅ…ฅๅŠ›ใŒๆญฃใ—ใใ‚ใ‚Šใพใ›ใ‚“ใ€‚ใ‚ซใƒณใƒžๅŒบๅˆ‡ใ‚Šใฎๆ•ดๆ•ฐใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„ใ€‚")
20
+ return None
21
+ else:
22
+ st.error("ๅ…ฅๅŠ›ใŒ็ฉบใงใ™ใ€‚ใ‚ซใƒณใƒžๅŒบๅˆ‡ใ‚Šใฎๆ•ดๆ•ฐใ‚’ๅ…ฅๅŠ›ใ—ใฆใใ ใ•ใ„ใ€‚")
23
+ return None
24
 
25
  def set_operations():
26
  st.header("้›†ๅˆใฎๆ“ไฝœ")
 
40
  set2 = parse_set(set2)
41
  set3 = parse_set(set3)
42
 
43
+ if set1 is not None and set2 is not None and set3 is not None:
44
+ # ้›†ๅˆใฎๆ“ไฝœ
45
+ st.subheader("้›†ๅˆใฎๆ“ไฝœ็ตๆžœ")
46
 
47
+ st.subheader("ๅ’Œ้›†ๅˆ")
48
+ union = set1.union(set2, set3)
49
+ st.write(union)
50
 
51
+ st.subheader("็ฉ้›†ๅˆ")
52
+ intersection = set1.intersection(set2, set3)
53
+ if intersection:
54
+ st.write(intersection)
55
+ else:
56
+ st.write("็ฉ้›†ๅˆใฎ็ตๆžœใฏ็ฉบใงใ™ใ€‚")
57
 
58
+ st.subheader("ๅทฎ้›†ๅˆ")
59
+ difference = set1.difference(set2, set3)
60
+ st.write(difference)
61
 
62
+ st.subheader("ๅฏพ็งฐๅทฎ")
63
+ symmetric_difference = set1.symmetric_difference(set2)
64
+ st.write(symmetric_difference)
65
 
66
  def complement_operation():
67
  st.header("่ฃœ้›†ๅˆใฎ่จˆ็ฎ—")
 
82
  # ๅ…ฅๅŠ›ใ•ใ‚ŒใŸๆ–‡ๅญ—ๅˆ—ใ‚’้›†ๅˆใซๅค‰ๆ›
83
  universe_set = parse_set(universe)
84
 
85
+ if universe_set is not None:
86
+ # ่ฃœ้›†ๅˆใฎ่จˆ็ฎ—
87
+ st.subheader("่ฃœ้›†ๅˆใฎ่จˆ็ฎ—็ตๆžœ")
88
+ for i in range(num_steps):
89
+ current_range = range(initial_value, initial_value + step)
90
+ complement = universe_set.difference(current_range)
91
+ st.write(f"่ฃœ้›†ๅˆ({initial_value} - {initial_value + step - 1})", complement)
92
+ initial_value += step
93
 
94
  if __name__ == "__main__":
95
  main()