From 1c264a0860671d89c343da995faccbfbf49b0f2a Mon Sep 17 00:00:00 2001 From: Benjamin Date: Wed, 8 Apr 2026 10:32:11 +0200 Subject: [PATCH 1/2] Finish Completion Linear. --- Doc/allclasses-index.html | 61 ++- Doc/allpackages-index.html | 12 +- Doc/constant-values.html | 7 +- Doc/ecoparasite/Application.html | 4 +- Doc/ecoparasite/completion/Completion.html | 213 +++++++++ .../completion/package-summary.html | 107 +++++ Doc/ecoparasite/completion/package-tree.html | 73 +++ Doc/ecoparasite/input/DataParsing.html | 55 ++- Doc/ecoparasite/input/InputFactory.html | 24 +- Doc/ecoparasite/input/InputFileException.html | 4 +- .../input/InvalidParsingException.html | 208 +++++++++ Doc/ecoparasite/input/RawData.html | 6 +- Doc/ecoparasite/input/RawDataOverflow.html | 4 +- Doc/ecoparasite/input/package-summary.html | 27 +- Doc/ecoparasite/input/package-tree.html | 5 +- Doc/ecoparasite/nettoyage/Nettoyage.html | 175 +++++++ .../nettoyage/package-summary.html | 107 +++++ Doc/ecoparasite/nettoyage/package-tree.html | 73 +++ Doc/ecoparasite/package-summary.html | 12 +- Doc/ecoparasite/package-tree.html | 4 +- Doc/ecoparasite/poisson/Mackerel.html | 72 ++- Doc/ecoparasite/poisson/Merlu.html | 63 ++- Doc/ecoparasite/poisson/PartiePoisson.html | 117 ++++- Doc/ecoparasite/poisson/Poisson.html | 97 +++- Doc/ecoparasite/poisson/package-summary.html | 16 +- Doc/ecoparasite/poisson/package-tree.html | 4 +- Doc/ecoparasite/population/Population.html | 324 +++++++++++++ .../population/PopulationArgInterval.html | 269 +++++++++++ .../population/PopulationArgs.html | 436 ++++++++++++++++++ .../population/PopulationParsing.html | 175 +++++++ .../population/package-summary.html | 119 +++++ Doc/ecoparasite/population/package-tree.html | 76 +++ Doc/element-list | 3 + Doc/help-doc.html | 4 +- Doc/index-files/index-1.html | 8 +- Doc/index-files/index-10.html | 36 +- Doc/index-files/index-11.html | 122 ++++- Doc/index-files/index-12.html | 82 ++++ Doc/index-files/index-13.html | 90 ++++ Doc/index-files/index-14.html | 72 +++ Doc/index-files/index-2.html | 8 +- Doc/index-files/index-3.html | 32 +- Doc/index-files/index-4.html | 24 +- Doc/index-files/index-5.html | 26 +- Doc/index-files/index-6.html | 50 +- Doc/index-files/index-7.html | 94 +++- Doc/index-files/index-8.html | 37 +- Doc/index-files/index-9.html | 40 +- Doc/index.html | 12 +- Doc/member-search-index.js | 2 +- Doc/overview-summary.html | 4 +- Doc/overview-tree.html | 16 +- Doc/package-search-index.js | 2 +- Doc/search.html | 4 +- Doc/serialized-form.html | 29 +- Doc/type-search-index.js | 2 +- README.md | 19 + data/test2.csv | 30 ++ data/test3.csv | 7 + src/ecoparasite/LectureEval.java | 95 ++++ src/ecoparasite/completion/Completion.java | 57 +++ src/ecoparasite/population/Population.java | 5 + .../population/PopulationArgInterval.java | 2 +- .../population/PopulationArgs.java | 27 ++ .../completion/CompletionTest.java | 16 + 65 files changed, 3708 insertions(+), 298 deletions(-) create mode 100644 Doc/ecoparasite/completion/Completion.html create mode 100644 Doc/ecoparasite/completion/package-summary.html create mode 100644 Doc/ecoparasite/completion/package-tree.html create mode 100644 Doc/ecoparasite/input/InvalidParsingException.html create mode 100644 Doc/ecoparasite/nettoyage/Nettoyage.html create mode 100644 Doc/ecoparasite/nettoyage/package-summary.html create mode 100644 Doc/ecoparasite/nettoyage/package-tree.html create mode 100644 Doc/ecoparasite/population/Population.html create mode 100644 Doc/ecoparasite/population/PopulationArgInterval.html create mode 100644 Doc/ecoparasite/population/PopulationArgs.html create mode 100644 Doc/ecoparasite/population/PopulationParsing.html create mode 100644 Doc/ecoparasite/population/package-summary.html create mode 100644 Doc/ecoparasite/population/package-tree.html create mode 100644 Doc/index-files/index-12.html create mode 100644 Doc/index-files/index-13.html create mode 100644 Doc/index-files/index-14.html create mode 100644 README.md create mode 100644 data/test2.csv create mode 100644 data/test3.csv create mode 100644 src/ecoparasite/LectureEval.java diff --git a/Doc/allclasses-index.html b/Doc/allclasses-index.html index 1e3f859..71b37f3 100644 --- a/Doc/allclasses-index.html +++ b/Doc/allclasses-index.html @@ -1,11 +1,11 @@ - + All Classes and Interfaces - + @@ -58,16 +58,27 @@ loadScripts(document, 'script');
Description
Application
 
-
DataParsing
-
 
-
InputFactory
-
+
Completion
+
+
Permet de faire de la complétion de données.
+
+
DataParsing
+
+
Interface définissant la fonction de Parsing des données
+
+
InputFactory
+
Permet de manipuler les fichiers CSV, de les lire et d'en créer des objets RawData pour ces données brutes.
-
InputFileException
-
+
InputFileException
+
Est déclenché si une erreur est survenue lors de la lecture d'un fichier.
+
InvalidParsingException
+
+
Gère une exception lorsque qu'un type de parsing n'existe pas ou bien +qu'une erreur est survenue durant le parsing d'une donnée.
+
Mackerel
Hérite de Poisson.
@@ -76,18 +87,40 @@ loadScripts(document, 'script');
Hérite de Poisson.
-
PartiePoisson
-
 
-
Poisson
+
Nettoyage
+
+
Class Définissant les méthodes statics de Nettoyage des données
+
+
PartiePoisson
+
Permet d'illustrer une partie d'un poisson.
+
+
Poisson
+
Classe générique pour un individu Poisson.
-
RawData
+
Population
+
+
Permet de gérer une population selon les années.
+
+
PopulationArgInterval
+
Classe qui permet de gérer un intervalle de données issues d'un CSV.
+
+
PopulationArgs
+
+
Permet de stocker les paramètres d'une population pour une année spécifique.
+
+
PopulationParsing
+
+
Permet de parser une population spécifique via les schémas fournis.
+
+
RawData
+
Permet de stocker les données brutes d'un fichier chargé CSV, avant d'être changé en Classe plus spécifique.
-
RawDataOverflow
-
+
RawDataOverflow
+
Est déclenché lors du dépassement d'index lors de la récupération d'une entrée d'un RawData.
diff --git a/Doc/allpackages-index.html b/Doc/allpackages-index.html index 55538d6..99171fb 100644 --- a/Doc/allpackages-index.html +++ b/Doc/allpackages-index.html @@ -1,11 +1,11 @@ - + All Packages - + @@ -56,10 +56,16 @@ loadScripts(document, 'script');
Description
ecoparasite
 
-
ecoparasite.input
+
ecoparasite.completion
+
 
+
ecoparasite.input
+
 
+
ecoparasite.nettoyage
 
ecoparasite.poisson
 
+
ecoparasite.population
+
 
diff --git a/Doc/constant-values.html b/Doc/constant-values.html index 0025aca..41d17ce 100644 --- a/Doc/constant-values.html +++ b/Doc/constant-values.html @@ -1,11 +1,11 @@ - + Constant Field Values - + @@ -75,6 +75,9 @@ loadScripts(document, 'script');
public static final String
DATA_MERLU
"Campagne/merlu2018_75164.csv"
+
public static final String
+
DATA_PARASITES_PERU
+
"Combin\u00e9s/ParasitesPeru2021.csv"
diff --git a/Doc/ecoparasite/Application.html b/Doc/ecoparasite/Application.html index bd2d2b6..c92fc12 100644 --- a/Doc/ecoparasite/Application.html +++ b/Doc/ecoparasite/Application.html @@ -1,11 +1,11 @@ - + Application - + diff --git a/Doc/ecoparasite/completion/Completion.html b/Doc/ecoparasite/completion/Completion.html new file mode 100644 index 0000000..fbf28b3 --- /dev/null +++ b/Doc/ecoparasite/completion/Completion.html @@ -0,0 +1,213 @@ + + + + +Completion + + + + + + + + + + + + + + +
+ +
+
+ +
+ +
+

Class Completion

