diff --git a/tp1/Cohort.java b/tp1/Cohort.java index a36bdc8f8191887de110c61d5a70c4cb3b89a56a..2acf2ad0a1ebd4b30c53274027abfc9fdcf339c0 100644 --- a/tp1/Cohort.java +++ b/tp1/Cohort.java @@ -44,6 +44,7 @@ public class Cohort { */ public void printStudentsResults() { printName(); + System.out.println(); for (Student student : students){ student.printResults(); } diff --git a/tp1/Main.java b/tp1/Main.java index 185824dd55c4a42adf72eae2a8f98e761dda9b8e..9ad535521a0f5f134e30b486a460b8f04d40ba46 100644 --- a/tp1/Main.java +++ b/tp1/Main.java @@ -1,4 +1,14 @@ public class Main { public static void main(String[] args){ + Student leoRangheard = new Student("Leo", "Rangheard"); + Student ahmedSouissi = new Student("Ahmed", "Souissi"); + leoRangheard.addResult("Programmation 2", new Grade(19)); + leoRangheard.addResult("Structures Discrètes", new Grade(16)); + ahmedSouissi.addResult("Programmation 2", new Grade(20)); + ahmedSouissi.addResult("Structures Discrètes", new Grade(15)); + Cohort l2info = new Cohort("L2 Informatique"); + l2info.addStudent(leoRangheard); + l2info.addStudent(ahmedSouissi); + l2info.printStudentsResults(); } } diff --git a/tp1/Student.java b/tp1/Student.java index c47b3cf88c34c08afe0cc8590bed7be421c837ab..e55ebcde1ce5d312ea9d29c47dc2d05edf66b20a 100644 --- a/tp1/Student.java +++ b/tp1/Student.java @@ -108,7 +108,7 @@ public class Student { } private void printAverageGrade() { - System.out.println(this.getAverageGrade().toString()); + System.out.println("Note Moyenne = " + this.getAverageGrade().toString()); }