make the instructions consistent with curriculum

Author: l

sprint-5/01-predict.py

@@ -7,6 +7,7 @@ def double(value):
 def second(value):
     return value[1]
 
+# TASK 1:
 # 1. Predict what you think will happen with each of the following functions
 # 2. Then, test it, and explain in your own words what is actually happening and why
 # (feel free to comment out lines if you think they cause errors or crashes while testing)

sprint-5/02-playcomputer.js

@@ -24,4 +24,6 @@ rl.question("What URL should we fetch?\n> ", async (url) => {
 	rl.close();
 });
 
-// Task: Leave a comment on any line that you can see has some errors explaining what you think the problem is
+// TASK 2
+// Read through this file and predict what it does.
+// Leave a comment on any lines if you spot any errors, offering an explanation of the problem.

sprint-5/03-fix.py

@@ -3,7 +3,7 @@ def double(number):
 
 print(double(10))
 
-# Task:
-# What is the bug here?
-# How could you fix it?
-# Are there multiple possible ways to fix it?
+# TASK 3:
+# Read the code and see if you can find any bugs.
+# Write down what the bug is, and how would you fix it?
+# Are there multiple ways you could fix it?

sprint-5/04-addmypy.py

@@ -29,11 +29,9 @@ def format_pence_as_string(total_pence):
 
 print(f"The bank accounts total {total_string}")
 
-# TASK
+# TASK 4
 # This code contains bugs related to types. They are bugs mypy can catch.
-#
-# 1. Read this code to understand what it's trying to do.
-# 2. Install and set up mypy in a python virtual environment
-# 3. Add type annotations everywhere appropriate
-# 4. Run `mypy 04-addmypy.py`, and fix any errors
-# 5. When you're confident all of the type annotations are correct, and the bugs are fixed, run the code and check it works.
+# Read this code to understand what it's trying to do.
+# Add type annotations to the method parameters and return types of this code.
+# Run the code through mypy, and fix all of the bugs that show up.
+# When you're confident all of the type annotations are correct, and the bugs are fixed, run the code and check it works.

sprint-5/05-predict.py

@@ -14,7 +14,11 @@
 print(imran["name"])
 print(imran["address"])
 
-# Task:
-# Try running mypy on this file and see what happens
-# Predict what do you think will happen when you run this task?
+# TASK 5:
+# This code contains some untyped objects.
+# Try checking it with mypy before running the code and predict what you think will happen when you run the code.
+#
+# Prediction:
+#
 # Can you explain what actualy happens?
+#

sprint-5/06-classes.py

@@ -12,17 +12,16 @@ def __init__(self, name: str, age: int, preferred_operating_system: str):
 print(eliza.name)
 print(eliza.address)
 
-# Task 6.1:
-# Run mypy on this code
-# Fix the code so there are no errors in mypy or when it runs
+# TASK 6.1:
+# Run mypy and fix any errors.
 
-# Task 6.2:
+# TASK 6.2:
 # Create a new function in this file called likes_apple
 # It should take a person as parameter
 # It returns true if the preferred operating system is "macOS" or "iOS"
 # It should return false for any other preferred os
 # Add all the appropriate type annotations and test it has no errors in mypy
 
-# Task 6.3:
+# TASK 6.3:
 # Compare objects and classes
 # What are some advantages and disadvantages of each?

sprint-5/07-methods.txt

@@ -1,4 +1,5 @@
-Answer the following question:
+TASK 7:
+Answer the following questions:
 What is the difference between a method and a function?
 Can you give some advantages of methods over functions?
 

sprint-5/08-implement.py

@@ -4,27 +4,25 @@ def __init__(self, name: str, age: int, preferred_car_brand: str):
         self.age = age
         self.preferred_car_brand = preferred_car_brand
 
+def drivers_license_check(person: Person):
+  if person.is_adult() == True:
+    return 'Valid drivers license'
+
+  return 'This person is underage!'
+
 imran = Person("Imran", 22, "Mercedes")
-print(imran.is_adult())
+print(drivers_license_check(imran)) # should return 'Valid drivers license'
 
-# Task:
-# 1. Add the `drivers_license_check` free function and the `is_adult` method into the code
-# 	Make sure your code currently gives the expected output.
-#
-# 2. Change the `Person` class to take a date of birth
-#	Use the standard library's `datetime.date` class
-#	https://docs.python.org/3/library/datetime.html#datetime.date
-#	Store the `date of birth` in a field instead of `age` (it should be a `str`)
+# TASK 8:
 #
-# 3. Try to run your code
-#	How does this change break your code.
-#	What kind of error do you get?
-#	Is it helpful in identifying where your next change needs to be?
-#	Type your thoughts here:
+# Add an `is_adult` method into the class, and make sure your code gives the expected output.
 #
+# Change the `Person` class to take a date of birth using
+# the standard library's `datetime.date` class
+# https://docs.python.org/3/library/datetime.html#datetime.date))
+# and store the `date of birth` instead of `age`.
 #
+# Try to run your code now and observe how this change breaks your code.
+# What kind of error do you get? Is it helpful in identifying where your next change needs to be?
 #
-#
-# 4. Update the `is_adult` method so the error is fixed.
-#	Using the `drivers_license_check` function check everything runs as expected
-
+# Now update only the `is_adult` method to fix the error and check everything works correctly.

sprint-5/09-encapsulation.py

@@ -1,3 +1,17 @@
+# TASK 9
+#
+# Having done some research on encapsulation, think about the benefits.
+#
+# Think of some examples and in your own words write down some benefits and trade-offs of using encapsulation in classes:
+#
+#
+#
+
+# STRETCH TASK 9.1
+#
+# In the following  class, make the name property private
+# Add a `get_name()` method to allow read-only access.
+
 class Person:
     def __init__(self, name: str, age: int):
         self.name = name
@@ -17,18 +31,3 @@ def is_adult(self):
 print(eliza.age) # fails
 print(imran.__age) # fails
 print(eliza.is_adult()) # works and prints False
-
-# Task 9
-# Read through Python encapsulation
-# https://www.w3schools.com/python/python_encapsulation.asp
-# and think about some of the benefits that encapsulation can add to a class.
-#
-# Do some further research of your own to learn about encapsulation.
-#
-# Think of some examples and in your own words write down some benefits and trade-offs of using encapsulation in classes:
-#
-#
-#
-
-# Stretch Task
-# Make the name property private, and add a get_name() method to make it read only.

sprint-5/10-dataclass.py

@@ -1,12 +1,14 @@
-# Task 9.1:
+# TASK 10.1:
 # Copy the code you have so far from task 08-implement.py
-# Convert this to a dataclass
-# Test that the dataclass works with mypy, with equality checks
+# Convert your existing `Person` class from task 8 into a value type using `@datatype`
+# so you can print the class (and see it's type and properties)
+# and compare class instances that are identical.
+# Make sure your `is_adult` method and `drivers_license_check` free function both work as normal.
 
-# Task 9.2:
-# Add a greeting method that says "Hello, <person name>!"
+# TASK 10.2:
+# Make a new method on your Person class - `greet()` which should return `"Hello <person name>!"` when used.
 
-# Task 9.3:
+# TASK 10.3:
 # Read the @datatype documentation here: https://docs.python.org/3/library/dataclasses.html
-# Explain what does `frozen=True` do to the class?
+# Explain what `frozen=True` does to the class?
 # What other options could you play around with and explore? Offer suggestions for any that would be useful here.