Week 9 - Refactoring

week09/refactoring/initial_global.py

@@ -1,16 +1,16 @@
-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)
 
 
-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,
@@ -50,12 +50,12 @@ def add_person(name, age, job, relations):
     "Zalika": "landlord"
 }
 
-add_person("Nash", 34, "chef", nash_relations)
+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 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!")
+    print("All assertions have passed!")

week09/refactoring/initial_person_class.py

@@ -16,7 +16,8 @@ def add_connection(self, person, relation):
 
     def forget(self, person):
         """Removes any connections to a person"""
-        pass
+        if person in self.connections:
+            self.connections.pop(person)
 
 
 def average_age(group):
@@ -28,10 +29,21 @@ def average_age(group):
 if __name__ == "__main__":
     # ...then create the group members one by one...
     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
     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)
@@ -41,4 +53,4 @@ def average_age(group):
     assert len(my_group) == 4, "Group should have 4 members"
     assert average_age(my_group) == 28.75, "Average age of the group is incorrect!"
     assert len(nash.connections) == 1, "Nash should only have one relation "
-    print("All assertions have passed!")
+    print("All assertions have passed!")

week09/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.
@@ -32,17 +32,43 @@ def add_person(self, name, age, job):
 
     def number_of_connections(self, name):
         """Find the number of connections that a person in the group has"""
-        pass
+
+        if not self.contains(name):
+            print("No connections with {}".format(name))
+
+        return len(self.connections[name])
 
     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
+
+        # "jill", "zalika", "friend"    jill: {zalika, friend}
+
+        if reciprocal: 
+
+            if name1 in self.connections:
+                self.connections[name1].update({name2: relation})
+            else:
+                self.connections.update({name1 : {name2: relation}})
+
+            if name2 in self.connections:
+                self.connections[name2].update({name1: relation})
+            else:
+                self.connections.update({name2 : {name1: relation}})
+
+        else:
+
+            if name1 in self.connections:
+                self.connections[name1].update({name2: relation})
+            else:
+                self.connections.update({name1 : {name2: relation}})
+
 
     def forget(self, name1, name2):
         """Remove the connection between two people."""
-        pass
+        self.connections[name1].pop(name2, None)
+        self.connections[name2].pop(name1, None)
 
     def average_age(self):
         """Compute the average age of the group's members."""
@@ -53,10 +79,19 @@ def average_age(self):
 if __name__ == "__main__":
     # Start with an empty group...
     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")