Benjamin/ecoparasite-data-analyse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JavaDoc et Completion Bullshit.

Browse Source
This commit is contained in:
Lycano
2026-04-01 16:20:41 +02:00
parent 4efb0d71ba
commit 038d4b3b88
9 changed files with 190 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ecoparasite/completion/Completion.java
View File

@@ -4,15 +4,19 @@ import ecoparasite.poisson.Poisson;
import java.util.HashSet;
/**
* Class incluant des méthodes Statiques de Completion des données
*/
public class Completion {
public static HashSet<Poisson> completePoisson(HashSet<Poisson> tablePoisson){
double mean = mean(tablePoisson);
public static HashSet<Poisson> completePoissonMean(HashSet<Poisson> tablePoisson){
Double mean = mean(tablePoisson);
for (Poisson p : tablePoisson) {
if ( p.getInfestation().isNaN() ) {
if ( p.getInfestation() == null ) {
p.setInfestation(mean);
}
}
@@ -20,12 +24,14 @@ public class Completion {
return tablePoisson;
}
private static double mean(HashSet<Poisson> tablePoisson){
private static Double mean(HashSet<Poisson> tablePoisson){
double mean = 0.0;
Double mean = 0.0;
for (Poisson p : tablePoisson){
mean += p.getInfestation();
if (p.getInfestation() != null) {
mean += p.getInfestation();
}
}
return mean / tablePoisson.size();

26
src/ecoparasite/nettoyage/Nettoyage.java
View File

@@ -7,21 +7,21 @@ import java.util.HashSet;
public class Nettoyage {
/**
*
*
* @param tablePoisson
* @return
*/
public static HashSet<Poisson> nettoiePoisson(HashSet<Poisson> tablePoisson){
public static HashSet<Poisson> nettoiePoissonMean(HashSet<Poisson> tablePoisson){
double mean = mean(tablePoisson); //Moyenne
double ecart = ecartType(tablePoisson); // Ecart Type
Double mean = mean(tablePoisson); //Moyenne
Double ecart = ecartType(tablePoisson); // Ecart Type
double z = 0;
Double z = 0.0;
for (Poisson p : tablePoisson) {
z = ( p.getInfestation() - mean ) / ecart;
if ( z >= 3 ) {
if ( z >= 2.5 ) {
p.setInfestation(mean);
}
}
@@ -29,9 +29,9 @@ public class Nettoyage {
return tablePoisson;
}
private static double mean(HashSet<Poisson> tablePoisson){
private static Double mean(HashSet<Poisson> tablePoisson){
double mean = 0.0;
Double mean = 0.0;
for (Poisson p : tablePoisson){
mean += p.getInfestation();
@@ -40,10 +40,10 @@ public class Nettoyage {
return mean / tablePoisson.size();
}
private static double variance(HashSet<Poisson> tablePoisson){
private static Double variance(HashSet<Poisson> tablePoisson){
double vari = 0.0;
double mean = mean(tablePoisson);
Double vari = 0.0;
Double mean = mean(tablePoisson);
for (Poisson p : tablePoisson) {
vari += Math.pow( (p.getInfestation() - mean), 2);
@@ -52,9 +52,9 @@ public class Nettoyage {
return vari / tablePoisson.size();
}
private static double ecartType(HashSet<Poisson> tablePoisson){
private static Double ecartType(HashSet<Poisson> tablePoisson){
double vari = variance(tablePoisson);
Double vari = variance(tablePoisson);
return Math.sqrt(vari);
}

15
src/ecoparasite/poisson/Mackerel.java
View File

@@ -7,6 +7,7 @@ import ecoparasite.input.RawDataOverflow;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Objects;
import static java.lang.Double.valueOf;
@@ -54,7 +55,12 @@ public class Mackerel extends Poisson implements DataParsing {
for (int i = 0; i < data.getData().getFirst().size(); i++) {
temp = data.getEntry(i);
Poisson newP = new Mackerel(temp.get("Sample_code"),valueOf(temp.get("StandardLength")),valueOf(temp.get("NParasitesViscera")));
String id = !Objects.equals(temp.get("Sample_code"), "") ? temp.get("Sample_code") : null;
Double size = !Objects.equals(temp.get("StandardLength"), "") ? valueOf(temp.get("StandardLength")) : null;
Double infes = !Objects.equals(temp.get("NParasitesTotal"), "") ? valueOf(temp.get("NParasitesTotal")) : null;
Poisson newP = new Mackerel(id,size,infes);
newP.setFishParts( Mackerel.parsePartiePoisson(temp) );
fishSet.add(newP);
}
@@ -63,6 +69,11 @@ public class Mackerel extends Poisson implements DataParsing {
return fishSet;
}
/**
*
* @param entry
* @return
*/
private static HashSet<PartiePoisson> parsePartiePoisson(HashMap<String,String> entry){
HashSet<PartiePoisson> response = new HashSet<>();
@@ -70,7 +81,7 @@ public class Mackerel extends Poisson implements DataParsing {
for( String k: entry.keySet() ){
if( k.contains( "Anisakis_" ) ){
String bodyPart = k.split( "Anisakis_" )[1];
Double value = valueOf(entry.get(k));
Double value = !Objects.equals(entry.get(k), "") ? valueOf(entry.get(k)) : null;
PartiePoisson p = new PartiePoisson(bodyPart, value);
response.add(p);
}