minor changes in demo/solar_system/correct-first_3_planets.py

Miguel Barão
1 parent f9bea841
Showing 1 changed file with 10 additions and 9 deletions Show diff stats
demo/solar_system/correct-first_3_planets.py
@@ -2,26 +2,27 @@
  
 import re
 import sys
+import time
  
 s = sys.stdin.read()
  
-# set of words converted to lowercase
-answer = set(re.findall(r'[\w]+', s.lower()))
-answer.difference_update({'e', 'a', 'planeta', 'planetas'})  # ignore these
+ans = set(re.findall(r'[\w]+', s.lower()))  # convert answer to lowercase
+ans.difference_update({'e', 'a', 'o', 'planeta', 'planetas'})  # ignore words
  
 # correct set of planets
 planets = {'mercúrio', 'vénus', 'terra'}
  
-correct = set.intersection(answer, planets)     # the ones I got right
-wrong = set.difference(answer, planets)         # the ones I got wrong
+correct = set.intersection(ans, planets)     # the ones I got right
+wrong = set.difference(ans, planets)         # the ones I got wrong
  
 grade = (len(correct) - len(wrong)) / len(planets)
  
+comments = 'Certo' if grade == 1.0 else 'as iniciais dos planetas são M, V e T'
+
 out = f'''---
-grade: {grade}'''
+grade: {grade}
+comments: {comments}'''
  
-if grade < 1.0:
-    out += '\ncomments: Vou dar uma ajuda, as iniciais são M, V e T...'
+time.sleep(5)
  
 print(out)
-exit(0)
...	...	@@ -2,26 +2,27 @@
2	2
3	3	import re
4	4	import sys
	5	+import time
5	6
6	7	s = sys.stdin.read()
7	8
8		-# set of words converted to lowercase
9		-answer = set(re.findall(r'[\w]+', s.lower()))
10		-answer.difference_update({'e', 'a', 'planeta', 'planetas'}) # ignore these
	9	+ans = set(re.findall(r'[\w]+', s.lower())) # convert answer to lowercase
	10	+ans.difference_update({'e', 'a', 'o', 'planeta', 'planetas'}) # ignore words
11	11
12	12	# correct set of planets
13	13	planets = {'mercúrio', 'vénus', 'terra'}
14	14
15		-correct = set.intersection(answer, planets) # the ones I got right
16		-wrong = set.difference(answer, planets) # the ones I got wrong
	15	+correct = set.intersection(ans, planets) # the ones I got right
	16	+wrong = set.difference(ans, planets) # the ones I got wrong
17	17
18	18	grade = (len(correct) - len(wrong)) / len(planets)
19	19
	20	+comments = 'Certo' if grade == 1.0 else 'as iniciais dos planetas são M, V e T'
	21	+
20	22	out = f'''---
21		-grade: {grade}'''
	23	+grade: {grade}
	24	+comments: {comments}'''
22	25
23		-if grade < 1.0:
24		- out += '\ncomments: Vou dar uma ajuda, as iniciais são M, V e T...'
	26	+time.sleep(5)
25	27
26	28	print(out)
27		-exit(0)
...	...