+
+
java.lang.Object +
ecoparasite.completion.Completion
+
+
+
+
+
public class Completion +extends Object
+
Permet de faire de la complétion de données. +Si une valeur est manquante, elle sera remplacé par la moyenne ou par regression linéaire.
+
+
+
+ +
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      Completion

      +
      +
      public Completion()
      +
      +
      +
      • +
    +
    +
    • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      completeColumnsMoyenne

      +
      +
      public static <T, V extends Number> HashSet<T> completeColumnsMoyenne(HashSet<T> list, + Function<T,V> getValue, + BiConsumer<T,V> setValue)
      +
      Permet de remplacer les valeurs inexistantes d'un paramètre d'un HashSet par la moyenne des autres valeurs (non nulles). +Exemple d'utilisation : T = Poisson, V = Double, getValue = Poisson::getInfestation, setValue = Poisson::setInfestation.
      +
      +
      Type Parameters:
      +
      T - Le type de données cobaye. Exemple : Poisson, Population
      +
      V - Le type de la donnée à vérifier, doit être un Wrapper Number. Exemple : Double.
      +
      Parameters:
      +
      list - La liste de données cobaye.
      +
      getValue - La fonction (Getter) qui permet d'obtenir la valeur que l'on veut vérifier
      +
      setValue - La fonction (Setter) qui permet de remplacer la valeur si null.
      +
      Returns:
      +
      Le HashSet avec les valeurs remplacés.
      +
      +
      +
      +
      • +
    • +
      +

      calculateMean

      +
      +
      public static <T, V extends Number> double calculateMean(HashSet<T> list, + Function<T,V> getValue)
      +
      Permet de calculer la moyenne d'une donnée des valeurs non nulles.
      +
      +
      Type Parameters:
      +
      T - Le type de données cobaye/ Exemple : Poisson
      +
      V - Le type de la donnée à vérifier, doit être un wrapper Number. Exemple : Double.
      +
      Parameters:
      +
      list - La liste de données cobaye.
      +
      getValue - La fonction qui permet d'obtenir la valeur de notre champ.
      +
      Returns:
      +
      La moyenne calculé.
      +
      +
      +
      +
      • +
    +
    +
    • +
+
+ +
+
+ + diff --git a/Doc/ecoparasite/completion/package-summary.html b/Doc/ecoparasite/completion/package-summary.html new file mode 100644 index 0000000..bf8cbb8 --- /dev/null +++ b/Doc/ecoparasite/completion/package-summary.html @@ -0,0 +1,107 @@ + + + + +ecoparasite.completion + + + + + + + + + + + + + + +
+ +
+
+ +
+
+

Package ecoparasite.completion

+
+
+
+
package ecoparasite.completion
+
+
+ +
+
+
+ + diff --git a/Doc/ecoparasite/completion/package-tree.html b/Doc/ecoparasite/completion/package-tree.html new file mode 100644 index 0000000..1171fbd --- /dev/null +++ b/Doc/ecoparasite/completion/package-tree.html @@ -0,0 +1,73 @@ + + + + +ecoparasite.completion Class Hierarchy + + + + + + + + + + + + + + +
+ +
+
+
+
+

Hierarchy For Package ecoparasite.completion

+
+Package Hierarchies: + +
+

Class Hierarchy

