From 9752aba64102651395eee37228cf424a348995bf Mon Sep 17 00:00:00 2001 From: Lycano Date: Wed, 18 Mar 2026 15:19:10 +0100 Subject: [PATCH] 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 @@ + + + + + + + + + + + \ 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 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 parse(RawData data) { + + HashSet 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 parse(RawData data) { + + HashSet 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 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 ""; + } +}