Merge branch 'master' of https://github.com/ihf-code/python_twitch

jacobwyke · jacobwyke · commit a000333233f6 · 2020-06-22T23:50:37.000+01:00
diff --git a/session_03/answers/A1.py b/session_03/answers/A1.py
@@ -1,6 +1,10 @@
 # A1 - Ask for the user's name, if they are called "Bob", print "Welcome Bob!"
 
+# Created variable name and assigned the input to it. 
+# Whatever the user enters as their name will be stored in the name variable.
 name = input("What is your name?\n")
 
+# Checking if the name the user has input is Bob. 
+# If it is, print "Welcome Bob!"
 if name == "Bob":
     print("Welcome Bob!")
diff --git a/session_03/answers/A2.py b/session_03/answers/A2.py
@@ -1,6 +1,10 @@
 # A2 - Ask for the user's name, if they are not called "Alice", print "You're not Alice!"
 
+# Created variable name and assigned the input to it. 
+# Whatever the user enters as their name will be stored in the name variable.
 name = input("What is your name?\n")
 
+# Checking if the name the user has input is not Alice. 
+# If it is not Alice, print "You're not Alice!"
 if name != "Alice":
     print("You're not Alice!")
diff --git a/session_03/answers/A3.py b/session_03/answers/A3.py
@@ -1,10 +1,16 @@
 # A3 - Ask the user for a password, if they enter the password "qwerty123", print "You have successfully logged in".
 # If they get it wrong, print "Password failure"
 
-password = "qwerty123"
+# Created variable name and assigned the input to it. 
+# Whatever the user enters as their password will be stored in the user_guess variable.
 user_guess = input("What is your password?\n")
+# Hardcoded password variable so we can compare this against the user_guess
+password = "qwerty123"
 
+# Checking if the password is the same as the user_guess. 
+# If it is the same, print "You have successfully logged in."
 if user_guess == password:
     print("You have successfully logged in.")
+# If it is not the same, print "Password failure."
 else:
     print("Password failure.")
diff --git a/session_03/answers/A4.py b/session_03/answers/A4.py
@@ -1,8 +1,14 @@
 # A4 - Ask the user to enter a number, if the number is even, print "Even", otherwise print "Odd"
 
+# Created variable number and assigned the input to it.
+# As we will be performing some math on this input, we will need to cast it to an integer.
+# Whatever the user enters as their number will be stored in the number variable.
 number = int(input("Please enter a number to find out if it is even or odd:\n"))
 
+# Checking if the number is even, we do this by using the modulus to check if when divided by 2 the remainder is 0 
+# If it is the same, print(str(number) + " is Even") - as number is an integer, to concatenate, we have to cast to a string.
 if number % 2 == 0:
     print(str(number) + " is Even")
+# If it is not even, it must be odd so will print(str(number) + " is Odd"), again casting the number to a string.
 else:
     print(str(number) + " is Odd")
diff --git a/session_03/answers/A5.py b/session_03/answers/A5.py
@@ -1,9 +1,15 @@
 # A5 - Ask the user for 2 different numbers, if the total of the two numbers is over 21, print "Bust" otherwise print "Safe"
 
+# Created variable number and assigned the input to it.
+# As we will be performing some math on this input, we will need to cast it to an integer.
+# Whatever the user enters as their number will be stored in the number_1 variable.
+# Repeated the above for number_2
 number_1 = int(input("Input a number:\n"))
 number_2 = int(input("Input another number:\n"))
 
+# Checking if when both number variables are added together are over 21, print("Bust.")
 if number_1 + number_2 > 21:
     print("Bust.")
+# if when both number variables are added together are under 21, print("Safe.")
 else:
     print("Safe.")
diff --git a/session_04/answers/B10.py b/session_04/answers/B10.py
@@ -1,4 +1,4 @@
-# D5 - FizzBuzz &ndash; Write a program that prints the numbers from 1 to 100.
+# B10 - FizzBuzz &ndash; Write a program that prints the numbers from 1 to 100.
 # For multiples of three, print &ldquo;Fizz&rdquo; instead of the number and for multiples of five, print &ldquo;Buzz&rdquo;.
 # For numbers which are multiples of both three and five, print &ldquo;FizzBuzz&rdquo;
 
diff --git a/session_05/answers/A11.py b/session_05/answers/A11.py
@@ -1,4 +1,4 @@
-# A5 - Rock, Paper, Scissors - Create a simple rock, paper, scissors game which is run against computer.
+# A11 - Rock, Paper, Scissors - Create a simple rock, paper, scissors game which is run against computer.
 
 import random
 
diff --git a/session_06/slides/session_6.md b/session_06/slides/session_6.md
@@ -197,7 +197,7 @@ while times_in_loop <= 10:
 x = 1
 while x <= 100:
     print(x)
-    times_in_loop = times_in_loop + 1
+    x = x + 1
 
 for y in range(1, 101):
     print(y)