+ +
+
+
+ + diff --git a/Doc/ecoparasite/input/DataParsing.html b/Doc/ecoparasite/input/DataParsing.html index 08bfc40..b3a6eef 100644 --- a/Doc/ecoparasite/input/DataParsing.html +++ b/Doc/ecoparasite/input/DataParsing.html @@ -1,11 +1,11 @@ - + DataParsing - + @@ -57,6 +57,7 @@ loadScripts(document, 'script');
  • Method Summary
  • Method Details
      +
    1. parse(RawData, int)
    2. parse(RawData)
    • @@ -70,11 +71,12 @@ loadScripts(document, 'script');
    All Known Implementing Classes:
    -
    Mackerel, Merlu
    +
    Mackerel, Merlu, Population
    public interface DataParsing
    +
    Interface définissant la fonction de Parsing des données
    @@ -84,15 +86,19 @@ loadScripts(document, 'script');

    Method Summary

    -
    -
    +
    Static Methods
    Modifier and Type
    Method
    Description
    -
    HashSet<Poisson>
    -
    parse(RawData data)
    -
     
    +
    static <T> HashSet<T>
    +
    parse(RawData data)
    +
     
    +
    static <T> HashSet<T>
    +
    parse(RawData data, + int parseTypeId)
    +
    +
    Permet de parser un élément à partir d'un objet RawData.
    @@ -108,10 +114,41 @@ loadScripts(document, 'script');

    Method Details

    @@ -202,6 +206,22 @@ loadScripts(document, 'script');
    +
  • +
    +

    DATA_PARASITES_PERU

    +
    +
    public static final String DATA_PARASITES_PERU
    +
    +
    See Also:
    +
    + +
    +
    +
    +
    +
    • diff --git a/Doc/ecoparasite/input/InputFileException.html b/Doc/ecoparasite/input/InputFileException.html index e032261..63362e0 100644 --- a/Doc/ecoparasite/input/InputFileException.html +++ b/Doc/ecoparasite/input/InputFileException.html @@ -1,11 +1,11 @@ - + InputFileException - + diff --git a/Doc/ecoparasite/input/InvalidParsingException.html b/Doc/ecoparasite/input/InvalidParsingException.html new file mode 100644 index 0000000..7437f44 --- /dev/null +++ b/Doc/ecoparasite/input/InvalidParsingException.html @@ -0,0 +1,208 @@ + + + + +InvalidParsingException + + + + + + + + + + + + + + +
    + +
    +
    + +
    + +
    +

    Class InvalidParsingException

    +
    +
    java.lang.Object +
    java.lang.Throwable +
    java.lang.Exception +
    ecoparasite.input.InvalidParsingException
    +
    +
    +
    +
    +
    +
    All Implemented Interfaces:
    +
    Serializable
    +
    +
    +
    +
    public class InvalidParsingException +extends Exception
    +
    Gère une exception lorsque qu'un type de parsing n'existe pas ou bien +qu'une erreur est survenue durant le parsing d'une donnée.
    +
    +
    See Also:
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
      + +
    • +
      +

      Constructor Details

      +
        +
      • +
        +

        InvalidParsingException

        +
        +
        public InvalidParsingException(int parsingId, + String parsingSource)
        +
        Constructeur.
        +
        +
        Parameters:
        +
        parsingId - ID du parsing
        +
        parsingSource - La classe d'où provient ce parsing.
        +
        +
        +
        +
        • +
      +
      +
      • + +
    • +
      +

      Method Details

      +
        +
      • +
        +

        getParsingId

        +
        +
        public int getParsingId()
        +
        +
        +
        • +
      • +
        +

        getParsingSource

        +
        +
        public String getParsingSource()
        +
        +
        +
        • +
      +
      +
      • +
    +
    + +
    +
    + + diff --git a/Doc/ecoparasite/input/RawData.html b/Doc/ecoparasite/input/RawData.html index 0a7d1ca..54c223f 100644 --- a/Doc/ecoparasite/input/RawData.html +++ b/Doc/ecoparasite/input/RawData.html @@ -1,11 +1,11 @@ - + RawData - + @@ -248,7 +248,7 @@ loadScripts(document, 'script');
    Returns:
    Une HashMap invalid input: '<'colonne, valeur>.
    Throws:
    -
    RawDataOverflow - Si vous avez dépasses le maximum d'entrées du DataFrame.
    +
    RawDataOverflow - Si vous avez dépassé le maximum d'entrées du DataFrame.
    diff --git a/Doc/ecoparasite/input/RawDataOverflow.html b/Doc/ecoparasite/input/RawDataOverflow.html index 7600d81..8b5b19e 100644 --- a/Doc/ecoparasite/input/RawDataOverflow.html +++ b/Doc/ecoparasite/input/RawDataOverflow.html @@ -1,11 +1,11 @@ - + RawDataOverflow - + diff --git a/Doc/ecoparasite/input/package-summary.html b/Doc/ecoparasite/input/package-summary.html index 8e96624..aa7e9b6 100644 --- a/Doc/ecoparasite/input/package-summary.html +++ b/Doc/ecoparasite/input/package-summary.html @@ -1,11 +1,11 @@ - + ecoparasite.input - + @@ -75,8 +75,14 @@ loadScripts(document, 'script');
    Description
    ecoparasite
     
    +
    ecoparasite.completion
    +
     
    +
    ecoparasite.nettoyage
    +
     
    ecoparasite.poisson
     
    +
    ecoparasite.population
    +
     
    @@ -88,7 +94,9 @@ loadScripts(document, 'script');
    Class
    Description
    DataParsing
    -
     
    +
    +
    Interface définissant la fonction de Parsing des données
    +
    InputFactory
    Permet de manipuler les fichiers CSV, de les lire et d'en créer des objets RawData pour ces données brutes.
    @@ -97,12 +105,17 @@ loadScripts(document, 'script');
    Est déclenché si une erreur est survenue lors de la lecture d'un fichier.
    -
    RawData
    -
    +
    InvalidParsingException
    +
    +
    Gère une exception lorsque qu'un type de parsing n'existe pas ou bien +qu'une erreur est survenue durant le parsing d'une donnée.
    +
    +
    RawData
    +
    Permet de stocker les données brutes d'un fichier chargé CSV, avant d'être changé en Classe plus spécifique.
    -
    RawDataOverflow
    -
    +
    RawDataOverflow
    +
    Est déclenché lors du dépassement d'index lors de la récupération d'une entrée d'un RawData.
    diff --git a/Doc/ecoparasite/input/package-tree.html b/Doc/ecoparasite/input/package-tree.html index 8c5452e..e8a1f80 100644 --- a/Doc/ecoparasite/input/package-tree.html +++ b/Doc/ecoparasite/input/package-tree.html @@ -1,11 +1,11 @@ - + ecoparasite.input Class Hierarchy - + @@ -69,6 +69,7 @@ loadScripts(document, 'script');
  • java.lang.Exception
    • diff --git a/Doc/ecoparasite/nettoyage/Nettoyage.html b/Doc/ecoparasite/nettoyage/Nettoyage.html new file mode 100644 index 0000000..5ca6729 --- /dev/null +++ b/Doc/ecoparasite/nettoyage/Nettoyage.html @@ -0,0 +1,175 @@ + + + + +Nettoyage + + + + + + + + + + + + + + +
    + +
    +
    + +
    + +
    +

    Class Nettoyage

    +
    +
    java.lang.Object +
    ecoparasite.nettoyage.Nettoyage
    +
    +
    +
    +
    +
    public class Nettoyage +extends Object
    +
    Class Définissant les méthodes statics de Nettoyage des données
    +
    +
    +
    + +
    +
    +
      + +
    • +
      +

      Constructor Details

      +
        +
      • +
        +

        Nettoyage

        +
        +
        public Nettoyage()
        +
        +
        +
        • +
      +
      +
      • + +
    • +
      +

      Method Details

      +
        +
      • +
        +

        nettoiePoissonMean

        +
        +
        public static HashSet<Poisson> nettoiePoissonMean(HashSet<Poisson> tablePoisson)
        +
        Methode Static de nettoyage des valeurs abérrante et absurde
        +
        +
        Parameters:
        +
        tablePoisson - Un Hashset de Poisson contenant nos données
        +
        Returns:
        +
        Le Hashset de Poisson une fois qu'il est nettoyé
        +
        +
        +
        +
        • +
      +
      +
      • +
    +
    + +
    +
    + + diff --git a/Doc/ecoparasite/nettoyage/package-summary.html b/Doc/ecoparasite/nettoyage/package-summary.html new file mode 100644 index 0000000..76711b7 --- /dev/null +++ b/Doc/ecoparasite/nettoyage/package-summary.html @@ -0,0 +1,107 @@ + + + + +ecoparasite.nettoyage + + + + + + + + + + + + + + +
    + +
    +
    + +
    +
    +

    Package ecoparasite.nettoyage

    +
    +
    +
    +
    package ecoparasite.nettoyage
    +
    +
    + +
    +
    +
    + + diff --git a/Doc/ecoparasite/nettoyage/package-tree.html b/Doc/ecoparasite/nettoyage/package-tree.html new file mode 100644 index 0000000..7d1f7a7 --- /dev/null +++ b/Doc/ecoparasite/nettoyage/package-tree.html @@ -0,0 +1,73 @@ + + + + +ecoparasite.nettoyage Class Hierarchy + + + + + + + + + + + + + + +
    + +
    +
    +
    +
    +

    Hierarchy For Package ecoparasite.nettoyage

    +
    +Package Hierarchies: + +
    +

    Class Hierarchy

    + +
    +
    +
    + + diff --git a/Doc/ecoparasite/package-summary.html b/Doc/ecoparasite/package-summary.html index 87da77e..e77bea7 100644 --- a/Doc/ecoparasite/package-summary.html +++ b/Doc/ecoparasite/package-summary.html @@ -1,11 +1,11 @@ - + ecoparasite - + @@ -73,10 +73,16 @@ loadScripts(document, 'script');
    Package
    Description
    -
    ecoparasite.input
    +
    ecoparasite.completion
    +
     
    +
    ecoparasite.input
    +
     
    +
    ecoparasite.nettoyage
     
    ecoparasite.poisson
     
    +
    ecoparasite.population
    +
     
    diff --git a/Doc/ecoparasite/package-tree.html b/Doc/ecoparasite/package-tree.html index 93a5a5d..cbeb27f 100644 --- a/Doc/ecoparasite/package-tree.html +++ b/Doc/ecoparasite/package-tree.html @@ -1,11 +1,11 @@ - + ecoparasite Class Hierarchy - + diff --git a/Doc/ecoparasite/poisson/Mackerel.html b/Doc/ecoparasite/poisson/Mackerel.html index ad3c97c..daad6d4 100644 --- a/Doc/ecoparasite/poisson/Mackerel.html +++ b/Doc/ecoparasite/poisson/Mackerel.html @@ -1,11 +1,11 @@ - + Mackerel - + @@ -64,6 +64,7 @@ loadScripts(document, 'script');
  • Method Details
      +
    1. parse(RawData, int)
    2. parse(RawData)
    • @@ -112,10 +113,12 @@ Ajoute les fonctions de Parsing liés aux données collectées sur le Mackerel.<
    Constructor
    Description
    -
    Mackerel(String species, +
    Mackerel(String id, Double length, Double infestation)
    -
     
    +
    +
    Constructeur de Mackerel
    +
    @@ -124,21 +127,29 @@ Ajoute les fonctions de Parsing liés aux données collectées sur le Mackerel.<

    Method Summary

    -
    +
    Modifier and Type
    Method
    Description
    -
    HashSet<Poisson>
    -
    parse(RawData data)
    -
     
    +
    static HashSet<Poisson>
    +
    parse(RawData data)
    +
    +
    Implémentation de la fonction parse de Dataparsing
    +
    +
    static HashSet<Poisson>
    +
    parse(RawData data, + int parseTypeId)
    +
    +
    Implémentation de la fonction parse de DataParsing.
    +

    Methods inherited from class Poisson

    -getInfestation, getLength, getSpecie, getWeight, toString
    +getFishParts, getId, getInfestation, getLength, getWeight, setFishParts, setInfestation, toString

    Methods inherited from class Object

    clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -157,9 +168,15 @@ Ajoute les fonctions de Parsing liés aux données collectées sur le Mackerel.<

    Mackerel

    -
    public Mackerel(String species, +
    public Mackerel(String id, Double length, Double infestation)
    +
    Constructeur de Mackerel
    +
    +
    Parameters:
    +
    length -
    +
    infestation -
    +
    @@ -172,13 +189,42 @@ Ajoute les fonctions de Parsing liés aux données collectées sur le Mackerel.<

    Method Details

    diff --git a/Doc/index-files/index-7.html b/Doc/index-files/index-7.html index b64246e..909c969 100644 --- a/Doc/index-files/index-7.html +++ b/Doc/index-files/index-7.html @@ -1,12 +1,12 @@ - -I-Index + +G-Index - - + + @@ -50,23 +50,87 @@ loadScripts(document, 'script');

    Index

    -A B D E F G I M P R T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form -

    I

    +A B C D E F G I M N P R S T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form +

    G

    -
    InputFactory - Class in ecoparasite.input
    -
    -
    Permet de manipuler les fichiers CSV, de les lire et d'en créer des objets RawData pour ces données brutes.
    -
    -
    InputFactory() - Constructor for class ecoparasite.input.InputFactory
    +
    getAbondance() - Method in class ecoparasite.population.PopulationArgs
     
    -
    InputFileException - Exception Class in ecoparasite.input
    +
    getColumnsNames() - Method in class ecoparasite.input.RawData
    -
    Est déclenché si une erreur est survenue lors de la lecture d'un fichier.
    +
    Permet d'obtenir le nom des colonnes de notre jeu de données.
    -
    InputFileException(String) - Constructor for exception class ecoparasite.input.InputFileException
    +
    getData() - Method in class ecoparasite.input.RawData
    +
    +
    Getter des données brutes.
    +
    +
    getDataFromColumn(String) - Method in class ecoparasite.input.RawData
    +
    +
    Permet d'avoir toutes les valeurs associées à la colonne.
    +
    +
    getEntry(int) - Method in class ecoparasite.input.RawData
    +
    +
    Permet d'obtenir tous les champs d'une entrée.
    +
    +
    getFishParts() - Method in class ecoparasite.poisson.Poisson
    +
    +
    Getter de l'attribut des parties de poisson.
    +
    +
    getIc() - Method in class ecoparasite.population.PopulationArgs
    +
     
    +
    getId() - Method in class ecoparasite.poisson.Poisson
    +
    +
    Getter de l'attribut Id
    +
    +
    getId() - Method in class ecoparasite.population.Population
    +
     
    +
    getInfestation() - Method in class ecoparasite.poisson.PartiePoisson
    +
     
    +
    getInfestation() - Method in class ecoparasite.poisson.Poisson
    +
    +
    Getter de l'attribut infestation
    +
    +
    getIntensity() - Method in class ecoparasite.population.PopulationArgs
    +
     
    +
    getLength() - Method in class ecoparasite.poisson.Poisson
    +
    +
    Getter de l'attribut length
    +
    +
    getLength() - Method in class ecoparasite.population.PopulationArgs
    +
     
    +
    getMax() - Method in class ecoparasite.population.PopulationArgInterval
    +
     
    +
    getMean() - Method in class ecoparasite.population.PopulationArgInterval
    +
     
    +
    getMessage() - Method in exception class ecoparasite.input.InputFileException
    +
     
    +
    getMessage() - Method in exception class ecoparasite.input.RawDataOverflow
    +
     
    +
    getMin() - Method in class ecoparasite.population.PopulationArgInterval
    +
     
    +
    getName() - Method in class ecoparasite.poisson.PartiePoisson
    +
     
    +
    getNumber() - Method in class ecoparasite.population.PopulationArgs
    +
     
    +
    getParsingId() - Method in exception class ecoparasite.input.InvalidParsingException
    +
     
    +
    getParsingSource() - Method in exception class ecoparasite.input.InvalidParsingException
    +
     
    +
    getPerYear() - Method in class ecoparasite.population.Population
    +
     
    +
    getPrevalence() - Method in class ecoparasite.population.PopulationArgs
    +
     
    +
    getTotal() - Method in class ecoparasite.population.Population
    +
     
    +
    getWeight() - Method in class ecoparasite.poisson.Poisson
    +
    +
    Getter de l'attribut weight
    +
    +
    getWidth() - Method in class ecoparasite.population.PopulationArgs
    +
     
    +
    getYear() - Method in class ecoparasite.population.PopulationArgs
     
    -A B D E F G I M P R T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form +A B C D E F G I M N P R S T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form diff --git a/Doc/index-files/index-8.html b/Doc/index-files/index-8.html index 2357f12..c2c49ce 100644 --- a/Doc/index-files/index-8.html +++ b/Doc/index-files/index-8.html @@ -1,12 +1,12 @@ - -M-Index + +I-Index - - + + @@ -50,27 +50,32 @@ loadScripts(document, 'script');

    Index

    -A B D E F G I M P R T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form -

    M

    +A B C D E F G I M N P R S T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form +

    I

    -
    Mackerel - Class in ecoparasite.poisson
    +
    InputFactory - Class in ecoparasite.input
    -
    Hérite de Poisson.
    +
    Permet de manipuler les fichiers CSV, de les lire et d'en créer des objets RawData pour ces données brutes.
    -
    Mackerel(String, Double, Double) - Constructor for class ecoparasite.poisson.Mackerel
    +
    InputFactory() - Constructor for class ecoparasite.input.InputFactory
     
    -
    main(String[]) - Static method in class ecoparasite.Application
    -
     
    -
    Merlu - Class in ecoparasite.poisson
    +
    InputFileException - Exception Class in ecoparasite.input
    -
    Hérite de Poisson.
    +
    Est déclenché si une erreur est survenue lors de la lecture d'un fichier.
    -
    Merlu(Double, Double) - Constructor for class ecoparasite.poisson.Merlu
    +
    InputFileException(String) - Constructor for exception class ecoparasite.input.InputFileException
    +
     
    +
    InvalidParsingException - Exception Class in ecoparasite.input
    -
    Construteur d'un merlu
    +
    Gère une exception lorsque qu'un type de parsing n'existe pas ou bien +qu'une erreur est survenue durant le parsing d'une donnée.
    +
    +
    InvalidParsingException(int, String) - Constructor for exception class ecoparasite.input.InvalidParsingException
    +
    +
    Constructeur.
    -A B D E F G I M P R T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form +A B C D E F G I M N P R S T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form diff --git a/Doc/index-files/index-9.html b/Doc/index-files/index-9.html index 7d55f9a..400e93e 100644 --- a/Doc/index-files/index-9.html +++ b/Doc/index-files/index-9.html @@ -1,12 +1,12 @@ - -P-Index + +M-Index - - + + @@ -50,31 +50,29 @@ loadScripts(document, 'script');

    Index

    -A B D E F G I M P R T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form -

    P

    +A B C D E F G I M N P R S T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form +

    M

    -
    parse(RawData) - Method in interface ecoparasite.input.DataParsing
    -
     
    -
    parse(RawData) - Method in class ecoparasite.poisson.Mackerel
    -
     
    -
    parse(RawData) - Method in class ecoparasite.poisson.Merlu
    +
    Mackerel - Class in ecoparasite.poisson
    -
    Implémentation de la fonction parse de Dataparsing
    +
    Hérite de Poisson.
    -
    PartiePoisson - Class in ecoparasite.poisson
    -
     
    -
    PartiePoisson() - Constructor for class ecoparasite.poisson.PartiePoisson
    -
     
    -
    Poisson - Class in ecoparasite.poisson
    +
    Mackerel(String, Double, Double) - Constructor for class ecoparasite.poisson.Mackerel
    -
    Classe générique pour un individu Poisson.
    +
    Constructeur de Mackerel
    -
    Poisson(String, Double, Double, Double) - Constructor for class ecoparasite.poisson.Poisson
    +
    main(String[]) - Static method in class ecoparasite.Application
    +
     
    +
    Merlu - Class in ecoparasite.poisson
    -
    Constructeur de l'objet Poisson
    +
    Hérite de Poisson.
    +
    +
    Merlu(String, Double, Double) - Constructor for class ecoparasite.poisson.Merlu
    +
    +
    Construteur d'un merlu
    -A B D E F G I M P R T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form +A B C D E F G I M N P R S T 
    All Classes and Interfaces|All Packages|Constant Field Values|Serialized Form diff --git a/Doc/index.html b/Doc/index.html index 75a0aac..6a2b630 100644 --- a/Doc/index.html +++ b/Doc/index.html @@ -1,11 +1,11 @@ - + Overview - + @@ -54,10 +54,16 @@ loadScripts(document, 'script');
    Description
    ecoparasite
     
    -
    ecoparasite.input
    +
    ecoparasite.completion
    +
     
    +
    ecoparasite.input
    +
     
    +
    ecoparasite.nettoyage
     
    ecoparasite.poisson
     
    +
    ecoparasite.population
    +
     
    diff --git a/Doc/member-search-index.js b/Doc/member-search-index.js index 04324ac..b693fc1 100644 --- a/Doc/member-search-index.js +++ b/Doc/member-search-index.js @@ -1 +1 @@ -memberSearchIndex = [{"p":"ecoparasite","c":"Application","l":"Application()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.input","c":"InputFactory","l":"buildDataPath(String)","u":"buildDataPath(java.lang.String)","k":"6"},{"p":"ecoparasite.input","c":"InputFactory","l":"DATA_MACKEREL","k":"2"},{"p":"ecoparasite.input","c":"InputFactory","l":"DATA_MERLU","k":"2"},{"p":"ecoparasite.poisson","c":"Poisson","l":"fishParts","k":"1"},{"p":"ecoparasite.input","c":"RawData","l":"getColumnsNames()"},{"p":"ecoparasite.input","c":"RawData","l":"getData()"},{"p":"ecoparasite.input","c":"RawData","l":"getDataFromColumn(String)","u":"getDataFromColumn(java.lang.String)"},{"p":"ecoparasite.input","c":"RawData","l":"getEntry(int)"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getInfestation()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getLength()"},{"p":"ecoparasite.input","c":"InputFileException","l":"getMessage()"},{"p":"ecoparasite.input","c":"RawDataOverflow","l":"getMessage()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getSpecie()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getWeight()"},{"p":"ecoparasite.input","c":"InputFactory","l":"InputFactory()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.input","c":"InputFileException","l":"InputFileException(String)","u":"%3Cinit%3E(java.lang.String)","k":"3"},{"p":"ecoparasite.poisson","c":"Mackerel","l":"Mackerel(String, Double, Double)","u":"%3Cinit%3E(java.lang.String,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite","c":"Application","l":"main(String[])","u":"main(java.lang.String[])","k":"6"},{"p":"ecoparasite.poisson","c":"Merlu","l":"Merlu(Double, Double)","u":"%3Cinit%3E(java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.input","c":"DataParsing","l":"parse(RawData)","u":"parse(ecoparasite.input.RawData)"},{"p":"ecoparasite.poisson","c":"Mackerel","l":"parse(RawData)","u":"parse(ecoparasite.input.RawData)"},{"p":"ecoparasite.poisson","c":"Merlu","l":"parse(RawData)","u":"parse(ecoparasite.input.RawData)"},{"p":"ecoparasite.poisson","c":"PartiePoisson","l":"PartiePoisson()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.poisson","c":"Poisson","l":"Poisson(String, Double, Double, Double)","u":"%3Cinit%3E(java.lang.String,java.lang.Double,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.input","c":"RawData","l":"RawData(ArrayList)","u":"%3Cinit%3E(java.util.ArrayList)","k":"3"},{"p":"ecoparasite.input","c":"RawDataOverflow","l":"RawDataOverflow(int, int)","u":"%3Cinit%3E(int,int)","k":"3"},{"p":"ecoparasite.input","c":"InputFactory","l":"readData(String)","u":"readData(java.lang.String)","k":"6"},{"p":"ecoparasite.input","c":"InputFactory","l":"readData(String, String)","u":"readData(java.lang.String,java.lang.String)","k":"6"},{"p":"ecoparasite.input","c":"RawData","l":"toString()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"toString()"}];updateSearchResults(); \ No newline at end of file +memberSearchIndex = [{"p":"ecoparasite","c":"Application","l":"Application()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.input","c":"InputFactory","l":"buildDataPath(String)","u":"buildDataPath(java.lang.String)","k":"6"},{"p":"ecoparasite.completion","c":"Completion","l":"calculateMean(HashSet, Function)","u":"calculateMean(java.util.HashSet,java.util.function.Function)","k":"6"},{"p":"ecoparasite.completion","c":"Completion","l":"completeColumnsMoyenne(HashSet, Function, BiConsumer)","u":"completeColumnsMoyenne(java.util.HashSet,java.util.function.Function,java.util.function.BiConsumer)","k":"6"},{"p":"ecoparasite.completion","c":"Completion","l":"Completion()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.input","c":"InputFactory","l":"DATA_MACKEREL","k":"2"},{"p":"ecoparasite.input","c":"InputFactory","l":"DATA_MERLU","k":"2"},{"p":"ecoparasite.input","c":"InputFactory","l":"DATA_PARASITES_PERU","k":"2"},{"p":"ecoparasite.poisson","c":"Poisson","l":"fishParts","k":"1"},{"p":"ecoparasite.population","c":"PopulationArgInterval","l":"fromString(String)","u":"fromString(java.lang.String)","k":"6"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getAbondance()"},{"p":"ecoparasite.input","c":"RawData","l":"getColumnsNames()"},{"p":"ecoparasite.input","c":"RawData","l":"getData()"},{"p":"ecoparasite.input","c":"RawData","l":"getDataFromColumn(String)","u":"getDataFromColumn(java.lang.String)"},{"p":"ecoparasite.input","c":"RawData","l":"getEntry(int)"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getFishParts()"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getIc()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getId()"},{"p":"ecoparasite.population","c":"Population","l":"getId()"},{"p":"ecoparasite.poisson","c":"PartiePoisson","l":"getInfestation()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getInfestation()"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getIntensity()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getLength()"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getLength()"},{"p":"ecoparasite.population","c":"PopulationArgInterval","l":"getMax()"},{"p":"ecoparasite.population","c":"PopulationArgInterval","l":"getMean()"},{"p":"ecoparasite.input","c":"InputFileException","l":"getMessage()"},{"p":"ecoparasite.input","c":"RawDataOverflow","l":"getMessage()"},{"p":"ecoparasite.population","c":"PopulationArgInterval","l":"getMin()"},{"p":"ecoparasite.poisson","c":"PartiePoisson","l":"getName()"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getNumber()"},{"p":"ecoparasite.input","c":"InvalidParsingException","l":"getParsingId()"},{"p":"ecoparasite.input","c":"InvalidParsingException","l":"getParsingSource()"},{"p":"ecoparasite.population","c":"Population","l":"getPerYear()"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getPrevalence()"},{"p":"ecoparasite.population","c":"Population","l":"getTotal()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"getWeight()"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getWidth()"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"getYear()"},{"p":"ecoparasite.input","c":"InputFactory","l":"InputFactory()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.input","c":"InputFileException","l":"InputFileException(String)","u":"%3Cinit%3E(java.lang.String)","k":"3"},{"p":"ecoparasite.input","c":"InvalidParsingException","l":"InvalidParsingException(int, String)","u":"%3Cinit%3E(int,java.lang.String)","k":"3"},{"p":"ecoparasite.poisson","c":"Mackerel","l":"Mackerel(String, Double, Double)","u":"%3Cinit%3E(java.lang.String,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite","c":"Application","l":"main(String[])","u":"main(java.lang.String[])","k":"6"},{"p":"ecoparasite.poisson","c":"Merlu","l":"Merlu(String, Double, Double)","u":"%3Cinit%3E(java.lang.String,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.nettoyage","c":"Nettoyage","l":"nettoiePoissonMean(HashSet)","u":"nettoiePoissonMean(java.util.HashSet)","k":"6"},{"p":"ecoparasite.nettoyage","c":"Nettoyage","l":"Nettoyage()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.input","c":"DataParsing","l":"parse(RawData)","u":"parse(ecoparasite.input.RawData)","k":"6"},{"p":"ecoparasite.poisson","c":"Mackerel","l":"parse(RawData)","u":"parse(ecoparasite.input.RawData)","k":"6"},{"p":"ecoparasite.poisson","c":"Merlu","l":"parse(RawData)","u":"parse(ecoparasite.input.RawData)","k":"6"},{"p":"ecoparasite.population","c":"Population","l":"parse(RawData)","u":"parse(ecoparasite.input.RawData)","k":"6"},{"p":"ecoparasite.input","c":"DataParsing","l":"parse(RawData, int)","u":"parse(ecoparasite.input.RawData,int)","k":"6"},{"p":"ecoparasite.poisson","c":"Mackerel","l":"parse(RawData, int)","u":"parse(ecoparasite.input.RawData,int)","k":"6"},{"p":"ecoparasite.poisson","c":"Merlu","l":"parse(RawData, int)","u":"parse(ecoparasite.input.RawData,int)","k":"6"},{"p":"ecoparasite.population","c":"Population","l":"parse(RawData, int)","u":"parse(ecoparasite.input.RawData,int)","k":"6"},{"p":"ecoparasite.population","c":"PopulationParsing","l":"parseParasitesPeru(RawData)","u":"parseParasitesPeru(ecoparasite.input.RawData)","k":"6"},{"p":"ecoparasite.poisson","c":"PartiePoisson","l":"PartiePoisson(String)","u":"%3Cinit%3E(java.lang.String)","k":"3"},{"p":"ecoparasite.poisson","c":"PartiePoisson","l":"PartiePoisson(String, Double)","u":"%3Cinit%3E(java.lang.String,java.lang.Double)","k":"3"},{"p":"ecoparasite.poisson","c":"Poisson","l":"Poisson(String, Double, Double, Double)","u":"%3Cinit%3E(java.lang.String,java.lang.Double,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.population","c":"Population","l":"Population(String)","u":"%3Cinit%3E(java.lang.String)","k":"3"},{"p":"ecoparasite.population","c":"Population","l":"Population(String, PopulationArgs)","u":"%3Cinit%3E(java.lang.String,ecoparasite.population.PopulationArgs)","k":"3"},{"p":"ecoparasite.population","c":"Population","l":"Population(String, PopulationArgs, HashMap)","u":"%3Cinit%3E(java.lang.String,ecoparasite.population.PopulationArgs,java.util.HashMap)","k":"3"},{"p":"ecoparasite.population","c":"PopulationArgInterval","l":"PopulationArgInterval(Double, Double)","u":"%3Cinit%3E(java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.population","c":"PopulationArgInterval","l":"PopulationArgInterval(Double, Double, Double)","u":"%3Cinit%3E(java.lang.Double,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"PopulationArgs()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"PopulationArgs(int)","u":"%3Cinit%3E(int)","k":"3"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"PopulationArgs(int, int, PopulationArgInterval, PopulationArgInterval, PopulationArgInterval, PopulationArgInterval, Double, Double)","u":"%3Cinit%3E(int,int,ecoparasite.population.PopulationArgInterval,ecoparasite.population.PopulationArgInterval,ecoparasite.population.PopulationArgInterval,ecoparasite.population.PopulationArgInterval,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"PopulationArgs(int, PopulationArgInterval, PopulationArgInterval, PopulationArgInterval, PopulationArgInterval, Double, Double)","u":"%3Cinit%3E(int,ecoparasite.population.PopulationArgInterval,ecoparasite.population.PopulationArgInterval,ecoparasite.population.PopulationArgInterval,ecoparasite.population.PopulationArgInterval,java.lang.Double,java.lang.Double)","k":"3"},{"p":"ecoparasite.population","c":"PopulationParsing","l":"PopulationParsing()","u":"%3Cinit%3E()","k":"3"},{"p":"ecoparasite.input","c":"RawData","l":"RawData(ArrayList)","u":"%3Cinit%3E(java.util.ArrayList)","k":"3"},{"p":"ecoparasite.input","c":"RawDataOverflow","l":"RawDataOverflow(int, int)","u":"%3Cinit%3E(int,int)","k":"3"},{"p":"ecoparasite.input","c":"InputFactory","l":"readData(String)","u":"readData(java.lang.String)","k":"6"},{"p":"ecoparasite.input","c":"InputFactory","l":"readData(String, String)","u":"readData(java.lang.String,java.lang.String)","k":"6"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"setAbondance(Double)","u":"setAbondance(java.lang.Double)"},{"p":"ecoparasite.poisson","c":"Poisson","l":"setFishParts(HashSet)","u":"setFishParts(java.util.HashSet)"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"setIc(PopulationArgInterval)","u":"setIc(ecoparasite.population.PopulationArgInterval)"},{"p":"ecoparasite.poisson","c":"PartiePoisson","l":"setInfestation(Double)","u":"setInfestation(java.lang.Double)"},{"p":"ecoparasite.poisson","c":"Poisson","l":"setInfestation(Double)","u":"setInfestation(java.lang.Double)"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"setIntensity(Double)","u":"setIntensity(java.lang.Double)"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"setLength(PopulationArgInterval)","u":"setLength(ecoparasite.population.PopulationArgInterval)"},{"p":"ecoparasite.poisson","c":"PartiePoisson","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"setNumber(int)"},{"p":"ecoparasite.population","c":"Population","l":"setPerYear(HashMap)","u":"setPerYear(java.util.HashMap)"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"setPrevalence(PopulationArgInterval)","u":"setPrevalence(ecoparasite.population.PopulationArgInterval)"},{"p":"ecoparasite.population","c":"Population","l":"setTotal(PopulationArgs)","u":"setTotal(ecoparasite.population.PopulationArgs)"},{"p":"ecoparasite.population","c":"PopulationArgs","l":"setWidth(PopulationArgInterval)","u":"setWidth(ecoparasite.population.PopulationArgInterval)"},{"p":"ecoparasite.input","c":"RawData","l":"toString()"},{"p":"ecoparasite.poisson","c":"Poisson","l":"toString()"},{"p":"ecoparasite.population","c":"PopulationArgInterval","l":"transformToDouble()"}];updateSearchResults(); \ No newline at end of file diff --git a/Doc/overview-summary.html b/Doc/overview-summary.html index ec67fc8..3f63324 100644 --- a/Doc/overview-summary.html +++ b/Doc/overview-summary.html @@ -1,11 +1,11 @@ - + Generated Documentation (Untitled) - + diff --git a/Doc/overview-tree.html b/Doc/overview-tree.html index 0ef6b77..f920afe 100644 --- a/Doc/overview-tree.html +++ b/Doc/overview-tree.html @@ -1,11 +1,11 @@ - + Class Hierarchy - + @@ -53,8 +53,11 @@ loadScripts(document, 'script'); Package Hierarchies:

    Class Hierarchy

    @@ -62,7 +65,9 @@ loadScripts(document, 'script');
  • java.lang.Object
    • ecoparasite.Application
      • +
    • ecoparasite.completion.Completion
    • ecoparasite.input.InputFactory
      • +
    • ecoparasite.nettoyage.Nettoyage
    • ecoparasite.poisson.PartiePoisson
    • ecoparasite.poisson.Poisson
        @@ -70,12 +75,17 @@ loadScripts(document, 'script');
      • ecoparasite.poisson.Merlu (implements ecoparasite.input.DataParsing)
      • +
    • ecoparasite.population.Population (implements ecoparasite.input.DataParsing)
      • +
    • ecoparasite.population.PopulationArgInterval
      • +
    • ecoparasite.population.PopulationArgs
      • +
    • ecoparasite.population.PopulationParsing
    • ecoparasite.input.RawData
    • java.lang.Throwable (implements java.io.Serializable)
      • java.lang.Exception
        • diff --git a/Doc/package-search-index.js b/Doc/package-search-index.js index 3f33f3c..e280548 100644 --- a/Doc/package-search-index.js +++ b/Doc/package-search-index.js @@ -1 +1 @@ -packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html","k":"18"},{"l":"ecoparasite"},{"l":"ecoparasite.input"},{"l":"ecoparasite.poisson"}];updateSearchResults(); \ No newline at end of file +packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html","k":"18"},{"l":"ecoparasite"},{"l":"ecoparasite.completion"},{"l":"ecoparasite.input"},{"l":"ecoparasite.nettoyage"},{"l":"ecoparasite.poisson"},{"l":"ecoparasite.population"}];updateSearchResults(); \ No newline at end of file diff --git a/Doc/search.html b/Doc/search.html index 68984de..d08e8e1 100644 --- a/Doc/search.html +++ b/Doc/search.html @@ -1,11 +1,11 @@ - + Search - + diff --git a/Doc/serialized-form.html b/Doc/serialized-form.html index 69d3431..36c0762 100644 --- a/Doc/serialized-form.html +++ b/Doc/serialized-form.html @@ -1,11 +1,11 @@ - + Serialized Form - + @@ -75,6 +75,31 @@ loadScripts(document, 'script');
  • +
    +

    Exception Class ecoparasite.input.InvalidParsingException

    +
    class InvalidParsingException extends Exception implements Serializable
    +
      +
    • +
      +

      Serialized Fields

      +
        +
      • +
        parsingId
        +
        int parsingId
        +
        L'ID du parsing voulant être réalisé.
        +
        • +
      • +
        parsingSource
        +
        String parsingSource
        +
        De quel classe provient ce parsing.
        +
        • +
      +
      +
      • +
    +
    +
    • +

  • Exception Class ecoparasite.input.RawDataOverflow

    class RawDataOverflow extends Exception implements Serializable
    diff --git a/Doc/type-search-index.js b/Doc/type-search-index.js index be13692..f5d424a 100644 --- a/Doc/type-search-index.js +++ b/Doc/type-search-index.js @@ -1 +1 @@ -typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html","k":"18"},{"p":"ecoparasite","l":"Application"},{"p":"ecoparasite.input","l":"DataParsing","k":"10"},{"p":"ecoparasite.input","l":"InputFactory"},{"p":"ecoparasite.input","l":"InputFileException","k":"13"},{"p":"ecoparasite.poisson","l":"Mackerel"},{"p":"ecoparasite.poisson","l":"Merlu"},{"p":"ecoparasite.poisson","l":"PartiePoisson"},{"p":"ecoparasite.poisson","l":"Poisson"},{"p":"ecoparasite.input","l":"RawData"},{"p":"ecoparasite.input","l":"RawDataOverflow","k":"13"}];updateSearchResults(); \ No newline at end of file +typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html","k":"18"},{"p":"ecoparasite","l":"Application"},{"p":"ecoparasite.completion","l":"Completion"},{"p":"ecoparasite.input","l":"DataParsing","k":"10"},{"p":"ecoparasite.input","l":"InputFactory"},{"p":"ecoparasite.input","l":"InputFileException","k":"13"},{"p":"ecoparasite.input","l":"InvalidParsingException","k":"13"},{"p":"ecoparasite.poisson","l":"Mackerel"},{"p":"ecoparasite.poisson","l":"Merlu"},{"p":"ecoparasite.nettoyage","l":"Nettoyage"},{"p":"ecoparasite.poisson","l":"PartiePoisson"},{"p":"ecoparasite.poisson","l":"Poisson"},{"p":"ecoparasite.population","l":"Population"},{"p":"ecoparasite.population","l":"PopulationArgInterval"},{"p":"ecoparasite.population","l":"PopulationArgs"},{"p":"ecoparasite.population","l":"PopulationParsing"},{"p":"ecoparasite.input","l":"RawData"},{"p":"ecoparasite.input","l":"RawDataOverflow","k":"13"}];updateSearchResults(); \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..71589c6 --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +# Projet Saé L2 Info Java - IA + +> Auteurs : THOREL Benjamin et BOUSQUET Sébastien + +## Informations importantes + +Dans cet archive, vous trouverez une capture d'écran du Trello. (M. Mezouari possède l'accès à notre Trello) et une capture d'écran de notre UML actuel. + +Notre projet sera hébergé sur le Gitea de "THOREL Benjamin" personnel. https://code.romhackplaza.org/Benjamin/ecoparasite-data-analyse +Le début du code et de l'infrastructure complète du projet est disponible dessus. + +- Le UML se trouve dans le dossier ressources de cette archive. (classes.png) +- La capture d'écran du Trello se trouve dans le dossier ressources de cette archive. +- La Javadoc se trouve dans le dossier ``Doc``.. + +Les fichiers de tests se trouvent dans le dossier ``tests``. +Le fichier qui permet de tester la complétion des données par la moyenne est le fichier ``CompletionTest.java`` +Il prend un fichier crée volontairement avec des données en trop qui se trouve dans le dossier Data. +Il fait deux affichages, un avec les données dont le taux d'infestation global est null pour un Mackerel et un autre où le taux d'infestation global a été remplacé par la moyenne. \ No newline at end of file diff --git a/data/test2.csv b/data/test2.csv new file mode 100644 index 0000000..a48b624 --- /dev/null +++ b/data/test2.csv @@ -0,0 +1,30 @@ +id,Especes,LT,Abdomen,Foie,Visceres,Autres,Total +1,Serra Spanish mackerel,257,7,1,0,18,26 +2,Serra Spanish mackerel,252,263,5,0,356,624 +3,Serra Spanish mackerel,254,51,1,12,76,140 +4,Serra Spanish mackerel,242,158,6,0,222,386 +5,Serra Spanish mackerel,254,67,1,10,94,172 +6,Serra Spanish mackerel,251,140,1,0,159,300 +7,Serra Spanish mackerel,258,281,5,0,310,596 +8,Serra Spanish mackerel,250,113,2,6,153,274 +9,Serra Spanish mackerel,244,81,2,0,89,172 +10,Serra Spanish mackerel,244,,0,1,,247 +11,Serra Spanish mackerel,-200,23,0,0,25,48 +12,Serra Spanish mackerel,247,53,0,0,75, +13,Serra Spanish mackerel,250,11,0,0,19,30 +14,Serra Spanish mackerel,264,72,7,0,105,184 +15,Serra Spanish mackerel,258,18,2,0,38,58 +16,Serra Spanish mackerel,268,3,0,2,7,12 +17,Serra Spanish mackerel,244,5,0,0,5,10 +18,Serra Spanish mackerel,236,18,0,0,22,40 +19,Serra Spanish mackerel,,46,0,0,64,110 +20,Serra Spanish mackerel,251,-5,0,0,162,268 +21,Serra Spanish mackerel,166,0,0,0,0,0 +22,Serra Spanish mackerel,166,1,0,0,1,2 +23,Serra Spanish mackerel,162,4,1,0,7,12 +24,Serra Spanish mackerel,169,0,0,0,0,0 +25,Serra Spanish mackerel,170,0,0,0,0,0 +26,Serra Spanish mackerel,176,0,0,,0,0 +27,Serra Spanish mackerel,165,4,0,0,6,10 +28,Serra Spanish mackerel,193,4,0,0,4,8 +29,Serra Spanish mackerel,165,1,0,0,1,2 diff --git a/data/test3.csv b/data/test3.csv new file mode 100644 index 0000000..bcec9f1 --- /dev/null +++ b/data/test3.csv @@ -0,0 +1,7 @@ +Espèce,zone,N,Prevalence,LT mm,Masse g +Salmo salar,Atlantique Ouest,21,100,210,-3 +Clupea harengus,Atlantique Nord,10,80,150,200 +Merluccius,Atlantique Nord,5,90,750, +Dicentrarchus labrax,Atlantique Nord,12,65,680, +Scomber scombrus,Atlantique Nord,6,30,280,630 +Merluccius,Atlantique Nord,2,100,720,1720 diff --git a/src/ecoparasite/LectureEval.java b/src/ecoparasite/LectureEval.java new file mode 100644 index 0000000..8aa8c13 --- /dev/null +++ b/src/ecoparasite/LectureEval.java @@ -0,0 +1,95 @@ +package ecoparasite; + +import ecoparasite.input.InputFactory; +import ecoparasite.input.InputFileException; +import ecoparasite.input.RawData; +import ecoparasite.input.RawDataOverflow; +import ecoparasite.population.Population; +import ecoparasite.population.PopulationArgInterval; +import ecoparasite.population.PopulationArgs; + +import java.util.HashMap; +import java.util.HashSet; + +public class LectureEval { + + public static HashSet parseEval( RawData popRaw ){ + + HashSet popEspece = new HashSet<>(); + + int index = 1; + try { + while(true){ + HashMap fields = popRaw.getEntry(index); + + String espece = fields.get("Espèce"); + + Population population = new Population(espece); + + if( population.getTotal() == null ){ + population.setTotal( new PopulationArgs() ); + } + for( String k: fields.keySet() ){ + if( k.equals("Espèce") ) + continue; + + LectureEval.applyValueForPopEval( population.getTotal(), k, fields.get(k) ); + } + + popEspece.add(population); + index++; + } + } catch (RawDataOverflow e) { + // Fin de la liste. + } + + return popEspece; + } + + public static void applyValueForPopEval( PopulationArgs popArgs, String column, String value ){ + + if( value == null || value == "" ) // On n'ajoute pas les valeurs nulles. + return; + + switch (column){ + case "zone": + popArgs.setZone(value); + break; + case "N": + popArgs.setNumber( Integer.parseInt(value) ); + break; + case "Prevalence": + popArgs.setPrevalence(PopulationArgInterval.fromString(value)); + break; + case "LT mm": + popArgs.setLength(PopulationArgInterval.fromString(value)); + break; + case "Masse g": + popArgs.setWidth(PopulationArgInterval.fromString(value)); + break; + default: + break; + } + } + + public static void main(String[] args) throws RawDataOverflow { + + RawData popRaw; + try { + popRaw = InputFactory.readData("test3.csv", "," ); + } catch(InputFileException e) { + System.out.println(e.getMessage()); + return; + } + + HashSet pop = parseEval(popRaw); + + // System.out.println( popRaw.getEntry(1) ); + + for( Population p: pop){ + System.out.println(p); + } + + } + +} diff --git a/src/ecoparasite/completion/Completion.java b/src/ecoparasite/completion/Completion.java index 6ac2565..2899aac 100644 --- a/src/ecoparasite/completion/Completion.java +++ b/src/ecoparasite/completion/Completion.java @@ -64,4 +64,61 @@ public class Completion { return mean / i; } + public static HashSet completeColumnsLinear(HashSet list, Function getX, Function getY, BiConsumer setY ){ + + double meanX = calculateMean(list, getX); + double meanY = calculateMean(list, getY); + + double a = calculateLinearA(list,getX,getY,meanX,meanY); + double b = calculateLinearB(meanX,meanY,a); + + for(T item : list){ + if( getY.apply(item) == null && getX.apply(item) != null ){ + Double value = a * getX.apply(item).doubleValue() + b; + setY.accept( item, (V) value ); + } + } + + return list; + } + + /** + * Permet de calculer le coefficient A de notre regression linéaire. + * @param list + * @param getX + * @param getY + * @param meanX + * @param meanY + * @return + * @param + * @param + */ + public static double calculateLinearA( + HashSet list, + Function getX, + Function getY, + double meanX, + double meanY + ){ + double numerateur = 0.0; + double denominateur = 0.0; + + for( T item : list ){ + if( getX.apply(item) == null || getY.apply(item) == null ){ + continue; + } + numerateur += ( getX.apply(item).doubleValue() - meanX ) * ( getY.apply(item).doubleValue() - meanY ); + denominateur += ( getX.apply(item).doubleValue() - meanX ) * ( getX.apply(item).doubleValue() - meanX ); + } + return numerateur / denominateur; + } + + public static double calculateLinearB( + double meanX, + double meanY, + double valueA + ){ + return meanY - valueA * meanX; + } + } diff --git a/src/ecoparasite/population/Population.java b/src/ecoparasite/population/Population.java index fcb09cf..6fc7b01 100644 --- a/src/ecoparasite/population/Population.java +++ b/src/ecoparasite/population/Population.java @@ -115,4 +115,9 @@ public class Population implements DataParsing { return PopulationParsing.parseParasitesPeru(data); } + @Override + public String toString() { + return String.format( "[%s] - Total: %s", id, total ); + } + } diff --git a/src/ecoparasite/population/PopulationArgInterval.java b/src/ecoparasite/population/PopulationArgInterval.java index caff7c0..73db4b9 100644 --- a/src/ecoparasite/population/PopulationArgInterval.java +++ b/src/ecoparasite/population/PopulationArgInterval.java @@ -84,7 +84,7 @@ public class PopulationArgInterval { Double interval = Double.parseDouble(numbers[1].trim()); return new PopulationArgInterval(mean - interval, mean + interval, mean); - } else if( rawValue.contains( "-" ) ){ // Entre. + } else if( rawValue.contains( " - " ) ){ // Entre. String[] numbers = rawValue.split("-"); Double min = Double.parseDouble(numbers[0].trim()); diff --git a/src/ecoparasite/population/PopulationArgs.java b/src/ecoparasite/population/PopulationArgs.java index 8ae149e..cf7c6c8 100644 --- a/src/ecoparasite/population/PopulationArgs.java +++ b/src/ecoparasite/population/PopulationArgs.java @@ -22,6 +22,12 @@ public class PopulationArgs { private Double intensity; private Double abondance; + /* + Champs pour l'évaluation. + */ + + private String zone; + /** * Constructeur. * Toutes les données peuvent être préremplis dans ce constructeur sauf l'année. @@ -143,6 +149,8 @@ public class PopulationArgs { return abondance; } + public String getZone() { return zone; } + public void setNumber(int number) { this.number = number; } @@ -171,4 +179,23 @@ public class PopulationArgs { this.abondance = abondance; } + public void setZone(String zone) { this.zone = zone; } + + + @Override + public String toString(){ + return String.format( "Année: %d, N: %d, Length: %f, Width: %f, Prevalence: %f, IC: %f, Intensity: %f, Abondance: %f, Zone: %s", + this.year, + this.number, + this.length != null ? this.length.transformToDouble() : 0.0, + this.width != null ? this.width.transformToDouble() : 0.0, + this.prevalence != null ? this.prevalence.transformToDouble() : 0.0, + this.ic != null ? this.ic.transformToDouble() : 0.0, + this.intensity, + this.abondance, + this.zone + ); + } + + } diff --git a/tests/ecoparasite/completion/CompletionTest.java b/tests/ecoparasite/completion/CompletionTest.java index fa4b8b6..52717de 100644 --- a/tests/ecoparasite/completion/CompletionTest.java +++ b/tests/ecoparasite/completion/CompletionTest.java @@ -31,4 +31,20 @@ class CompletionTest { testp = Completion.completeColumnsMoyenne(testp,getInfes,setInfes); System.out.println(testp); } + + @org.junit.jupiter.api.Test + void completePoissonLinear() throws InputFileException, RawDataOverflow { + RawData test = InputFactory.readData("testComplete.csv"); + + HashSet testp = Mackerel.parse(test); + + System.out.println(testp); + + Function getLength = Poisson::getLength; + Function getInfes = Poisson::getInfestation; + BiConsumer setInfes = Poisson::setInfestation; + + testp = Completion.completeColumnsLinear(testp,getLength,getInfes,setInfes); + System.out.println(testp); + } } \ No newline at end of file From 874db94a5d5e65031bd85f2260104585f4fc0770 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Wed, 8 Apr 2026 10:42:58 +0200 Subject: [PATCH 2/2] Finish Nettoyage Moyenne --- src/ecoparasite/nettoyage/Nettoyage.java | 98 ++++++++++--------- src/ecoparasite/poisson/MackerelSerra.java | 91 +++++++++++++++++ .../ecoparasite/nettoyage/NettoyageTest.java | 16 ++- 3 files changed, 158 insertions(+), 47 deletions(-) create mode 100644 src/ecoparasite/poisson/MackerelSerra.java diff --git a/src/ecoparasite/nettoyage/Nettoyage.java b/src/ecoparasite/nettoyage/Nettoyage.java index d922b71..ebb4ac2 100644 --- a/src/ecoparasite/nettoyage/Nettoyage.java +++ b/src/ecoparasite/nettoyage/Nettoyage.java @@ -1,80 +1,90 @@ package ecoparasite.nettoyage; +import ecoparasite.completion.Completion; import ecoparasite.poisson.Poisson; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; +import java.util.function.BiConsumer; +import java.util.function.Function; /** * Class Définissant les méthodes statics de Nettoyage des données */ public class Nettoyage { - /** - * Methode Static de nettoyage des valeurs abérrante et absurde - * @param tablePoisson Un Hashset de Poisson contenant nos données - * @return Le Hashset de Poisson une fois qu'il est nettoyé - */ + /* public static HashSet nettoiePoissonMean(HashSet tablePoisson){ - Double mean = mean(tablePoisson); //Moyenne - Double ecart = ecartType(tablePoisson); // Ecart Type + Double mean = Completion.calculateMean(tablePoisson,Poisson::getInfestation); //Moyenne - Double z = 0.0; + ArrayList infest = new ArrayList<>(); + for (Poisson p : tablePoisson) { + if (p.getInfestation() != null){ //Test des valeurs null pour les Tests Unitaires. Je ne devrais pas en avoir. + infest.add(p.getInfestation()); + } + } + + Collections.sort(infest); + + int quartIndex = infest.size()/4; + Double firstQuart = infest.get(quartIndex); + Double thirdQuart = infest.get(quartIndex *3); + Double IQR = thirdQuart - firstQuart; for (Poisson p : tablePoisson) { - z = ( p.getInfestation() - mean ) / ecart; - if ( z >= 2.5 ) { - p.setInfestation(mean); + if (p.getInfestation() == null) { + p.setInfestation(mean); //Fonction codé en dur pour éviter des problèmes dans les Tests Unitaires : Completion devrais etre fait et valeur null ne devrait pas exister + } + else { + if (p.getInfestation() < firstQuart - (IQR * 1.5) || p.getInfestation() > thirdQuart + (IQR * 1.5)) { + p.setInfestation(mean); + } } } return tablePoisson; } + */ /** - * Methode Privée permettant de calculer la moyenne - * @param tablePoisson Un Hashset de Poisson contenant nos données - * @return Un Double correspondant à la moyenne + * Permet de remplacer les valeurs inexistantes d'un paramètre d'un HashSet par la moyenne des autres valeurs (non nulles). + * Exemple d'utilisation : T = Poisson, V = Double, getValue = Poisson::getInfestation, setValue = Poisson::setInfestation. + * + * @param list La liste de données cobaye. + * @param getValue La fonction (Getter) qui permet d'obtenir la valeur que l'on veut vérifier + * @param setValue La fonction (Setter) qui permet de remplacer la valeur si null. + * @return Le HashSet avec les valeurs remplacés. + * @param Le type de données cobaye. Exemple : Poisson, Population + * @param Le type de la donnée à vérifier, doit être un Wrapper Number. Exemple : Double. */ - private static Double mean(HashSet tablePoisson){ + public static HashSet nettoieColumnsMoyenne(HashSet list, Function getValue, BiConsumer setValue ){ - Double mean = 0.0; + Double mean = Completion.calculateMean(list, getValue); - for (Poisson p : tablePoisson){ - mean += p.getInfestation(); + ArrayList array = new ArrayList<>(); + for ( T item : list) { + if (getValue.apply(item)!= null){ //Test des valeurs null pour les Tests Unitaires. Je ne devrais pas en avoir. + array.add(getValue.apply(item).doubleValue()); + } } - return mean / tablePoisson.size(); - } + Collections.sort(array); - /** - * Methode Privée permettant de calculer la variance - * @param tablePoisson Un Hashset de Poisson contenant nos données - * @return Un Double correspondant à la variance - */ - private static Double variance(HashSet tablePoisson){ + int quartIndex = array.size()/4; + Double firstQuart = array.get(quartIndex); + Double thirdQuart = array.get(quartIndex *3); + Double IQR = thirdQuart - firstQuart; - Double vari = 0.0; - Double mean = mean(tablePoisson); - - for (Poisson p : tablePoisson) { - vari += Math.pow( (p.getInfestation() - mean), 2); + for(T item : list){ + if( getValue.apply(item).doubleValue() < firstQuart - (IQR * 1.5) || getValue.apply(item).doubleValue() > thirdQuart + (IQR * 1.5)){ + setValue.accept( item, (V) mean); + } } - return vari / tablePoisson.size(); - } - - /** - * Methode Privée permettant de calculer l'écart-type - * @param tablePoisson Un Hashset de Poisson contenant nos données - * @return Un Double correspondant à l'écart-type - */ - private static Double ecartType(HashSet tablePoisson){ - - Double vari = variance(tablePoisson); - - return Math.sqrt(vari); + return list; } diff --git a/src/ecoparasite/poisson/MackerelSerra.java b/src/ecoparasite/poisson/MackerelSerra.java new file mode 100644 index 0000000..8a95c1d --- /dev/null +++ b/src/ecoparasite/poisson/MackerelSerra.java @@ -0,0 +1,91 @@ +package ecoparasite.poisson; + +import ecoparasite.input.DataParsing; +import ecoparasite.input.InvalidParsingException; +import ecoparasite.input.RawData; +import ecoparasite.input.RawDataOverflow; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Objects; + +import static java.lang.Double.valueOf; + +public class MackerelSerra extends Poisson implements DataParsing { + + /** + * Constructeur de MackerelSerra + * @param length + * @param infestation + */ + public MackerelSerra(String id, Double length, Double infestation) { + super(id, length, null, infestation); + } + + /** + * Implémentation de la fonction parse de DataParsing. + * Renvoie un tableau de poissons à partir d'un RawData. + * + * @param data Notre RawData + * @param parseTypeId L'ID du type de parsing, ignoré ici. + * @return Le tableau de poissons. + * @throws RawDataOverflow Si on a un dépassement de données dans notre RawData. + * @throws InvalidParsingException + */ + public static HashSet parse(RawData data, int parseTypeId) throws RawDataOverflow, InvalidParsingException { + return MackerelSerra.parse(data); + } + + /** + * Implémentation de la fonction parse de Dataparsing + * @param data Notre RawData. + * @return tableau des poissons + * @throws RawDataOverflow Si on a un dépassement de données dans notre RawDataOverflow. + */ + public static HashSet parse(RawData data) throws RawDataOverflow { + + HashMap temp = new HashMap<>(); + + HashSet fishSet; + fishSet = new HashSet<>(); + + for (int i = 0; i < data.getData().getFirst().size(); i++) { + + temp = data.getEntry(i); + + String id = !Objects.equals(temp.get("id"), "") ? (temp.get("id")) : null; + Double size = !Objects.equals(temp.get("LT"), "") ? valueOf(temp.get("LT")) : null; + Double infes = !Objects.equals(temp.get("Total"), "") ? valueOf(temp.get("Total")) : null; + + Poisson newP = new MackerelSerra(id,size,infes); + newP.setFishParts( MackerelSerra.parsePartiePoisson(temp) ); + fishSet.add(newP); + } + + + return fishSet; + } + + /** + * + * @param entry + * @return + */ + private static HashSet parsePartiePoisson(HashMap entry){ + + HashSet response = new HashSet<>(); + + + for( String k: entry.keySet() ){ + if( k.contains("Foie") || k.contains("Abdomen") || k.contains("Visceres") || k.contains("Autres")){ + String bodyPart = k; + Double value = !Objects.equals(entry.get(k), "") ? valueOf(entry.get(k)) : null; + PartiePoisson p = new PartiePoisson(bodyPart, value); + response.add(p); + } + } + + return response; + } + +} diff --git a/tests/ecoparasite/nettoyage/NettoyageTest.java b/tests/ecoparasite/nettoyage/NettoyageTest.java index faa7515..b08d9e3 100644 --- a/tests/ecoparasite/nettoyage/NettoyageTest.java +++ b/tests/ecoparasite/nettoyage/NettoyageTest.java @@ -6,23 +6,33 @@ import ecoparasite.input.InputFileException; import ecoparasite.input.RawData; import ecoparasite.input.RawDataOverflow; import ecoparasite.poisson.Mackerel; +import ecoparasite.poisson.MackerelSerra; import ecoparasite.poisson.Poisson; import org.junit.jupiter.api.Test; import java.util.HashSet; +import java.util.function.BiConsumer; +import java.util.function.Function; class NettoyageTest { @org.junit.jupiter.api.Test void nettoiePoissonMean() throws InputFileException, RawDataOverflow { - RawData test = InputFactory.readData("testNettoie.csv"); + RawData test = InputFactory.readData("test2.csv", ","); - HashSet testp = Mackerel.parse(test); + HashSet testp = MackerelSerra.parse(test); System.out.println(testp); - testp = Nettoyage.nettoiePoissonMean(testp); + Function getInfes = Poisson::getInfestation; + BiConsumer setInfes = Poisson::setInfestation; + + testp = Completion.completeColumnsMoyenne( testp, getInfes, setInfes ); + + System.out.println(testp); + + testp = Nettoyage.nettoieColumnsMoyenne( testp, getInfes, setInfes ); System.out.println(testp); }