Refactor functions to use dictionary parameter instead of global vari…

refactoring/initial_global.py

@@ -1,61 +1,63 @@
-def average_age():
+def average_age(group):
     """Compute the average age of the group's members."""
     all_ages = [person["age"] for person in group.values()]
     return sum(all_ages) / len(group)
 
 
-def forget(person1, person2):
+def forget(group, person1, person2):
     """Remove the connection between two people."""
     group[person1]["relations"].pop(person2, None)
     group[person2]["relations"].pop(person1, None)
+    return group
 
-
-def add_person(name, age, job, relations):
+def add_person(group, name, age, job, relations):
     """Add a new person with the given characteristics to the group."""
     new_person = {
         "age": age,
         "job": job,
         "relations": relations
     }
     group[name] = new_person
+    return group
 
-
-group = {
-    "Jill": {
-        "age": 26,
-        "job": "biologist",
-        "relations": {
-            "Zalika": "friend",
-            "John": "partner"
-        }
-    },
-    "Zalika": {
-        "age": 28,
-        "job": "artist",
-        "relations": {
-            "Jill": "friend",
-        }
-    },
-    "John": {
-        "age": 27,
-        "job": "writer",
-        "relations": {
-            "Jill": "partner"
+if __name__ == "__main__":
+    group = {
+        "Jill": {
+            "age": 26,
+            "job": "biologist",
+            "relations": {
+                "Zalika": "friend",
+                "John": "partner"
+            }   
+        },
+        "Zalika": {
+            "age": 28,
+            "job": "artist",
+            "relations": {
+                "Jill": "friend",
+            }
+        },
+        "John": {
+            "age": 27,
+            "job": "writer",
+            "relations": {
+                "Jill": "partner"
+            }
         }
     }
-}
 
-nash_relations = {
-    "John": "cousin",
-    "Zalika": "landlord"
-}
+    nash_relations = {
+        "John": "cousin",
+        "Zalika": "landlord"
+    }
 
-add_person("Nash", 34, "chef", nash_relations)
+# Altering functions
+add_person(group,"Nash", 34, "chef", nash_relations)
 
-forget("Nash", "John")
+forget(group,"Nash", "John")
 
-if __name__ == "__main__":
-    assert len(group) == 4, "Group should have 4 members"
-    assert average_age() == 28.75, "Average age of the group is incorrect!"
-    assert len(group["Nash"]["relations"]) == 1, "Nash should only have one relation"
-    print("All assertions have passed!")
+# Assertions
+assert len(group) == 4, "Group should have 4 members"
+assert average_age(group) == 28.75, "Average age of the group is incorrect!"
+assert len(group["Nash"]["relations"]) == 1, "Nash should only have one relation"
+print("All assertions have passed!")

refactoring/initial_person_class.py

@@ -16,7 +16,7 @@ def add_connection(self, person, relation):
 
     def forget(self, person):
         """Removes any connections to a person"""
-        pass
+        self.connections.pop(person, None)
 
 
 def average_age(group):
@@ -26,15 +26,26 @@ def average_age(group):
 
 
 if __name__ == "__main__":
-    # ...then create the group members one by one...
+    # create people
     jill = Person("Jill", 26, "biologist")
+    zalika = Person("Zalika", 28, "artist")
+    john = Person("John", 27, "writer")
+    nash = Person("Nash", 34, 'chef')
 
-    # ...then add the connections one by one...
-    # Note: this will fail from here if the person objects aren't created
+    # add connections
     jill.add_connection(zalika, "friend")
+    jill.add_connection(john, "partner")
+
+    zalika.add_connection(jill, 'friend')
+    john.add_connection(jill, 'partner')
+
+    nash.add_connection(john, 'cousin')
+    nash.add_connection(zalika, 'landlord')
 
     # ... then forget Nash and John's connection
     nash.forget(john)
+
+
     # Then create the group
     my_group = {jill, zalika, john, nash}
 

refactoring/initial_two_classes.py

@@ -18,7 +18,7 @@ def __init__(self):
 
     def size(self):
         """Return how many people are in the group."""
-        pass
+        return len(self.members)
 
     def contains(self, name):
         """Check whether the group contains a person with the given name.
@@ -29,20 +29,35 @@ def contains(self, name):
     def add_person(self, name, age, job):
         """Add a new person with the given characteristics to the group."""
         self.members.append(Person(name, age, job))
+        if name not in self.connections:
+            self.connections[name] = {}
 
     def number_of_connections(self, name):
         """Find the number of connections that a person in the group has"""
-        pass
+        if name in self.connections:
+            return len(self.connections[name])
+        return 0
 
     def connect(self, name1, name2, relation, reciprocal=True):
         """Connect two given people in a particular way.
         Optional reciprocal: If true, will add the relationship from name2 to name 1 as well
         """
-        pass
+        if name1 not in self.connections:
+            self.connections[name1] ={}
+        if name2 not in self.connections:
+            self.connections[name2]= {}
+
+        self.connections[name1][name2]= relation
+
+        if reciprocal:
+            self.connections[name2][name1] = relation
 
     def forget(self, name1, name2):
         """Remove the connection between two people."""
-        pass
+        if name1 in self.connections and name2 in self.connections[name1]:
+            self.connections[name1].pop(name2)
+        if name2 in self.connections and name1 in self.connections[name2]:
+            self.connections[name2].pop(name1)
 
     def average_age(self):
         """Compute the average age of the group's members."""
@@ -55,8 +70,18 @@ def average_age(self):
     my_group = Group()
     # ...then add the group members one by one...
     my_group.add_person("Jill", 26, "biologist")
+    my_group.add_person("Zalika", 28, "artist")
+    my_group.add_person("John", 27, "writer")
+    my_group.add_person("Nash", 34, "chef")
+
     # ...then their connections
     my_group.connect("Jill", "Zalika", "friend")
+    my_group.connect("Jill", "John", "partner")
+    my_group.connect("Nash", "John", "cousin")
+    my_group.connect("Nash", "Zalika", "landlord")
+
+
+
     # ... then forget Nash and John's connection
     my_group.forget("Nash", "John")