Tabulation Equality Definition Improvements

- Update School equality and hash code (include level)
- Update Student equality and hash code (remove scores)
- Add error logging upon duplicate student insertion

src/contestTabulation/Main.java

@@ -216,7 +216,9 @@ private static void updateDatabase(Level level, SpreadsheetEntry spreadsheet, Se
 						}
 					}
 
-					school.addStudent(student);
+					if (!school.addStudent(student)) {
+						System.err.println("!!! Duplicate student detected !!! " + student);
+					}
 				}
 				catch (Exception e) {
 					e.printStackTrace();

src/contestTabulation/School.java

@@ -89,8 +89,8 @@ protected void addAnonScores(Test test, ArrayList<Score> scores) {
 		}
 	}
 
-	protected void addStudent(Student student) {
-		students.add(Objects.requireNonNull(student));
+	protected boolean addStudent(Student student) {
+		return students.add(Objects.requireNonNull(student));
 	}
 
 	private HashMap<Student, Score> calculateScore(final Subject subject) {
@@ -190,13 +190,16 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		School other = (School) obj;
+		if (level != other.level) {
+			return false;
+		}
 		if (name == null) {
 			if (other.name != null) {
 				return false;
 			}
-			else if (!name.equals(other.name)) {
-				return false;
-			}
+		}
+		else if (!name.equals(other.name)) {
+			return false;
 		}
 		return true;
 	}
@@ -255,6 +258,7 @@ public int getTotalScore() {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
+		result = prime * result + (level == null ? 0 : level.hashCode());
 		result = prime * result + (name == null ? 0 : name.hashCode());
 		return result;
 	}

src/contestTabulation/Student.java

@@ -58,7 +58,7 @@ public int compare(Student s1, Student s2) {
 	@Persistent private int grade;
 	@Persistent private String name;
 	@Persistent private School school;
-	@Persistent(serialized = "true", defaultFetchGroup = "true") @Unowned private Map<Subject, Score> scores = new HashMap<Subject, Score>();
+	@Persistent(serialized = "true") @Unowned private Map<Subject, Score> scores = new HashMap<Subject, Score>();
 
 	@PrimaryKey private Key key;
 
@@ -106,14 +106,6 @@ else if (!name.equals(other.name)) {
 		else if (!school.equals(other.school)) {
 			return false;
 		}
-		if (scores == null) {
-			if (other.scores != null) {
-				return false;
-			}
-		}
-		else if (!scores.equals(other.scores)) {
-			return false;
-		}
 		return true;
 	}
 
@@ -157,7 +149,6 @@ public int hashCode() {
 		result = prime * result + grade;
 		result = prime * result + (name == null ? 0 : name.hashCode());
 		result = prime * result + (school == null ? 0 : school.hashCode());
-		result = prime * result + (scores == null ? 0 : scores.hashCode());
 		return result;
 	}