From 9752aba64102651395eee37228cf424a348995bf Mon Sep 17 00:00:00 2001
From: Lycano <sebastien.bousquet91@laposte.net>
Date: Wed, 18 Mar 2026 15:19:10 +0100
Subject: [PATCH 1/3] Commit 15:18 Poisson mostly okay, merlu and mackerel here
 and data parsing existing

---
 Projet.iml                                 | 11 ++++++
 src/ecoparasite/input/DataParsing.java     | 10 ++++++
 src/ecoparasite/input/RawData.java         |  4 +++
 src/ecoparasite/poisson/Mackerel.java      | 22 ++++++++++++
 src/ecoparasite/poisson/Merlu.java         | 22 ++++++++++++
 src/ecoparasite/poisson/PartiePoisson.java |  4 +++
 src/ecoparasite/poisson/Poisson.java       | 41 ++++++++++++++++++++++
 7 files changed, 114 insertions(+)
 create mode 100644 Projet.iml
 create mode 100644 src/ecoparasite/input/DataParsing.java
 create mode 100644 src/ecoparasite/input/RawData.java
 create mode 100644 src/ecoparasite/poisson/Mackerel.java
 create mode 100644 src/ecoparasite/poisson/Merlu.java
 create mode 100644 src/ecoparasite/poisson/PartiePoisson.java
 create mode 100644 src/ecoparasite/poisson/Poisson.java

diff --git a/Projet.iml b/Projet.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/Projet.iml
@@ -0,0 +1,11 @@
+<?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$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/ecoparasite/input/DataParsing.java b/src/ecoparasite/input/DataParsing.java
new file mode 100644
index 0000000..11847ce
--- /dev/null
+++ b/src/ecoparasite/input/DataParsing.java
@@ -0,0 +1,10 @@
+package ecoparasite.input;
+
+import ecoparasite.poisson.Poisson;
+
+import java.util.HashSet;
+
+public interface DataParsing {
+
+    public HashSet<Poisson> parse(RawData data);
+}
diff --git a/src/ecoparasite/input/RawData.java b/src/ecoparasite/input/RawData.java
new file mode 100644
index 0000000..3755299
--- /dev/null
+++ b/src/ecoparasite/input/RawData.java
@@ -0,0 +1,4 @@
+package ecoparasite.input;
+
+public class RawData {
+}
diff --git a/src/ecoparasite/poisson/Mackerel.java b/src/ecoparasite/poisson/Mackerel.java
new file mode 100644
index 0000000..d3f442c
--- /dev/null
+++ b/src/ecoparasite/poisson/Mackerel.java
@@ -0,0 +1,22 @@
+package ecoparasite.poisson;
+
+import ecoparasite.input.DataParsing;
+import ecoparasite.input.RawData;
+
+import java.util.HashSet;
+
+public class Mackerel extends Poisson implements DataParsing {
+    public Mackerel(String species, Double length, Double infestation) {
+        super(species, length, null, infestation);
+    }
+
+    @Override
+    public HashSet<Poisson> parse(RawData data) {
+
+        HashSet<Poisson> fishSet;
+        fishSet = new HashSet<>();
+
+
+        return fishSet;
+    }
+}
diff --git a/src/ecoparasite/poisson/Merlu.java b/src/ecoparasite/poisson/Merlu.java
new file mode 100644
index 0000000..e1fec75
--- /dev/null
+++ b/src/ecoparasite/poisson/Merlu.java
@@ -0,0 +1,22 @@
+package ecoparasite.poisson;
+
+import ecoparasite.input.DataParsing;
+import ecoparasite.input.RawData;
+
+import java.util.HashSet;
+
+public class Merlu extends Poisson implements DataParsing {
+    public Merlu(String species, Double length, Double infestation) {
+        super(species, length, null, infestation);
+    }
+
+    @Override
+    public HashSet<Poisson> parse(RawData data) {
+
+        HashSet<Poisson> fishSet;
+        fishSet = new HashSet<>();
+
+
+        return fishSet;
+    }
+}
diff --git a/src/ecoparasite/poisson/PartiePoisson.java b/src/ecoparasite/poisson/PartiePoisson.java
new file mode 100644
index 0000000..63d1a1c
--- /dev/null
+++ b/src/ecoparasite/poisson/PartiePoisson.java
@@ -0,0 +1,4 @@
+package ecoparasite.poisson;
+
+public abstract class PartiePoisson {
+}
diff --git a/src/ecoparasite/poisson/Poisson.java b/src/ecoparasite/poisson/Poisson.java
new file mode 100644
index 0000000..3fbc49f
--- /dev/null
+++ b/src/ecoparasite/poisson/Poisson.java
@@ -0,0 +1,41 @@
+package ecoparasite.poisson;
+
+import java.util.HashSet;
+
+public class Poisson{
+
+    private String specie;
+    private Double length;
+    private Double weight;
+    private Double infestation;
+    protected HashSet<PartiePoisson> fishParts;
+
+    public Poisson(String specie, Double length, Double weight, Double infestation){
+        this.specie = specie;
+        this.length = length;
+        this.weight = weight;
+        this.infestation = infestation;
+    }
+
+
+    public String getSpecie() {
+        return specie;
+    }
+
+    public Double getLength() {
+        return length;
+    }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public Double getInfestation() {
+        return infestation;
+    }
+
+    @Override
+    public String toString(){
+        return "";
+    }
+}
-- 
2.39.5


