From e6728e677148c6d4746c4118db8bcb67162b96cb Mon Sep 17 00:00:00 2001
From: Premal Varsani <ucappv0@ucl.ac.uk>
Date: Wed, 9 Dec 2020 20:18:05 +0000
Subject: [PATCH] https://github.com/UCL-RITS/rse-classwork-2020/issues/168

---
 week09/refactoring/initial_two_classes.py | 37 +++++++++++------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/week09/refactoring/initial_two_classes.py b/week09/refactoring/initial_two_classes.py
index a54d1b3..d463c50 100644
--- a/week09/refactoring/initial_two_classes.py
+++ b/week09/refactoring/initial_two_classes.py
@@ -1,66 +1,65 @@
 class Person:
     """A class to represent an individual."""
-
     def __init__(self, name, age, job):
         """Create a new Person with the given name, age and job."""
         self.name = name
         self.age = age
         self.job = job
-
-
 class Group:
     """A class that represents a group of individuals and their connections."""
-
     def __init__(self):
         """Create an empty group."""
         self.members = []
         self.connections = {}
-
     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.
         Useful to throw errors if we try to add a person who already exists or forget someone.
         """
         return any(member.name == name for member in self.members)
-
     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))
-
     def number_of_connections(self, name):
         """Find the number of connections that a person in the group has"""
-        pass
-
+        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
-
+        if reciprocal == True:
+            self.connections[name1] = {name2 : relation}
+            self.connections[name2] = {name1 : relation}
+        else:
+            self.connections[name1] = {name2 : relation}
     def forget(self, name1, name2):
         """Remove the connection between two people."""
-        pass
-
+        self.connections.pop(name2,None)
     def average_age(self):
         """Compute the average age of the group's members."""
         all_ages = [person.age for person in self.members]
         return sum(all_ages) / self.size()
-
-
 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("zalika", "Jill", "friend")
+    my_group.connect("John", "Jill", "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")
-
+    
     assert my_group.size() == 4, "Group should have 4 members"
     assert my_group.average_age() == 28.75, "Average age of the group is incorrect!"
     assert my_group.number_of_connections("Nash") == 1, "Nash should only have one relation"
-    print("All assertions have passed!")
+    print("All assertions have passed!")
\ No newline at end of file