diff --git a/session_08/answers/A2.py b/session_08/answers/A2.py
@@ -1,5 +1,16 @@
 # A2 - Read the file 'austen.txt' and print the amount of lines in the file
+
+#Option 1
 total = 0
 for x in open("austen.txt"):
     total += 1
+
 print(total)
+
+#Option 2 
+f = open("austen.txt", "r")
+count = 0
+for x in f:
+  count += 1
+
+print(count)
diff --git a/session_08/answers/A3.py b/session_08/answers/A3.py
@@ -1,5 +1,17 @@
 # A3 - Each line of the file 'numbers.txt' contains a number, write a script to add up all the values in the file
+
+#Option 1
 total = 0
 for x in open("numbers.txt"):
     total += int(x)
+
 print(total)
+
+#Option 2
+f = open("numbers.txt", "r")
+sum = 0 
+for x in f:
+  x = int(x)
+  sum += x
+
+print(sum)
diff --git a/session_08/answers/B1.py b/session_08/answers/B1.py
@@ -1,9 +1,10 @@
 # B1 - Ask the user to enter their name and append this to a file called 'register.txt'
 
 file1 = open("register.txt", "a")
+
 name = True
 while name != "":
-    name = input("whats uyour anme? ")
+    name = input("What's your name?\n")
     if name:
         file1.write(name + "\n")
 
diff --git a/session_08/answers/B2.py b/session_08/answers/B2.py
@@ -1,7 +1,10 @@
 # B2 - Create a new file called 'even.txt' that contains only the even numbers from the file 'numbers.txt"
 
 f = open("even.txt", "w")
+
 for x in open("numbers.txt"):
     x = int(x)
     if x % 2 == 0:
         f.write(str(x) + "\n")
+
+f.close()
diff --git a/session_08/answers/B4.py b/session_08/answers/B4.py
@@ -3,25 +3,164 @@
 # Fake data is usually evenly distributed, where as real data The files 'accounts_1.txt', 'accounts_2.txt' and 'accounts_3.txt' contain financial transaction data. 
 # Work out which of the files contains fake data.
 
+# STAGE 1 - this code allows us to check the values of one of the account files.
+f = open("accounts_1.txt", "r")
+
+count = {
+  "0":0,
+  "1":0,
+  "2":0,
+  "3":0,
+  "4":0,
+  "5":0,
+  "6":0,
+  "7":0,
+  "8":0,
+  "9":0
+}
+
+for x in f:
+  if x:
+    count[x[0]] += 1
+
+for y in range(1,10):
+  print(str(y) + " = " + str(count[str(y)]/100) + "%")
+
+# STAGE 2 - Adding a for loop so we are able to loop through all accounts.
+for x in range(1,4):
+  f = open("accounts_" + str(x) + ".txt", "r")
+
+  count = {
+    "0":0,
+    "1":0,
+    "2":0,
+    "3":0,
+    "4":0,
+    "5":0,
+    "6":0,
+    "7":0,
+    "8":0,
+    "9":0
+  }
+
+  for num in f:
+    if num:
+      count[num[0]] += 1
+  print(x)
+  for y in range(1,10):
+    print(str(y) + " = " + str(count[str(y)]/100) + "%")
+
+#STAGE 3 - Changing count so instead of us manually having to input count, it will create itself
 for x in range(1,4):
