diff --git a/bin/main/App.class b/bin/main/App.class index cd4c249671243a8e3abee930563b1706eb4ecafb..180c708b85c1e693d6b0e9d4c11bebded621aa9b 100644 Binary files a/bin/main/App.class and b/bin/main/App.class differ diff --git a/src/main/java/App.java b/src/main/java/App.java index 2a7b8c6c3509705628155f9717104abc31f70701..73f799aeca5d6b0b45ab71b53de73b2593c3fdd8 100644 --- a/src/main/java/App.java +++ b/src/main/java/App.java @@ -1,10 +1,24 @@ public class App { + public static void main(String[] args){ + + Student me = new Student("Lou", "Bergogne"); Student toto = new Student("Toto", "Totoro"); - Grade toto_UEpro = new Grade(0.0); - Grade toto_Sport = new Grade(5.0); - toto.addResult("UE_pro", toto_UEpro); - toto.addResult("toto_Sport", toto_Sport); - toto.printResults(); + + Grade meAdvancedProg = new Grade(18.0); + Grade totoAdvencedProg = new Grade(5.0); + Grade meGeCo = new Grade(16.5); + Grade totoGeCo = new Grade(11.75); + + me.addResult("Programmation avancée", meAdvancedProg); + toto.addResult("Programmation avancée", totoAdvencedProg); + me.addResult("Génomique comparative et évolutive", meGeCo); + toto.addResult("Génomique comparative et évolutive", totoGeCo); + + Cohort m2Dlad = new Cohort("M2 Bio-informatique (DLAD)"); + m2Dlad.addStudent(me); + m2Dlad.addStudent(toto); + + m2Dlad.printStudentsResults(); } } diff --git a/src/main/java/Cohort.java b/src/main/java/Cohort.java index 8c49e5f89a88d034ce94498cd8f5646177de4801..d779e4e9ce368917e29365ac2d55c7b49083df98 100644 --- a/src/main/java/Cohort.java +++ b/src/main/java/Cohort.java @@ -43,7 +43,7 @@ public class Cohort { System.out.println(this.toString()); for (Student student : this.students) { student.printResults(); - System.out.println(); + System.out.println(); // for one line break } }