Skip to content

Commit bd055eb

Browse files
BazardTom Duchêne
Bazard
authored and
Tom Duchêne
committed
Solved problem with getOldestPerson when several people have same age
1 parent cd1b46e commit bd055eb

17 files changed

+41
-29
lines changed

‎library/AugmentaP5.jar

28 Bytes
Binary file not shown.

‎reference/allclasses-frame.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>All Classes (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎reference/allclasses-noframe.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>All Classes (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎reference/augmentaP5/AugmentaP5.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>AugmentaP5 (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../script.js"></script>
1010
</head>

‎reference/augmentaP5/AugmentaPerson.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>AugmentaPerson (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../script.js"></script>
1010
</head>

‎reference/augmentaP5/InteractiveArea.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>InteractiveArea (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../script.js"></script>
1010
</head>

‎reference/augmentaP5/RectangleF.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>RectangleF (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../script.js"></script>
1010
</head>

‎reference/augmentaP5/package-frame.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>augmentaP5 (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../script.js"></script>
1010
</head>

‎reference/augmentaP5/package-summary.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>augmentaP5 (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../script.js"></script>
1010
</head>

‎reference/augmentaP5/package-tree.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>augmentaP5 Class Hierarchy (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../script.js"></script>
1010
</head>

‎reference/constant-values.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>Constant Field Values (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎reference/deprecated-list.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>Deprecated List (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎reference/help-doc.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>API Help (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎reference/index-all.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>Index (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎reference/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>Javadocs: AugmentaP5</title>
77
<script type="text/javascript">
88
targetPage = "" + window.location.search;

‎reference/overview-tree.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_66) on Mon Apr 25 17:53:51 CEST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_66) on Tue Apr 26 10:18:10 CEST 2016 -->
66
<title>Class Hierarchy (Javadocs: AugmentaP5)</title>
7-
<meta name="date" content="2016-04-25">
7+
<meta name="date" content="2016-04-26">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎src/augmentaP5/AugmentaP5.java

+12
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,12 @@ public AugmentaPerson getOldestPerson(){
967967
if (people.get(key).age > bestAge) {
968968
bestAge = people.get(key).age;
969969
bestPerson = key;
970+
}
971+
// If several persons have the same oldest age, take the one with smallest pid
972+
else if (people.get(key).age == bestAge){
973+
if(people.get(key).pid < people.get(bestPerson).pid){
974+
bestPerson = key;
975+
}
970976
}
971977
}
972978
AugmentaPerson p = null;
@@ -986,6 +992,12 @@ public AugmentaPerson getNewestPerson(){
986992
bestAge = people.get(key).age;
987993
bestPerson = key;
988994
}
995+
// If several persons have the same newest age, take the one with greatest pid
996+
else if (people.get(key).age == bestAge){
997+
if(people.get(key).pid > people.get(bestPerson).pid){
998+
bestPerson = key;
999+
}
1000+
}
9891001
}
9901002
AugmentaPerson p = null;
9911003
if (bestPerson != -1){

0 commit comments

Comments
 (0)