From 4902c2c49238ba068702e659e816354fcfcd0b92 Mon Sep 17 00:00:00 2001 From: Lycano Date: Wed, 25 Mar 2026 15:30:59 +0100 Subject: [PATCH] Commit 15:18 javadoc --- Projet.iml | 34 +++++++++++++++++ data/test.csv | 4 ++ src/ecoparasite/input/DataParsing.java | 3 ++ src/ecoparasite/input/RawDataTest.java | 43 ++++++++++++++++++++++ src/ecoparasite/poisson/Mackerel.java | 15 +++++++- src/ecoparasite/test/InputFactoryTest.java | 36 ++++++++++++++++++ 6 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 data/test.csv create mode 100644 src/ecoparasite/input/RawDataTest.java create mode 100644 src/ecoparasite/test/InputFactoryTest.java diff --git a/Projet.iml b/Projet.iml index c90834f..771c910 100644 --- a/Projet.iml +++ b/Projet.iml @@ -7,5 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/test.csv b/data/test.csv new file mode 100644 index 0000000..bec3bfd --- /dev/null +++ b/data/test.csv @@ -0,0 +1,4 @@ +Sample_code;Station;Latitude;Longitude;Depth;d13C_raw;d13C_corr;d15N;C_N;StandardLength;TrophicLevel;Anisakis_abdominalcavity;Anisakis_Liver;Anisakis_gonads;Anisakis_stomach;NParasitesViscera;Anisakis_Muscle_Right;Anisakis_Muscle_Left;Aniskis_Muscle_total;NParasitesTotal +TRACTRA_S0575_A0439;S0575;48.8692264;-4.3976635;96.84;-20.09735065;-19.14374028;12.52361179;4.316778148;257;3.117572211;7;1;0;1;9;1;3;4;13 +TRACTRA_S0575_A0440;S0575;48.8692264;-4.3976635;96.84;-20.02738845;-19.42703789;12.25444555;3.959950061;252;3.038405671;263;5;0;21;289;12;11;23;312 +TRACTRA_S0575_A0441;S0575;48.8692264;-4.3976635;96.84;-19.82735569;-18.83090708;12.97020596;4.360049101;254;3.248923438;51;1;12;1;65;2;3;5;70 \ No newline at end of file diff --git a/src/ecoparasite/input/DataParsing.java b/src/ecoparasite/input/DataParsing.java index 11847ce..f8e5830 100644 --- a/src/ecoparasite/input/DataParsing.java +++ b/src/ecoparasite/input/DataParsing.java @@ -4,6 +4,9 @@ import ecoparasite.poisson.Poisson; import java.util.HashSet; +/** + * Interface définissant la fonction de Parsing des données + */ public interface DataParsing { public HashSet parse(RawData data); diff --git a/src/ecoparasite/input/RawDataTest.java b/src/ecoparasite/input/RawDataTest.java new file mode 100644 index 0000000..a9de9cf --- /dev/null +++ b/src/ecoparasite/input/RawDataTest.java @@ -0,0 +1,43 @@ +package ecoparasite.input; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; +import ecoparasite.input.RawData; + +import java.util.HashSet; + +class RawDataTest { + + + @Test + void getColumnsNames() throws InputFileException { + RawData test = InputFactory.readData("test.csv"); + + HashSet d = new HashSet<>(); + + for (int i = 0; i < test.getData().size(); i++){ + d.add(test.getData().get(i).getFirst()); + } + + System.out.println(test.getColumnsNames()); + System.out.println(d); + + assertIterableEquals(test.getColumnsNames(),d); + } + + @Test + void getDataFromColumn() throws InputFileException { + RawData test = InputFactory.readData("test.csv"); + + System.out.println(test.getDataFromColumn("Sample_code")); + + } + + @Test + void getEntry() throws InputFileException, RawDataOverflow { + RawData test = InputFactory.readData("test.csv"); + + System.out.println(test.getEntry(2)); + } +} \ No newline at end of file diff --git a/src/ecoparasite/poisson/Mackerel.java b/src/ecoparasite/poisson/Mackerel.java index af9ae3c..8fca878 100644 --- a/src/ecoparasite/poisson/Mackerel.java +++ b/src/ecoparasite/poisson/Mackerel.java @@ -10,10 +10,21 @@ import java.util.HashSet; * Ajoute les fonctions de Parsing liés aux données collectées sur le Mackerel. */ public class Mackerel extends Poisson implements DataParsing { - public Mackerel(String species, Double length, Double infestation) { - super(species, length, null, infestation); + + /** + * Constructeur de Mackerel + * @param length + * @param infestation + */ + public Mackerel(Double length, Double infestation) { + super("Mackerel", length, null, infestation); } + /** + * Implémentation de la fonction parse de Dataparsing + * @param data + * @return tableau des poissons + */ @Override public HashSet parse(RawData data) { diff --git a/src/ecoparasite/test/InputFactoryTest.java b/src/ecoparasite/test/InputFactoryTest.java new file mode 100644 index 0000000..ac80516 --- /dev/null +++ b/src/ecoparasite/test/InputFactoryTest.java @@ -0,0 +1,36 @@ +package ecoparasite.test; + + +import static ecoparasite.input.InputFactory.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +import ecoparasite.input.InputFactory; +import ecoparasite.input.InputFileException; +import ecoparasite.input.RawData; +import org.junit.jupiter.api.Test; + +class InputFactoryTest{ + + @org.junit.jupiter.api.Test + void buildDataPath() { + + String d = "data/Campagne/mackerel.97442.csv"; + String e = "data/Campagne/merlu2018_75164.csv"; + + assertArrayEquals(d.toCharArray(), InputFactory.buildDataPath("Campagne/mackerel.97442.csv").toCharArray()); + assertArrayEquals(e.toCharArray(), InputFactory.buildDataPath("Campagne/merlu2018_75164.csv").toCharArray()); + + } + + @org.junit.jupiter.api.Test + void readData() throws InputFileException { + RawData test = InputFactory.readData("test.csv"); + + System.out.println(test.getData()); + + } + + @org.junit.jupiter.api.Test + void testReadData() { + } +} \ No newline at end of file