Merge pull request #14 from aviiciii/update

Update Logic in Meal and Plates

Author: aviiciii

pset1/meal.py

@@ -1,6 +1,7 @@
 def main():
     in_time = input('What time is it? ').strip()
     time = convert(in_time)
+    # print(f'{in_time} converts to {time:.2f}')
     if 7 <= time and time <= 8:
         print('breakfast time')
     elif 12 <= time and time <= 13:
@@ -14,18 +15,18 @@ def convert(time):
     if time.rfind('a.m.') != -1:
         time= time[:time.rfind('a')]
         hours, minutes = time.split(':')
-        converted_time = float(hours)+(float(minutes)/600)
+        converted_time = float(hours)+(float(minutes)/60)
         return converted_time
 
     elif time.rfind('p.m.') != -1:
         time= time[:time.rfind('p')]
         hours, minutes = time.split(':')
-        converted_time = 12+float(hours)+(float(minutes)/600)
+        converted_time = 12+float(hours)+(float(minutes)/60)
         return converted_time
 
     else :
         hours, minutes = time.split(':')
-        converted_time = float(hours)+(float(minutes)/600)
+        converted_time = float(hours)+(float(minutes)/60)
         return converted_time
 
 

pset2/plates.py

@@ -26,13 +26,10 @@ def is_valid(s):
             first_num = s.index(character)
             break
     # check if there is no alphabet after first num
-    for character in s:
-        if s.index(character)<= first_num:
-            pass
-        else:
-            if character.isalpha():
-                return False
-    #all conditions satisfied
+    for character in s[first_num:]:
+        if character.isalpha():
+            return False
+    # all conditions satisfied
     return True