From 11b6c68b5a2391a05a93f6c1c728cf210072b078 Mon Sep 17 00:00:00 2001 From: Teo Blaise Kaplanski <teobk@air-de-teo.home> Date: Wed, 16 Sep 2020 20:50:36 +0200 Subject: [PATCH] test --- tp1/.classpath | 6 + tp1/.idea/dictionaries/teobk.xml | 3 + tp1/.idea/encodings.xml | 4 + tp1/.idea/misc.xml | 57 +++++++ tp1/.idea/modules.xml | 8 + tp1/.idea/tp1.iml | 9 ++ tp1/.idea/workspace.xml | 270 +++++++++++++++++++++++++++++++ tp1/.project | 17 ++ tp1/Cohort.class | Bin 0 -> 2762 bytes tp1/Cohort.java | 68 ++++++++ tp1/Grade.class | Bin 0 -> 2149 bytes tp1/Grade.java | 35 +++- tp1/Main.class | Bin 0 -> 998 bytes tp1/Main.java | 13 ++ tp1/Student.class | Bin 0 -> 3023 bytes tp1/Student.java | 21 +++ tp1/TeachingUnit.class | Bin 0 -> 1216 bytes tp1/TeachingUnit.java | 24 +++ tp1/TeachingUnitResult.class | Bin 0 -> 940 bytes tp1/TeachingUnitResult.java | 2 + tp1/TestCohort.class | Bin 0 -> 2158 bytes tp1/TestCohort.java | 66 ++++++++ tp1/TestGrade.class | Bin 0 -> 1988 bytes tp1/TestGrade.java | 0 tp1/TestStudent.class | Bin 0 -> 2799 bytes tp1/TestStudent.java | 87 ++++++++++ tp1/TestTeachingUnitResult.class | Bin 0 -> 1703 bytes tp1/TestTeachingUnitResult.java | 40 +++++ 28 files changed, 728 insertions(+), 2 deletions(-) create mode 100644 tp1/.classpath create mode 100644 tp1/.idea/dictionaries/teobk.xml create mode 100644 tp1/.idea/encodings.xml create mode 100644 tp1/.idea/misc.xml create mode 100644 tp1/.idea/modules.xml create mode 100644 tp1/.idea/tp1.iml create mode 100644 tp1/.idea/workspace.xml create mode 100644 tp1/.project create mode 100644 tp1/Cohort.class mode change 100644 => 100755 tp1/Cohort.java create mode 100644 tp1/Grade.class mode change 100644 => 100755 tp1/Grade.java create mode 100644 tp1/Main.class mode change 100644 => 100755 tp1/Main.java create mode 100644 tp1/Student.class mode change 100644 => 100755 tp1/Student.java create mode 100644 tp1/TeachingUnit.class create mode 100644 tp1/TeachingUnit.java create mode 100644 tp1/TeachingUnitResult.class mode change 100644 => 100755 tp1/TeachingUnitResult.java create mode 100644 tp1/TestCohort.class create mode 100644 tp1/TestCohort.java create mode 100644 tp1/TestGrade.class mode change 100644 => 100755 tp1/TestGrade.java create mode 100644 tp1/TestStudent.class create mode 100644 tp1/TestStudent.java create mode 100644 tp1/TestTeachingUnitResult.class create mode 100644 tp1/TestTeachingUnitResult.java diff --git a/tp1/.classpath b/tp1/.classpath new file mode 100644 index 0000000..3f3893a --- /dev/null +++ b/tp1/.classpath @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path=""/> + <classpathentry kind="output" path=""/> +</classpath> diff --git a/tp1/.idea/dictionaries/teobk.xml b/tp1/.idea/dictionaries/teobk.xml new file mode 100644 index 0000000..694b205 --- /dev/null +++ b/tp1/.idea/dictionaries/teobk.xml @@ -0,0 +1,3 @@ +<component name="ProjectDictionaryState"> + <dictionary name="teobk" /> +</component> \ No newline at end of file diff --git a/tp1/.idea/encodings.xml b/tp1/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/tp1/.idea/encodings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Encoding" addBOMForNewFiles="with NO BOM" /> +</project> \ No newline at end of file diff --git a/tp1/.idea/misc.xml b/tp1/.idea/misc.xml new file mode 100644 index 0000000..bded3c4 --- /dev/null +++ b/tp1/.idea/misc.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectInspectionProfilesVisibleTreeState"> + <entry key="Project Default"> + <profile-state> + <expanded-state> + <State /> + <State> + <id>Android</id> + </State> + <State> + <id>CorrectnessLintAndroid</id> + </State> + <State> + <id>GPathGroovy</id> + </State> + <State> + <id>Groovy</id> + </State> + <State> + <id>JSON and JSON5</id> + </State> + <State> + <id>Java</id> + </State> + <State> + <id>LintAndroid</id> + </State> + <State> + <id>PerformanceLintAndroid</id> + </State> + <State> + <id>Plugin DevKit</id> + </State> + <State> + <id>Probable bugsJava</id> + </State> + <State> + <id>SecurityLintAndroid</id> + </State> + <State> + <id>XML</id> + </State> + <State> + <id>XPath</id> + </State> + </expanded-state> + <selected-state> + <State> + <id>Android</id> + </State> + </selected-state> + </profile-state> + </entry> + </component> + <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" /> +</project> \ No newline at end of file diff --git a/tp1/.idea/modules.xml b/tp1/.idea/modules.xml new file mode 100644 index 0000000..30868bc --- /dev/null +++ b/tp1/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/tp1.iml" filepath="$PROJECT_DIR$/.idea/tp1.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/tp1/.idea/tp1.iml b/tp1/.idea/tp1.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/tp1/.idea/tp1.iml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/tp1/.idea/workspace.xml b/tp1/.idea/workspace.xml new file mode 100644 index 0000000..8167f3c --- /dev/null +++ b/tp1/.idea/workspace.xml @@ -0,0 +1,270 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ChangeListManager"> + <list default="true" id="356dda69-a3a0-4b04-bc78-3f3066602f2d" name="Default Changelist" comment="" /> + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> + <option name="SHOW_DIALOG" value="false" /> + <option name="HIGHLIGHT_CONFLICTS" value="true" /> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> + <option name="LAST_RESOLUTION" value="IGNORE" /> + </component> + <component name="CoverageDataManager"> + <SUITE FILE_PATH="coverage/tp1$null.ic" NAME="null Coverage Results" MODIFIED="1600077124422" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" /> + </component> + <component name="FileEditorManager"> + <leaf> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Cohort.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" selection-start-line="1" selection-end-line="1" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Grade.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="439"> + <caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" /> + <folding> + <element signature="e#576#577#0" expanded="true" /> + <element signature="e#604#605#0" expanded="true" /> + <element signature="e#785#786#0" expanded="true" /> + <element signature="e#808#809#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/TestGrade.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="240"> + <caret line="16" column="57" lean-forward="true" selection-start-line="16" selection-start-column="57" selection-end-line="16" selection-end-column="57" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Main.java"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + </file> + </leaf> + </component> + <component name="IdeDocumentHistory"> + <option name="CHANGED_PATHS"> + <list> + <option value="$PROJECT_DIR$/Grade.java" /> + </list> + </option> + </component> + <component name="ProjectFrameBounds" fullScreen="true"> + <option name="width" value="1440" /> + <option name="height" value="900" /> + </component> + <component name="ProjectView"> + <navigator proportions="" version="1"> + <foldersAlwaysOnTop value="true" /> + </navigator> + <panes> + <pane id="PackagesPane" /> + <pane id="Scope" /> + <pane id="ProjectPane"> + <subPane> + <expand> + <path> + <item name="tp1" type="b2602c69:ProjectViewProjectNode" /> + <item name="tp1" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="tp1" type="b2602c69:ProjectViewProjectNode" /> + <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> + </panes> + </component> + <component name="PropertiesComponent"> + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="project.structure.last.edited" value="Project" /> + <property name="project.structure.proportion" value="0.0" /> + <property name="project.structure.side.proportion" value="0.2" /> + <property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.spelling" /> + </component> + <component name="RunDashboard"> + <option name="ruleStates"> + <list> + <RuleState> + <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> + </RuleState> + <RuleState> + <option name="name" value="StatusDashboardGroupingRule" /> + </RuleState> + </list> + </option> + </component> + <component name="RunManager"> + <configuration name="null" type="JUnit" factoryName="JUnit" nameIsGenerated="true"> + <module name="tp1" /> + <option name="ALTERNATIVE_JRE_PATH" value="11" /> + <option name="MAIN_CLASS_NAME" value="" /> + <option name="METHOD_NAME" value="" /> + <option name="TEST_OBJECT" value="class" /> + <option name="PARAMETERS" value="" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + </component> + <component name="SvnConfiguration"> + <configuration>$USER_HOME$/.subversion</configuration> + </component> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="356dda69-a3a0-4b04-bc78-3f3066602f2d" name="Default Changelist" comment="" /> + <created>1600071827614</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1600071827614</updated> + </task> + <servers /> + </component> + <component name="TestHistory"> + <history-entry file="null - 2020.09.14 at 11h 40m 58s.xml"> + <configuration name="null" configurationId="JUnit" /> + </history-entry> + <history-entry file="null - 2020.09.14 at 11h 52m 07s.xml"> + <configuration name="null" configurationId="JUnit" /> + </history-entry> + </component> + <component name="ToolWindowManager"> + <frame x="0" y="0" width="1440" height="900" extended-state="0" /> + <editor active="true" /> + <layout> + <window_info id="Image Layers" /> + <window_info id="Designer" /> + <window_info id="UI Designer" /> + <window_info id="Capture Tool" /> + <window_info id="Favorites" side_tool="true" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" /> + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> + <window_info anchor="bottom" id="Version Control" /> + <window_info anchor="bottom" id="Terminal" /> + <window_info anchor="bottom" id="Event Log" side_tool="true" /> + <window_info anchor="bottom" id="Messages" /> + <window_info anchor="bottom" id="Message" order="0" /> + <window_info anchor="bottom" id="Find" order="1" /> + <window_info anchor="bottom" id="Run" order="2" weight="0.32902467" /> + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> + <window_info anchor="bottom" id="TODO" order="6" /> + <window_info anchor="right" id="Palette" /> + <window_info anchor="right" id="Theme Preview" /> + <window_info anchor="right" id="Capture Analysis" /> + <window_info anchor="right" id="Palette	" /> + <window_info anchor="right" id="Maven" /> + <window_info active="true" anchor="right" id="Coverage" side_tool="true" visible="true" weight="0.3298611" /> + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> + </layout> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/Cohort.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" selection-start-line="1" selection-end-line="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Main.java"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/Grade.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="439"> + <caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" /> + <folding> + <element signature="e#576#577#0" expanded="true" /> + <element signature="e#604#605#0" expanded="true" /> + <element signature="e#785#786#0" expanded="true" /> + <element signature="e#808#809#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/TestGrade.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="240"> + <caret line="16" column="57" lean-forward="true" selection-start-line="16" selection-start-column="57" selection-end-line="16" selection-end-column="57" /> + </state> + </provider> + </entry> + </component> + <component name="masterDetails"> + <states> + <state key="GlobalLibrariesConfigurable.UI"> + <settings> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="JdkListConfigurable.UI"> + <settings> + <last-edited>11</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ProjectJDKs.UI"> + <settings> + <last-edited>11</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ProjectLibrariesConfigurable.UI"> + <settings> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ScopeChooserConfigurable.UI"> + <settings> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + </states> + </component> +</project> \ No newline at end of file diff --git a/tp1/.project b/tp1/.project new file mode 100644 index 0000000..9cdc304 --- /dev/null +++ b/tp1/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>tp1</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/tp1/Cohort.class b/tp1/Cohort.class new file mode 100644 index 0000000000000000000000000000000000000000..b6a903a71cb9b78a81ca3acaa9ea4ca7404d3474 GIT binary patch literal 2762 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 literal 0 HcmV?d00001 diff --git a/tp1/Cohort.java b/tp1/Cohort.java old mode 100644 new mode 100755 index e199e79..87551eb --- a/tp1/Cohort.java +++ b/tp1/Cohort.java @@ -24,6 +24,7 @@ public class Cohort { * @param student the student to be added to the cohort */ public void addStudent(Student student){ + students.add(student); } /** @@ -31,6 +32,7 @@ public class Cohort { * @return the list of students of the cohort. */ public List<Student> getStudents(){ + return students; } /** @@ -38,9 +40,16 @@ public class Cohort { * grade. */ public void printStudentsResults(){ + System.out.println(name); + for (Student Student : students){ + Student.printResults(); + } + + } private void printName(){ + System.out.println(name); } /** @@ -49,5 +58,64 @@ public class Cohort { */ @Override public String toString() { + return name; + } + + + public int numberOfStudentsThatValidated(){ + int i = 0; + for (Student Student : students){ + Grade averageGrade = Student.getAverageGrade(); + if (averageGrade.getValue() >= 10) + i += 1; + } + + return i; + } + + + public int numberOfAbsent(){ + int i = 0; + for (Student Student : students){ + Grade averageGrade = Student.getAverageGrade(); + if (averageGrade.isAbsent()) + i += 1; + } + return i; + } + + public double noteMax(){ + double noteMax = 0; + for (Student Student : students){ + Grade grade = Student.getAverageGrade(); + if (grade.getValue() > noteMax) + noteMax = grade.getValue(); + } + return noteMax; + } + + + public double noteMin(){ + double noteMin = 20; + for (Student Student : students){ + Grade grade = Student.getAverageGrade(); + if (grade.getValue() < noteMin) + noteMin = grade.getValue(); + } + return noteMin; + } + + + public Grade AverageCohort() { + double i = 0; + double sum = 0; + for (Student Student : students){ + if(Student.getAverageGrade().isAbsent()) + sum =+ 0; + else + sum += Student.getAverageGrade().getValue(); + i += 1; + } + return new Grade(sum/i); } } diff --git a/tp1/Grade.class b/tp1/Grade.class new file mode 100644 index 0000000000000000000000000000000000000000..5d01f09dc0b857add1a90e872bc94a2d208dc2b0 GIT binary patch literal 2149 zcmX^0Z`VEs1_mpJJaz^qMg~^*qQsO`b_Nzk27#=^vPAuy#JqHU|D>$c<Pt^(USG!u zPv21Ac=sSj7gt6GMo&ftUg!M0;*!L?lCZ>_(o|*!1_lvE2G%kVhmnENg^__Hv)D1I zI5n??k%2Lak%7%7GcU8mj*)>?!zD^HjFExGIX@+pi-DOzkcWYnL5PuoSwl07lYx;z zgolBXfeXYE<6+=t;9+Fo_sPsl^()OyN-YXWOv*`RWDxSnPfpAUODxI+@u7k&B^jB; zj125PV9!`HGO%d4XohhyFfz!3tl(p0;7Ct}xEE}j3z&>zWZ)>t4=yRn%u8ov5Yf=| zK?DFq)S81qg^_{T(J7dnL5-0?99`b2G&3h9wTO#BgF%a(K@%kiAtvxJXfx<AGO&Y# z$3KmcK~%#9i#=QnstkG{r|N@LV7fyyjDx|Dk%3v?$N;3&n1{iH!IY7KEwP{=H7|vc zL01Ed9t<I<bFD!}nDa0wGAJ=J@CKJ8CTII57C?iNC$TKGC^0=19FmL-l2C(7OEPox zeKLzntTo|*%o&`So|jlsT9nGjpoFf@2CB>su7R7uj=_PQ!Jd(U4;+qgBY7Ac8Js}L zrX;l}u_V8UkwFX=7hpA>P;qN+1{Vf5b_Q2Q1|ftAFj*c3cLone29~_kiW2nLgd}IM zelH#dZw3WM2KJ1^V!zai5>O)X1%<pcBLiDHC@&N<G6+C|4s1Kv(~Jzv#ihB742+qK z4D8SlVq_3QO^cNUsn9@_MAMH53`PdF)WXuloMN<ihPqHQ3Y0G*co-rXK&dl5wZu6m zvACF#K^PVy;Oq$&wB}-nVTfaAh($?uF8QTNIjKAh@eB!!4D8AIxdn-!_+iy>anbZ- zWMIq(Wg&3rflY$i%gDeA_B$g3M@C|C1}KAqvxq0ij&vS|42Dcb27wf?*&+Ep`FZJ1 znI*-LeCEZ-z*3T$TfoS`=*7su6`WsMl$`383CgTo;8dgsvW`KKfsp}JSTHk4F|abQ zF)%W)GcYhPF>o*lfpR?q1A`DK&oeMEfC>O!20jKx27U$xhDZix1{MYe27ayW3<6r} zTN#A4WVbSiZUk!<2WtaKi!rb;h%<09NHFj*NHRz;Ffb^9t>b5qWRPM20e-MGj3A@H z7BMq0GVn4;L#?rAU;(RV*HUNR&LD#@o{NErfq_AWfsH{HY^)fV&ki@19cnDdFd?X6 zrVK0$AdA?w_*k$Qroh0)pa?dM2cisW7$bumgFMs-eFi459IMtA2I2K^&w|2@fk6{V zGb>y(H-iFPGb3EH=o&Q5dRR3pGAKbc$3PvgsI`SbbS49vkn)Dz462bJckEzL-_D>b zWU!6FXd8ps1_lNOW(H6c@PUKQl7XGUih+y48p#4hsOv1iY8km0I2kM%tQeRWtii6b z0Y~vo1~zbFaNzUc^U~VMV9Us0#kQP5T9R!igEJ$;0R~1ZR&`0%EeyiR9-92gULbK# zMuu7cAMR#gj8xam-_GD;#VW}Pau6sLFfb@Fa4;}1xG^v>xHGUYcrZvacrqw6crmCm zcrX|;_%PTq_<|j2!obSFz~I2($KVfkj~zn*1E@q`VX$EcWB}zwX$Bq!CUBCqWng9q z0<(e{7#JWi2hthBz`y|Vo-hN`e+GUAR(1wEW@ZL<1{VefaRx?)P=+vQz;;2Cn7)?w zG6q(bHQL7*__Ve$gllhO2w%#;%DhJV00X11&K3q?NLWYD0;ysK#UCV?g}@mhl7XEe zia~-QhC!Ag4(tm^O4o-5H3Ne_Ln1>GsPbbFVn}9?VqgNhkDGyoosaPkg9tkVD0QST zq(a^0!N3ZRKLLofX%6!80t&Uw9UzOD!0`*o1L+JL3>jbxA$dRmY9R*$2SXM^HrUi0 Ia4_Zq09c26e*gdg literal 0 HcmV?d00001 diff --git a/tp1/Grade.java b/tp1/Grade.java old mode 100644 new mode 100755 index f25893a..03cbd1d --- a/tp1/Grade.java +++ b/tp1/Grade.java @@ -10,6 +10,8 @@ public class Grade { */ private static final int MAXIMUM_GRADE = 20; private final double value; + private final boolean isAbsent; + /** * Constructs a grade with a value equals to the specified {@code value}. @@ -17,10 +19,18 @@ public class Grade { * @param value the value of the constructed grade */ - public Grade(double value) { + public Grade(double value, boolean isAbsent) { this.value = value; + this.isAbsent = isAbsent; } - + + public Grade(double value) { + this(value, false); + } + + public Grade() { + this(0., true); +} /** * Returns the value of the grade as a double. * @@ -28,6 +38,14 @@ public class Grade { */ public double getValue() { + return value; + } + + + public boolean isAbsent(){ + return isAbsent; + + } /** @@ -36,6 +54,9 @@ public class Grade { */ @Override public String toString() { + if (isAbsent) + return "ABS"; + return value + "/20"; } /** @@ -46,6 +67,14 @@ public class Grade { * @return a grade corresponding to the mean of grade in {@code grades} */ public static Grade averageGrade(List<Grade> grades){ + double sum = 0; + double i = 0; + for (Grade Grade : grades) { + sum += Grade.value; + i += 1; + } + Grade average = new Grade(sum / i); + return average; } /** @@ -74,4 +103,6 @@ public class Grade { long temp = Double.doubleToLongBits(value); return (int) (temp ^ (temp >>> 32)); } + + } diff --git a/tp1/Main.class b/tp1/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..4587c3cc7c7b26b237eae1213a7b60a2bc86bd52 GIT binary patch literal 998 zcmX^0Z`VEs1_mnzH+BXlMg|t&#LPT)1{OvJfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00SMg|t={FGEK24)6M9tKthHbw@1pUk{eztY^K)S{5Yq?}Yn1|gsP<iwn? z#G*_PA1cUFl95@=$iU_Uvdfy0fh9LFGmnu$Oe5L{VP|kjQD$DcwPqMQgCHXVdvHl< zN@`vS2ZJyp19M1fJ_my+BZIJ0PGV+ps)DYrf_Gv;PGVkhb|x2t0E0NlJraxz>Kd2^ zVv1;naWF_RGO+vRXC&sPrf@LGFfwp>B<AIpCTFB_Fvu}7@COv-rxzvW<|dY8=I1FG zu`?(zGO)TAC8ngZIhZhj0T+Wjg9^xARYnFD4HwNYkVDjY7&I6(85uYeQ&NIbi%WA# z7#U=+ISOo+HOM8}j11xe!6ikd$t9&lsl^H@nZ?OPhgX!O77MaD=z*<bU~`axFxVLk z85!7|^E2{`N;nvdK`~&Y;F*_}Uj%Y$VQDHCg8_pn$W>;H45C;p207D!!GedulEI3R zfh#d31sc$d3_Kb>P_{Khl?@MrEhv^n3W_rGN}zJZ5N{PTGO#2Tr57_Y2xEyvMg~r} zS)e4ApPLVgexuC1w0uSe4j+gItQi@&g7Zs@l2hF>L1~8*lsxo6DS|<ffsuh3>}4hf zMo?N~U}RutU|`T^U}RuqU|?X?+RnhSk%57MiGhoOfq@My$jHFWz`(!*X0tNzFz_-k zFmN*PG4Mk*KV)EIU}0cjDBR5;5Gf=iB(j}B%m>Vt6q4S~Am*zrB)gkIK2n51aXW+Z zHU>3qAuSZX4oqGLBCi9J*MsnPGZ;h)8Et1U@zd4b#$c|i10uFDSR)*&2X-Pe0}lfW zg9HN`g9ZaTg9QTzg9igALj(giLlOfILplR5Lk<H!Lji*TShW_!(F}GB_F(U&G6*v` iFfcMmFhnvqGB_|WF(fhYGdM9gGcYqSGPr;P#T5XWRL{l$ literal 0 HcmV?d00001 diff --git a/tp1/Main.java b/tp1/Main.java old mode 100644 new mode 100755 index 185824d..3aba635 --- a/tp1/Main.java +++ b/tp1/Main.java @@ -1,4 +1,17 @@ public class Main { public static void main(String[] args){ + Student Teo = new Student("Teo","Blaise -- Kaplanski"); + Student Momo = new Student("Mohamed", "Hanouche"); + + Teo.addResult("Programmation 2", new Grade(20)); + Teo.addResult("Structures discrètes", new Grade(20)); + Momo.addResult("Programmation 2", new Grade(15)); + Momo.addResult("Structures discrètes", new Grade(7)); + + Cohort L2info = new Cohort("L2 Informatique"); + L2info.addStudent(Teo); + L2info.addStudent(Momo); + + L2info.printStudentsResults(); } } diff --git a/tp1/Student.class b/tp1/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..056f53ef8a01b3775ad9f06b557cfe9920c8d4cd GIT binary patch literal 3023 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 BZkYf8 literal 0 HcmV?d00001 diff --git a/tp1/Student.java b/tp1/Student.java old mode 100644 new mode 100755 index 9898a66..a7cc11f --- a/tp1/Student.java +++ b/tp1/Student.java @@ -31,7 +31,12 @@ public class Student { * @param grade the grade of the added result */ public void addResult(String teachingUnitName, Grade grade){ + results.add(new TeachingUnitResult(teachingUnitName, grade)); } + + public List<TeachingUnitResult> getResults() { + return results; + } /** * Returns a string representation of the student in the format first name last name. @@ -39,6 +44,7 @@ public class Student { */ @Override public String toString() { + return firstName +" "+ lastName; } @@ -48,6 +54,11 @@ public class Student { * @return the grades of the student */ public List<Grade> getGrades(){ + List<Grade> grades = new ArrayList<>(); + for (TeachingUnitResult result : results ) { + grades.add(result.getGrade()); + } + return grades; } /** @@ -56,6 +67,7 @@ public class Student { * @return the average grade of the student */ public Grade getAverageGrade() { + return Grade.averageGrade(getGrades()); } @Override @@ -81,12 +93,21 @@ public class Student { * the average grade of the student. */ public void printResults(){ + printName(); + for (TeachingUnitResult result : results) { + System.out.println(result.toString()); + } + printAverageGrade(); + System.out.println(); + } private void printName() { + System.out.println(toString()); } private void printAverageGrade() { + System.out.println("note moyenne :" + getAverageGrade()); } } diff --git a/tp1/TeachingUnit.class b/tp1/TeachingUnit.class new file mode 100644 index 0000000000000000000000000000000000000000..66c5d8fbffcff885445a09ac8833effbd97b5779 GIT binary patch literal 1216 zcmX^0Z`VEs1_mnzcXkFQMh2dc)WqbB%)Io_yv!1I1{OvJfvm)`ME#t^ymWp4q^#8B z5=I85P*+9<5g%lwL8-;1IVIMN3@pz1scDQ1jGl}PY&MyBnI(3N3=$gH)Ou=$ft9DE zaxpM7@bWNlGVn1nFl%UraWXJ62=FklGO&SILOcxY3>=IM{63j^seYxoNvTC4iAg!B zj0{3P`N@enVTnbVAU;%(r6eP>n2~`G#Y$^N27$z~)S|@nRQIC9lvIc#B{h7&o+~ZM z%+dGBEH1Iu^Z`p-Gcs@nXQt;RmXsEyGBRkQtFu8h+zzgfn?Z&_j-5f4k%14@WF7{2 z1_ee2j?9wOqQsK?B1Q%=4NWB5J)z>(+zd(#D(no(j0{2u6JWAD45|!jj0`M!sTC!R z3?eWSkRr#Li$Q}yi=9D}kwFMEes~zP8FUyKIMP!~!2V=p;M9P5nTtV>!GN7XpOJwT zEXTuO$Y2Cf8<v<;nhK5@7m)Kzco<9>%orKiGZKsaz%F6d(2N4<w*W<=B_jiih6^Zi zc}kEH6C;BFl7GRW&B(x9T$;<s!05urz?jL%z?u$<8%73hXjDOBi5(s%VyN+5S&#~i za|JY$G2(}jfj77$F*(~eu>h)tD>%QjC^^+F6O@nyk%LMP6z&X)42%rS3=9lR3{0Se z2xhS}aDZt>22KVp21W*M1_p*m1}3mNey!~cJX+dY8ThqiwlWBA1S=F~U|<kpU}0cj z;9y{3-~?;qW8h{GVPIfTfM{b7We{Tk0e-MGj0_A6{GjyCz{J4FAkHAcz{DU4HcJX* z9U~h98v_>u149s>C!ZyY_D%+AMg}YP<qX=A>^m7085s^RFj}!mvTb4D-^QT6jX~Fv zLqmci*;9f=YYT&5d$J`9NS!ew!>s=ocQfckYDlo;Z)Y$EY1zQQz`())a<Li%Cj$cm z9|IEu$V~zaG7N$YnhZh=dJMu077PLmP7I<9{tRMZUwAOEgIojmMG%7(gEa#q0~134 zgAIc%IPiQK>=<krSQum&WEhwj#2DBZG#U6A>=|qsI2imHm>C=x92wXcoER7wco;zb t2btl_z{udjz`!8J!1SL%fPsyjfsvg-hMAdxok59#L7jn-!4(`TZU7oz_VfS% literal 0 HcmV?d00001 diff --git a/tp1/TeachingUnit.java b/tp1/TeachingUnit.java new file mode 100644 index 0000000..33bb77c --- /dev/null +++ b/tp1/TeachingUnit.java @@ -0,0 +1,24 @@ +import java.util.List; + +public class TeachingUnit { + private TeachingUnitResult UE; + private int Coef; + + + public TeachingUnit (TeachingUnitResult UE, int Coef) { + this.UE = UE; + this.Coef = Coef; + } + + public Grade averageGradeCoef(List<TeachingUnit> teachingUnit) { + double sum = 0; + double i = 0; + for (TeachingUnit TeachingUnit : teachingUnit ) { + double grade = TeachingUnit.UE.getGrade().getValue(); + sum += grade; + i += Coef; + } + Grade averageCoef = new Grade(sum / i); + return averageCoef; + } +} diff --git a/tp1/TeachingUnitResult.class b/tp1/TeachingUnitResult.class new file mode 100644 index 0000000000000000000000000000000000000000..d9033c3f85af543e368a69a148d625aa9fb83598 GIT binary patch literal 940 zcmX^0Z`VEs1_mnzV|E56Mh2mf)WqbB%)Io_yv&lI)Z)^d5_Sd_Mh1bb#Ii*FoW#6z zegCAa)Z`LI27wYJrGAOIsf-LlJ_u#OB}JKe>DG)4tm#FGDXEMM>^|-whBYGtn@wh3 zW{DjmgNz2I2B<2{Fh&Lz=lqmZE(T@>ULFQc20lgxW)00SP6kE>0Uicc1~w2&h=+ll zfrF8O-zPIK)vq)+DYYmhF)0V^mi*+zoUp{AOb{O`$WoG#S<J{F;)Cf;Yeoi+^wbit z8yOimH8i0PVPxPa$%lA`kwHX56Vt`)3^I%i;^;niD$UGENiE`HkYi9_XOKq;LWprZ z42ld&j125$i8-aI{%MR1YRJI>31(|7_Hi*tGpK+<M3s?26j=+zSZmEN4hD5b24)2- z1&~rr9tJH2ZAJ#R#Dap<yc9+TU2J+Vyajc?HOL5EkP&)lI&nG>S*HOHgCv6#BLi1( zerZv1s#_)~YQ!-^Uk?;~42lel49pA+3``6{pa^DQU=RXDF9QPuGXo<7Cj%D)BLg=B z14ASO6IdO;)^-LSE$yug{8~C&83Z?iwF-l^u|P>-22KVM20jK+1`!4Z1_g*V22lnv z1`yx}Tf@k}z`zf-h>3xbL7YJXYK=YvBLhf|Rci}_;0CziY+ylIuz@^aHY?OXMv!Nr znmxd7W?+!p%^)4AwS|Fy2ZQW(24x|&Z44S9^R_YQY-7+zH&qSER5`e*hG4sm0Fj%< AvH$=8 literal 0 HcmV?d00001 diff --git a/tp1/TeachingUnitResult.java b/tp1/TeachingUnitResult.java old mode 100644 new mode 100755 index c052586..eebf876 --- a/tp1/TeachingUnitResult.java +++ b/tp1/TeachingUnitResult.java @@ -26,6 +26,7 @@ public class TeachingUnitResult { * @return the grade associated to the result */ public Grade getGrade() { + return grade; } /** @@ -34,5 +35,6 @@ public class TeachingUnitResult { */ @Override public String toString() { + return teachingUnitName + " : " + grade; } } diff --git a/tp1/TestCohort.class b/tp1/TestCohort.class new file mode 100644 index 0000000000000000000000000000000000000000..69adf5c2fe6f4dc7b79cc286dc40a39b91ff33a5 GIT binary patch literal 2158 zcmX^0Z`VEs1_mpJN_GY&Mh32s)Z!B7{EYmf5_Sd_Mh1bb#Ii*FoW#6zegCAa)Z`LI z1~!|_yv!0iMh0dL%`ip=7U%qwR4xW)22LIZRt7dk27aH+yi~u^+@#c^ki?{%R7M6N zpZw&+oUp{AOb{O`$WoG#S<J}5<Abo#nvsDeH!(AhkwHu&+6Q5Ca7j^SUb?kr7#9O0 z11E?O;$aYG5MgBCD@iRbNlZxzE-6h(%_{-BDT<Rpj6s5(K^(>P!Ii}&skuB1k_=Le z49xkZC5#NB5GykC^#h7B^GbqCic%AEtvMKE7#T!B=0bu&!Ac=Hzo;lRxrB>BjzNK) zL7tI880<DwjXVsB3`&d)>;)jRa`G4%L^UAhg98ul1r7!kMg}ny<1_Q%7BDiX@i3@^ ze8vM(5|R(m$HAZp)dUkkxQc^8n~^~RS+#<d0*aBkJPdjuBl$s!+*3=SfmO`GV8F;A zi6)3_un{AJG^RA%Y(@r_#G>?KMh0Olk;TZs0@BLJz#CkWn4ImKSOAW9b_NSZ26m_m zI2f!L8Q61D6>>9kGdUP+7#TQIQj5X7VlD=A20KuSvS(ya#}bm*!j_%Ek&%H75^Wp| z&WsHF0Y&-gMTxn&i6xo&c?w2c3=RygAVZZvEO#CT4+c+01}@|T#G~N@b)B_l7(0VE zEV4^WGIR7Di;5B}eKLznxEQ<`IJp`87y{TC{23Ye!07?31SHGD5Xcb3$iSSKl7f~D zAbH4IGYVvX2oFOjLl`3icRC_Y7#V~#G$DS28)pr&D1wI}5@aY_YGG+&PBADgMuU=E z3=SK@7#Y}o6D#v`lkyoEIN^R`WZ**y6C*|j4j)K}fpT9?W^oB4g8;e%7#YM+vv6fW zDmXeB8KlwF+Q6-{v*ut(V`N}W%FN3y2KhIGhar<8i;;n&1e&ZF8AM>7Mb0E#3^@!D z><qc6`4?OUa4_UEGBEpO=5R0+GBPlSR%LQ96f-igRORRAf+Rvg1yU4*lb%|_$iNkx zUs{x$>Xr#AhxidijUFh*7!(;88JHPBfR%v}RC+NmGO#l+Fz7QdGB7eQFtBQEXW-b# zz`(%7z{SA8zy=m%Vc=$9VBi6>Ss8d3co`TNI2rgD_@SDQF)%SOF)%QM?`B|(+|D52 zqrHtma3%xaCI(R<>1_<M%Ne*qOyzA1vfA4iRG~5&2pKJij1E*rA0cD7jX@UV9A>a{ z^uP{bW8h$5XW(bxV31<qVo+k>VbEmYWiVmjXRu)qWN>B>V(?=SVF+W80IL>*IE}%W z!GwW<frG)H!IXiQfsw(Cfq{XSf$a~26gvYWyCAzDI|C!Ah=uy;B?Bu13&c<6kwTV2 z*4r6ueReZAL<%`=XK?Y=(cZ@3wwu8#ayx^MpYCo3xSE{|zDx|^I@=h6b$2p^Gcn9$ zU}agei9u9%8$;A422qg2HijtXH4F?4EMPxrfk|lw9tIf(F$P%%X$Cn4Wd?Z$QwBu_ zCk7=37X}puZw6I{PzE)yf3zUZf<^-mgEvDgLmUGmgBXJ&Lp(zQ0~3QXg9$?-LlOfs zLozhlAR;LY%wS*hF);pPaA9XKXJ>F=XYgZS1eL!~Z)Y$tgTqS-?A6rm3@)I^OczSs z#*jS|<Q1^XA+aF@b_vM++6-b0It&sF`d}AALR<>!LM{dYhBSr*Xozz#F#Z8mRSpb{ zpduP->jh|FyMY5TPpAMM*hM%38=?klV1r!<30oxw4h9AW69ygzQwA{xGX`k}a|UGw z3kFjLO9m$fD+U(^8?cKZVd@5TF%N?kLkToY4H!zHVXDkfh8CtE5!_)~4$eds00HdF AsQ>@~ literal 0 HcmV?d00001 diff --git a/tp1/TestCohort.java b/tp1/TestCohort.java new file mode 100644 index 0000000..3846e13 --- /dev/null +++ b/tp1/TestCohort.java @@ -0,0 +1,66 @@ +import java.util.ArrayList; +import java.util.List; + +public class TestCohort { + public static void main(String[] args){ + TestCohort test = new TestCohort(); + if(test.testaddStudent() == true) + System.out.println("testCohort : correct"); + else + System.out.println("testCohort : incorrect"); + + if(test.testToString() == true) + System.out.println("testToString : correct"); + else + System.out.println("testToString : incorrect"); + + if(test.testGetStudents() == true) + System.out.println("testGetStudents : correct"); + else + System.out.println("testGetStudents : incorrect"); + + + + } + + public boolean testaddStudent(){ + Student Mayombo = new Student("le mimi", "des mimis"); + Cohort Programmation2 = new Cohort("Programmation 2"); + Programmation2.addStudent(Mayombo); + List<Student> list = new ArrayList<Student>(); + list.add(new Student("le mimi", "des mimis")); + + if(Programmation2.getStudents().equals(list)) + return true; + else + System.out.println(list); + System.out.println(Programmation2.getStudents()); + return false; + } + + public boolean testToString(){ + Cohort binks = new Cohort("binks"); + if (binks.toString().equals("binks")) + return true; + else + + return false; + + } + + public boolean testGetStudents(){ + Student LUV = new Student("Lil","Uzi"); + Cohort Zoom = new Cohort("zoom"); + Zoom.addStudent(LUV); + List<Student> get = new ArrayList<Student>(); + get.add(new Student("Lil","Uzi")); + if(Zoom.getStudents().equals(get)) + return true; + else + return false; + + } + + + +} diff --git a/tp1/TestGrade.class b/tp1/TestGrade.class new file mode 100644 index 0000000000000000000000000000000000000000..03883118515ae73ef09968c5cefd1d723f3f0b28 GIT binary patch literal 1988 zcmX^0Z`VEs1_mpJVs-{5Mh4E1)Z!BNqQsO`b_Nzk27#=^vPAuy#JqHU|D>$c<Pt^( zHk-`6%o00B24)S-Fh&Lz=lqmZE(T@>P96qU1~x_pexJ;|RKL>Pq|~C2#H5^5Mg}3D z{N%)(u*9NF5FaYYQj(Eb%*ep)1Gmtck%1*QF*A>mK};js2Vrq=Nl|8Ay0vB)7Xu>$ zCx{T@VGw2zVPxPb0Xa6cBrGwfG!^WiC{6}31_^csaTKQqR~DC~=JGH|GDtBpFz1(+ zFfxcjEXd5)4=BpaD+w+sN=?kQ=3tOvWRL)x3JL<Sxe8Va$@xV^smUc=3~~$#><sdZ z48ma7p=#z~P-IYIWMD4<nU|Bt$RMf#u>%}>a8GbBs4y}}VOWuw2e*WgL5+t&9qzx7 ze288S22Dl=F_1=>2*PC?4BAk4Bgvr{smsHl2QpFsWPoE?YEfc(Dma=s7!089K^8?e z+K7=s23?nel>*#&Mh2F|qV!@$24O6*#>l_|(#y!e8(fl@ob8)f0FHll1`9?8R<Hxu z95flgfQ!ML!3LCwY#A9?G+aROZO&lN!{ET+$jHEvjvUP{j0~*lpcrCgVD|x=V$I0F zT$Y%_$iV2r=AfMh1|S1Hc^JGHycrodN}$2W$RMJji5W2*48DvE?1sjA=K4kkTnzpU zf$R(csEG)i40#xW7=jrY*is8i6LX5uA{mlJtTm$;8MwjDgTx#t2Y?d{a!O!l2#2Mk z(vr*^eaE7r#7dvc;u0=~Fa}OG2NiIbFo1Y5JPffQOPLc>QrH|6AQEg28Zd?lj3EJG zfc%}#!;ry{$;iNyh!oe143f|^3APeso3$o1{Ma1Sz=4*=$iR}5S&YacV5M-^Su--Q zLycr)5JSz_l?AEb$Yo@Zg9I?DRvV~IcGipxT*3LJMaijdnV|B44_*Z5fr5!ak%5tc z8SE8S21Zb!!obMD&cMK+&%nsQ$iTqBs<oYgV<Q6t0}}%m0|NsaSdf{4n}LCW2h3(= z;9=lpU|`^6;A7y2YCgum#K6SBz!1KhfiZGBgMg3rHU`0&41AjyM1`ccF~}}w;07_3 zw=u|SZ(~q}%4i^Dv>-A%P#JxMjNvv0S&(y>!OqbGJA{>igMp2KpMjl0ih+|siGiCz zlYxi9gn^I2hCzVAnL&`jk3pCrj6npfS`6Ye24e<LTyik@Gng{)GB7fjF)%RjGO+z& zkYZ<GWEW%?WM^Om6@5@YRWh(JurM$%$n0h?j}&3B+|FPP@|K;ah6sb@^jQq7ENht8 zFfcGc945xV%D})N&cMwe!63jO$soZX#URBX19pG{IKX9~;l|A%$l%1_%)rPXz`(=c z!r;ol1a=B11LI$iQ_Pte7(pcz)EPAlEMV=j5NEhSo#ElDBjmG<!EYv3cPKD$Gbl0$ zFeoudGAJ`hGpHiDLl*81A-Fqu8A2FBq3+-YxkH+r!JM7JpMeonut8n&hJh9AlJwmS zVUgPzB7C$VPKw;lV7-kYIvmQ4L**u*a+6TGDKPF1hBRNDZ47oI3|UBF%L0ycEikFc zz`>x!AkLu8pvIuXV9KD&;KHEC5X_*@5W!%;kj!Ankjh|;<j-`dKRFoU8FCnM85kKN n82B0T7@QfH81kX186sBzO$=b4r?NAIu``%6FftT^GeHpm*DIDu literal 0 HcmV?d00001 diff --git a/tp1/TestGrade.java b/tp1/TestGrade.java old mode 100644 new mode 100755 diff --git a/tp1/TestStudent.class b/tp1/TestStudent.class new file mode 100644 index 0000000000000000000000000000000000000000..d7a8d047261c12fd1766dbaccf74cc7cc00844de GIT binary patch literal 2799 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 OqdgfI8J2+yisb-o-D5ET literal 0 HcmV?d00001 diff --git a/tp1/TestStudent.java b/tp1/TestStudent.java new file mode 100644 index 0000000..2e719fa --- /dev/null +++ b/tp1/TestStudent.java @@ -0,0 +1,87 @@ +import java.util.ArrayList; +import java.util.List; + +public class TestStudent { + public static void main(String[] args){ + TestStudent test = new TestStudent(); + if(test.testaddResult() == true) + System.out.println("testAddResult : correct"); + else + System.out.println("testAddResult : incorrect"); + + if(test.testToString() == true) + System.out.println("testToString : correct"); + else + System.out.println("testToString : incorrect"); + + if(test.testGetGrades() == true) + System.out.println("testGetGrades : correct"); + else + System.out.println("testGetGrades : incorrect"); + + if(test.testgetAverageGrade() == true) + System.out.println("testAverageGrades : correct"); + else + System.out.println("testAverageGrades : incorrect"); + + + + } + + + + public boolean testaddResult(){ + Student Freeze = new Student("Freeze", "Corleone"); + Freeze.addResult("LMF", new Grade(19)); + List<TeachingUnitResult> list = new ArrayList<TeachingUnitResult>(); + list.add(new TeachingUnitResult("LMF", new Grade(19))); + + if(Freeze.getResults().equals(list)) + return true; + else + System.out.println(list); + System.out.println(Freeze.getResults()); + return false; + } + + + public boolean testToString(){ + Student PopSmoke = new Student("Pop", "Smoke"); + String studentName = PopSmoke.toString(); + if(studentName.equals("Pop Smoke")) + return true; + else + System.out.println(PopSmoke); + return false; + + } + + public boolean testGetGrades(){ + Student Blueface = new Student("Blueface", "Baby"); + Blueface.addResult("L.A", new Grade(12)); + List<Grade> Bgrade = new ArrayList<>(); + Bgrade.add(new Grade(12)); + if(Blueface.getGrades().equals(Bgrade)) + return true; + else + + return false; + + + } + + public boolean testgetAverageGrade(){ + Student Sosa = new Student("Chief","Keef"); + Sosa.addResult("Chiraq", new Grade(3)); + Sosa.addResult("Drill", new Grade(20)); + Grade average = Sosa.getAverageGrade(); + if(average.getValue() == 11.5) + return true; + else + return false; + } + + + + +} diff --git a/tp1/TestTeachingUnitResult.class b/tp1/TestTeachingUnitResult.class new file mode 100644 index 0000000000000000000000000000000000000000..94f0712dd0cc882f7c1bd5e35423f1f56f2438c1 GIT binary patch literal 1703 zcmX^0Z`VEs1_mpJ6m|wCMh3Bv)Z&tm)WqbB%)Io_yv&lI)Z)^d5_Sd_Mh1bb#Ii*F zoW#6zegCAa)Z`LI1~!|_yv!0iMh0dL%`ip=7U%qwR4xW)22LIZRt7dk27aH+yi~u^ z+@#c^ki?{%R7M6NpZw&+oUp{AOb{O`$WoG#S<J{F;e*|FYeoi^+{Da0Mg}pBXdi?t zf=h}r^U|#~!?+k288|_N5D$Yeg9sx7Pf2QVNqTCDdr@LaD%f>VoD5<N66_4(DE<hp zEG|jS<zbLykYZ$D&Mz%tWDtc|keRO^P?VWh5?oT0nwV?N!63uPAPh1UY@~vfLUMjl zQEGAt7lRyw0y~2|BZDy5VW|3e7!(<l7#Y|LKt|={F*1m1K#T{6BHaBP3@VHaqR6Ia z=E2QpWKiQ_P>1^}Bp;%UgF%y#K@6k^CW3Gj2ZJ^vg9Mr!+(<?Smc*j;VnzmGEP=_$ zzyi|8$iN$1l9-(Bn^*vjBX$NuMg}3wgu%gJ%*epN&S1*OzzPl-HU~`xFyLY^VXy=x z11m-b77Z6rBpEQ+fCOwA8Dy{ogAZ6gI5rI!?0Fa*7#tZHI1rJ@si6r~0y5f}hrxxx z6`~+4F{cy~%Pyeka0i9D2U=J|Qmi#7m9nNoQiX^Qrhlv%8JNowa~K)ep>{Dcu#_d{ z7&0<2x^OTAFf#B56y>KECFbTPmSpDVDHyRiXs3Yz7lQ#q2oFOjLl`3iM+r2N7#Tz~ zG%;hGgCT;EK@!a*1uF$ZV?A?yBLgmmD25nzhG^8J3Qp`i46zJxj0|k4g{6r(#W?&J z#mFF3f{};8DIzgBBQFyvV?)vsC|iP4FLJVEWZ(+UFD*(=b;|^0TxsliQxBw%L6L!x zff*d_EDVgGtk1y6z|O$HpwGa_z{tSBz^b*Kfny^B0|OHS7Xt$W8(5Huft!JWfd|ZH zW#D1pWnf_7WZ+}qhiab3z{J4Bz`$U;n}IQMJA;6a_BIB=nGAfJ7(|7nw=u{rXW#}g zmA5g-YHwpuh016kWVE(1$bu|o23xAcz`?-4z{0@6z{<eSz{ViOz`>xzz{Q}+z|CO7 zz{_C6AOLod7{pQr9R^(n1_llWQwBW-UIs=6eFg>wZU&Y=3{vb2jO>E!42+<%2I|)B z4D1Z73=9m8yBQ23g^YGHm_&*&m~CgU*v?=La<`qY&Nc=oFHI2!v+1)KSXtI=Vi48Y z#^APzK@_2O8-pA38U_XiWcLa)h%ksSNHT~r$T5g9s4<8$XfQ}J=rc$$*fU6j-K)jG z0<styfFcaK44w>L42%qt3>pmH3_c7@3~~(0489D049s9Z@Gvm`W6)q{FkojeVP;?i z6)jLtOkiLK$D%IS6aEl~1tL5V?5iUbzKtPrCc*=<NDh`_U}IolkY^BKP+*V*6?_az z3@QvN4B8B;V23I|42L^Zk|7@IP!Wa%hC~J?u=BVX82>V;fSnh`z{rpUPBh5?v&(C? literal 0 HcmV?d00001 diff --git a/tp1/TestTeachingUnitResult.java b/tp1/TestTeachingUnitResult.java new file mode 100644 index 0000000..bb9a843 --- /dev/null +++ b/tp1/TestTeachingUnitResult.java @@ -0,0 +1,40 @@ + +public class TestTeachingUnitResult { + public static void main(String[] args){ + TestTeachingUnitResult test = new TestTeachingUnitResult(); + if(test.testgetGrade() == true) + System.out.println("testGrade : correct"); + else + System.out.println("testGrade : incorrect"); + + if(test.testToString() == true) + System.out.println("testToString : correct"); + else + System.out.println("testToString : incorrect"); + + + } + + public boolean testgetGrade(){ + TeachingUnitResult grade = new TeachingUnitResult("",new Grade(12.5)); + Grade val = grade.getGrade(); + double val1 = val.getValue(); + if(val1 == 12.5) + return true; + else + System.out.println(val); + System.out.println(new Grade(12.5)); + return false; + } + + public boolean testToString(){ + TeachingUnitResult teachingUnitResult = new TeachingUnitResult("Programmation 2", new Grade(13.7)); + String teachnigUnitResultString = teachingUnitResult.toString(); + if(teachnigUnitResultString.equals("Programmation 2 : 13.7/20")) + return true; + else + System.out.println(teachnigUnitResultString); + return false; + } + +} -- GitLab