Improve code, comments, trailing whitespace

Author: TeraMika

Model Code/lesson_2.py

@@ -130,14 +130,14 @@ def guessQuality(guess, theNumber):
 
     if guess > theNumber:
         print("Too high!")
-        guessQuality(guess, theNumber)
     elif guess < theNumber:
         print("Too low!")
-        guessQuality(guess, theNumber)
     else:
         print("That's right! Well done!")
         break
 
+    guessQuality(guess, theNumber)  # Both too high and too low use this, so it can go after the if
+
     guessesTaken += 1
 
     if guessesTaken == guessesAllowed:
@@ -169,7 +169,7 @@ def guessQuality(guess, theNumber):
                           # if modulo is zero, that number is a factor of the other. e.g.: 4 % 2 = 0
             print("\n" + str(number) + " is not a prime number.")
 
-            numStr = str(number)
+            numStr = str(number)  # Not strictly necessary code but more readable
             iterStr = str(x)
             pairedFactor = str(number//x)
 
@@ -178,8 +178,9 @@ def guessQuality(guess, theNumber):
             # An extension would be to get all factors of the number!
             break
         x += 1
-    else:  # Make sure this else is indented to the same level as the 'loop' line!
-           # What happens if it's indented to match the if statement following that line?
+    else:  # This 'else' is part of the while loop! While/else statements are valid in python
+           # This statement will only trigger if the condition of the loop is false.
+           # So when you `break` the loop, it doesn't activate. Here, that's perfect!
         print(str(number) + " is a prime number!")
 
 else:
@@ -201,7 +202,7 @@ def guessQuality(guess, theNumber):
 
 turns_remaining = 10  # You need at least as many turns as unique letters in your word!
 
-# We'll count our turns downwards
+# We'll count our turns downwards just for a change of pace
 while turns_remaining > 0:  # while we have turns left
 
     word_display = ''       # An empty string we will use to display our incomplete word
@@ -219,7 +220,7 @@ def guessQuality(guess, theNumber):
 
     elif guess in guesses:  # To prevent duplicate guesses
         print("You already guessed this letter! So far, you have guessed: " + guesses)
-    
+
     else:  # If the guess isn't the whole word, previously guessed, and is one character, the program continues.
         guesses += guess  # Add guess to the string of guesses
 

Model Code/lesson_3.py

@@ -43,18 +43,18 @@ def guessQuality(guess, theNumber):
     guess = int(input("What's your guess? \n"))
     guessTotal = guessMathsFunction(guess, guessTotal)  # A running total of guesses
     guessesTaken += 1
-    
+
     if guess > theNumber:
         print("Too high!")
-        guessQuality(guess, theNumber)
     elif guess < theNumber:
         print("Too low!")
-        guessQuality(guess, theNumber)
     else:
         print("That's right! Well done!")
         print("Your average guess was " + str(guessTotal / guessesTaken))
         break
 
+    guessQuality(guess, theNumber)
+
     if guessesTaken == guessesAllowed:
         print("Game over! The number was " + str(theNumber))
         print("Your average guess was " + str(guessTotal / guessesTaken))
@@ -118,14 +118,32 @@ def guessQuality(guess, theNumber):
 
 print(productInfo)
 
-# Extension
+# Extension -- two methods
+sortedByPrice = {}
+
+# First method, for each price, check if it exists already in the keys
+# If it does, add the product to that list. If it doesn't, make a list with that product in it.
+for i in range(len(fruityPrices)):
+    price = fruityPrices[i]
+    product = fruityProducts[i]  # More readable if you do it like this
+
+    if price in sortedByPrice.keys():
+        sortedByPrice[price].append(product)
+    else:
+        sortedByPrice[price] = [product]
+
+print("Method one:", sortedByPrice)
+
+# Method two: get unique prices, compare all prices to unique price, find products matching, group
 
 sortedByPrice = {}
-uniquePrices = set(fruityPrices)  
-# You could do this by iterating over the fruityPrices and removing prices you've seen before, but a set is faster!
+
+uniquePrices = set(fruityPrices)
+# You could get uniques by iterating over the fruityPrices and removing prices you've seen before
+# but a set is faster!
 # That might look like this:
-# uniquePrices = [] 
-# for price in fruityPrices: 
+# uniquePrices = []
+# for price in fruityPrices:
 #     if price not in uniquePrices:
 #         uniquePrices.append(price)
 
@@ -137,5 +155,4 @@ def guessQuality(guess, theNumber):
 
     sortedByPrice[price] = byPrice  # the list is our group of products
 
-print(sortedByPrice)
-# In short: get unique prices, compare all prices to each unique price, find products matching that price and group them
+print("Method two:", sortedByPrice)