From 02cc0e063fcf1dbfc3dd3752a54cb20a3168c50d Mon Sep 17 00:00:00 2001
From: Leo Rangheard <leo.rangheard@etu.univ-amu.fr>
Date: Thu, 17 Sep 2020 01:46:58 +0200
Subject: [PATCH] Petites retouches, Fin de la classe Main. Sortie du programme
correcte
---
tp1/Cohort.java | 1 +
tp1/Main.java | 10 ++++++++++
tp1/Student.java | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/tp1/Cohort.java b/tp1/Cohort.java
index a36bdc8..2acf2ad 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 185824d..9ad5355 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 c47b3cf..e55ebcd 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());
}
--
GitLab