From 71250d8f796eb4e12cc2860b44c022ebb760000c Mon Sep 17 00:00:00 2001
From: Lycano <sebastien.bousquet91@laposte.net>
Date: Wed, 18 Mar 2026 15:37:18 +0100
Subject: [PATCH 2/3] Commit 15:18 javadoc

---
 src/ecoparasite/poisson/Merlu.java   | 17 ++++++++++++---
 src/ecoparasite/poisson/Poisson.java | 32 ++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/ecoparasite/poisson/Merlu.java b/src/ecoparasite/poisson/Merlu.java
index e1fec75..941bb0a 100644
--- a/src/ecoparasite/poisson/Merlu.java
+++ b/src/ecoparasite/poisson/Merlu.java
@@ -6,12 +6,23 @@ import ecoparasite.input.RawData;
 import java.util.HashSet;
 
 public class Merlu extends Poisson implements DataParsing {
-    public Merlu(String species, Double length, Double infestation) {
-        super(species, length, null, infestation);
+
+    /**
+     * Construteur d'un merlu
+     * @param length Un Wrapper Double representant la longueur/taille du poisson
+     * @param infestation Un Wrapper Double representant le taux de parasite du poisson
+     */
+    public Merlu(Double length, Double infestation) {
+        super("Merlu", length, null, infestation);
     }
 
+    /**
+     * Implémentation de la fonction parse de Dataparsing
+     * @param data
+     * @return tableau des poissons
+     */
     @Override
-    public HashSet<Poisson> parse(RawData data) {
+    public HashSet<Poisson> parse(RawData data) { //TODO
 
         HashSet<Poisson> fishSet;
         fishSet = new HashSet<>();
diff --git a/src/ecoparasite/poisson/Poisson.java b/src/ecoparasite/poisson/Poisson.java
index 3fbc49f..92815b2 100644
--- a/src/ecoparasite/poisson/Poisson.java
+++ b/src/ecoparasite/poisson/Poisson.java
@@ -10,32 +10,60 @@ public class Poisson{
     private Double infestation;
     protected HashSet<PartiePoisson> fishParts;
 
+    /**
+     * Constructeur de l'objet Poisson
+     * @param specie Une String representant l'espece du poisson
+     * @param length Un Wrapper Double representant la longueur/taille du poisson
+     * @param weight Un Wrapper Double representant le poids du poisson
+     * @param infestation Un Wrapper Double representant le taux de parasite du poisson
+     */
     public Poisson(String specie, Double length, Double weight, Double infestation){
         this.specie = specie;
         this.length = length;
         this.weight = weight;
         this.infestation = infestation;
+        this.fishParts = null;
     }
 
-
+    /**
+     * Getter de l'attribut specie
+     * @return La string de l'attribut specie
+     */
     public String getSpecie() {
         return specie;
     }
 
+    /**
+     * Getter de l'attribut length
+     * @return Le Double de l'attribut length
+     */
     public Double getLength() {
         return length;
     }
 
+    /**
+     * Getter de l'attribut weight
+     * @return Le Double de l'attribut weight
+     */
     public Double getWeight() {
         return weight;
     }
 
+    /**
+     * Getter de l'attribut infestation
+     * @return Le Double de l'attribut infestation
+     */
     public Double getInfestation() {
         return infestation;
     }
 
+    /**
+     * Permet d'afficher les informations de notre poisson
+     * @return La string contenant les informations
+     */
     @Override
     public String toString(){
-        return "";
+        String result = "[ %5s : %4d mm, %4d g, %4d taux d'infestation ]";
+        return String.format(result, this.getClass().getSimpleName(), this.getLength(), this.getWeight(), this.getInfestation());
     }
 }
-- 
2.39.5


From f79e2f7d92568b57ad2b1409cac691316c4378a2 Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@cartememoire.org>
Date: Wed, 18 Mar 2026 15:03:31 +0000
Subject: [PATCH 3/3] Supprimer src/ecoparasite/input/RawData.java

---
 src/ecoparasite/input/RawData.java | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/ecoparasite/input/RawData.java

diff --git a/src/ecoparasite/input/RawData.java b/src/ecoparasite/input/RawData.java
deleted file mode 100644
index 3755299..0000000
--- a/src/ecoparasite/input/RawData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ecoparasite.input;
-
-public class RawData {
-}
-- 
2.39.5