Solved problem with getOldestPerson when several people have same age

Bazard · Tom Duchêne · commit bd055ebd5d0c · 2016-04-26T10:21:19.000+02:00
diff --git a/library/AugmentaP5.jar b/library/AugmentaP5.jar
diff --git a/reference/allclasses-frame.html b/reference/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>All Classes (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/reference/allclasses-noframe.html b/reference/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>All Classes (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/reference/augmentaP5/AugmentaP5.html b/reference/augmentaP5/AugmentaP5.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>AugmentaP5 (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/reference/augmentaP5/AugmentaPerson.html b/reference/augmentaP5/AugmentaPerson.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>AugmentaPerson (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/reference/augmentaP5/InteractiveArea.html b/reference/augmentaP5/InteractiveArea.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>InteractiveArea (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/reference/augmentaP5/RectangleF.html b/reference/augmentaP5/RectangleF.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>RectangleF (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/reference/augmentaP5/package-frame.html b/reference/augmentaP5/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>augmentaP5 (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/reference/augmentaP5/package-summary.html b/reference/augmentaP5/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>augmentaP5 (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/reference/augmentaP5/package-tree.html b/reference/augmentaP5/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>augmentaP5 Class Hierarchy (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/reference/constant-values.html b/reference/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>Constant Field Values (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/reference/deprecated-list.html b/reference/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>Deprecated List (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/reference/help-doc.html b/reference/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>API Help (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/reference/index-all.html b/reference/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>Index (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/reference/index.html b/reference/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>Javadocs: AugmentaP5</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
diff --git a/reference/overview-tree.html b/reference/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
 <title>Class Hierarchy (Javadocs: AugmentaP5)</title>
-<meta name="date" content="2016-04-25">
+<meta name="date" content="2016-04-26">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/src/augmentaP5/AugmentaP5.java b/src/augmentaP5/AugmentaP5.java
@@ -967,6 +967,12 @@ public AugmentaPerson getOldestPerson(){
 		if (people.get(key).age > bestAge) {
 			bestAge = people.get(key).age;
 			bestPerson = key;
+		} 
+		// If several persons have the same oldest age, take the one with smallest pid
+		else if (people.get(key).age == bestAge){
+			if(people.get(key).pid < people.get(bestPerson).pid){
+				bestPerson = key;
+			}
 		}
 	}
 	AugmentaPerson p = null;
@@ -986,6 +992,12 @@ public AugmentaPerson getNewestPerson(){
 			bestAge = people.get(key).age;
 			bestPerson = key;
 		}
+		// If several persons have the same newest age, take the one with greatest pid
+		else if (people.get(key).age == bestAge){
+			if(people.get(key).pid > people.get(bestPerson).pid){
+				bestPerson = key;
+			}
+		}
 	}
 	AugmentaPerson p = null;
 	if (bestPerson != -1){