-    f = open("accounts_" + str(x) + ".txt", "r")
-    count = {
-        "0": 0,
-        "1": 0,
-        "2": 0,
-        "3": 0,
-        "4": 0,
-        "5": 0,
-        "6": 0,
-        "7": 0,
-        "8": 0,
-        "9": 0,
-    }
-
-    for num in f:
-        if num:
-            count[num[0]] += 1
-
-    print(x)
-    for y in range(1,10):
-        print(str(y) + " = " + str(count[str(y)]/100) + "%")
+  f = open("accounts_" + str(x) + ".txt", "r")
+
+  count = {}
+  for i in range(1,10):
+    count[str(i)] = 0
+
+  for num in f:
+    if num:
+      count[num[0]] += 1
+  print(x)
+  for y in range(1,10):
+    print(str(y) + " = " + str(count[str(y)]/100) + "%")
+
+# STAGE 4 - Putting our code into a function - call 3 times
+
+def benford_calc(file_name):
+  f = open(file_name, "r")
+
+  count = {}
+  for i in range(1,10):
+    count[str(i)] = 0
+
+  for num in f:
+    if num:
+      count[num[0]] += 1
+  print("Results for:" + file_name)
+  for y in range(1,10):
+    print(str(y) + " = " + str(count[str(y)]/100) + "%")
+
+benford_calc("accounts_1.txt")
+benford_calc("accounts_2.txt")
+benford_calc("accounts_3.txt")
+
+# STAGE 5 - Looping through file names, so we don't need to call the function 3 times, as per stage 4
+def benford_calc(file_name):
+  f = open(file_name, "r")
+
+  count = {}
+  for i in range(1,10):
+    count[str(i)] = 0
+
+  for num in f:
+    if num:
+      count[num[0]] += 1
+  print("Results for:" + file_name)
+  for y in range(1,10):
+    print(str(y) + " = " + str(count[str(y)]/100) + "%")
+
+for x in range (1,4):
+  file_name = "accounts_" + str(x) + ".txt"
+  benford_calc(file_name)
+
+# STAGE 6 - Separating file function from data function 
+
+def benford_calc_file(file_name):
+  f = open(file_name, "r")
+  return benford_calc(f)
+
+def benford_calc(data):
+
+  count = {}
+  for x in range(1,10):
+    count[str(x)] = 0
+
+  for num in data:
+      if num:
+        count[str(num[0])] += 1
+  
+  return count 
+
+for x in range (1,4):
+  file_name = "accounts_" + str(x) + ".txt"
+  data = benford_calc_file(file_name)
+
+  print("Results for:" + file_name)
+
+  for y in range(1,10):
+      print(str(y) + " = " + str(data[str(y)]/100) + "%")
+
+# STAGE 7 - Sending in a list of random numbers 
+
+def benford_calc_file(file_name):
+  f = open(file_name, "r")
+  return benford_calc(f)
+
+def benford_calc(data):
+
+  count = {}
+  for x in range(1,10):
+    count[str(x)] = 0
+
+  for num in data:
+      if num:
+        count[str(num[0])] += 1
+  
+  return count 
+
+for x in range (1,4):
+  file_name = "accounts_" + str(x) + ".txt"
+  data = benford_calc_file(file_name)
+
+  print("Results for:" + file_name)
+
+  for y in range(1,10):
+      print(str(y) + " = " + str(data[str(y)]/100) + "%")
+
+random_nums = [str(random.randint(1,100)) for x in range(1,10001)]
+data = benford_calc(random_nums)
+print("Results for Random Nums")
+
+for y in range(1,10):
+      print(str(y) + " = " + str(data[str(y)]/100) + "%")
diff --git a/session_10/exercises/exercises_10.md b/session_10/exercises/exercises_10.md
@@ -1,12 +1,15 @@
 ## Section 10 Exercises
 
 # Section A
-1. Create a Person class, initialise it with a name. Create a method for the Person class that will say hello to the name.
-2. Create a Circle class, initialise it with a radius. Create two methods for the Circle class: get_area() and get_circumference() which give both respective areas and circumference, to 2 decimal placese.
+1. Create a class called Upper which has two methods called get_word and print_word.
+    - the get_word method should accept a string from the user
+    - the print_word method prints the string in upper case.
+2. Create a Person class, initialise it with a name. Create a method for the Person class that will say hello to the name.
+3. Create a Circle class, initialise it with a radius. Create two methods for the Circle class: get_area() and get_circumference() which give both respective areas and circumference, to 2 decimal placese.
 - Note: Area of a circle = &pi;r ** 2
 - Circumference = 2&pi;r
 - Use the round() function to get the answer to 2 decimal places
-3. Create a Employee class and initialise it with name and staff number.
+4. Create a Employee class and initialise it with name and staff number.
     - i. Make methods to:
     - display_info - It should display all the information of the employee.
     - set_department - It should assign the department to employee.
@@ -17,13 +20,12 @@
     - Given a person's first and last names:
     - Form the full_name method by simply joining the first and last name together, separated by a space.
     - Form the email_address by joining the first and last name together with a . in between, and follow it with @company.com at the end. Make sure everything is in lowercase.
-4. Create a Vehicle parent class, initialise it with, wheels, colour and a method to display all this information.
+    
+5. Create a Vehicle parent class, initialise it with, wheels, colour and a method to display all this information.
      - i. Create a Tesla (or any car) child classs and add a method to get the miles and a method to display all this information.
      - ii. Change the colour of the vehicle.
      - iii. Delete the wheels.
-5. Create a class called Upper which has two methods called get_word and print_word.
-    - the get_word method should accept a string from the user
-    - the print_word method prints the string in upper case.
+
 6. Create a Sandwich class with the attributes order_number and ingredients.
 - i. The ingredients attributes is given as a list - (Note: use list(<atrribute>) to enable this).
 - Only the ingredients attributes will be given as input.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# D5 - FizzBuzz – Write a program that prints the numbers from 1 to 100.`
	`1`	`+# B10 - FizzBuzz – Write a program that prints the numbers from 1 to 100.`
`2`	`2`	`# For multiples of three, print “Fizz” instead of the number and for multiples of five, print “Buzz”.`
`3`	`3`	`# For numbers which are multiples of both three and five, print “FizzBuzz”`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# A5 - Rock, Paper, Scissors - Create a simple rock, paper, scissors game which is run against computer.`
	`1`	`+# A11 - Rock, Paper, Scissors - Create a simple rock, paper, scissors game which is run against computer.`
`2`	`2`
`3`	`3`	`import random`
`4`	`4`