1 files changed, 20 insertions, 7 deletions
diff --git a/src/Q5/Citizen.java b/src/Q5/Citizen.java
index b10e6a9..748a848 100644
--- a/src/Q5/Citizen.java
+++ b/src/Q5/Citizen.java
@@ -1,30 +1,43 @@
 package Q5;
 
+import java.util.*;
+
 public class Citizen {
   private int citizenId;
   private int educationalQualification;
-  private int id;
   public static final int DOCTORATE = 4;
   public static final int HIGH_SCHOOL = 1;
   public static final int POSTGRADUATE = 3;
   public static final int UNDERGRADUATE = 2;
+  private static int id = 0;
+
+  public Citizen(int citizenId) {
+    this(citizenId, Citizen.generateEducationalQualification());
+  }
 
-  public Citizen(int id, int qualification) {
-    this.id = id;
+  public Citizen(int citizenId, int qualification) {
+    this.citizenId = citizenId;
     this.educationalQualification = qualification;
   }
 
+  public int getEducationalQualification() {
+    return this.educationalQualification;
+  }
+
   public static int generateEducationalQualification() {
-    return 0;
+    return new Random().nextInt(4) + 1;
   }
 
   public static int generateId() {
-    return 0;
+    id++;
+    return id;
   }
 
   public static String convert(int i) {
-    return "";
+    return String.valueOf(i);
   }
 
-  public static void resetId() {}
+  public static void resetId() {
+    id = 0;
+  }
 }