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

27.04.26-2 #19

Merged
Benjamin merged 5 commits from 27.04.26-2 into master 2026-04-29 09:58:05 +00:00
Conversation 0 Commits 5 Files Changed 93 +6 -11
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 07fd553926 - Show all commits

17
src/ecoparasite/Application.java
View File

@@ -66,7 +66,7 @@ public class Application {
System.out.println("Veuillez rentrez le nom du fichier :"); System.out.println("Veuillez rentrez le nom du fichier :");
name = sc.nextLine(); name = sc.nextLine();
for (int i = 0; i < 3; i++) { for (int i = 0; i < VALID_FILES.length; i++) {
if (name.contains(VALID_FILES[i])){ if (name.contains(VALID_FILES[i])){
isValid = true; isValid = true;
break; break;
@@ -111,7 +111,7 @@ public class Application {
// Sauvegarde pour plus tard. // Sauvegarde pour plus tard.
double[] ABCoef = Completion.getLinearCoef(mackerelSet, getLength, getInfes); double[] ABCoef = Completion.getLinearCoef(mackerelSet, getLength, getInfes);
ArrayList<Element> SVGElements = axesInstance.buildAll( "Length", "Infestation", mackerelXY, ABCoef[0], ABCoef[1] ); ArrayList<Element> SVGElements = axesInstance.buildAll( "Length (mm)", "Taux d'infestation", mackerelXY, ABCoef[0], ABCoef[1] );
SVGFactory.createSVG( SVGElements ); SVGFactory.createSVG( SVGElements );
} }
@@ -149,7 +149,7 @@ public class Application {
// Sauvegarde pour plus tard. // Sauvegarde pour plus tard.
double[] ABCoef = Completion.getLinearCoef(merluSet, getLength, getInfes); double[] ABCoef = Completion.getLinearCoef(merluSet, getLength, getInfes);
ArrayList<Element> SVGElements = axesInstance.buildAll( "Length", "Infestation", merluXY, ABCoef[0], ABCoef[1] ); ArrayList<Element> SVGElements = axesInstance.buildAll( "Length (mm)", "Taux d'infestation", merluXY, ABCoef[0], ABCoef[1] );
SVGFactory.createSVG( SVGElements ); SVGFactory.createSVG( SVGElements );
} }
@@ -211,14 +211,9 @@ public class Application {
return; return;
} }
double[] ABCoef = Completion.getLinearCoef(popSet, getLength, getInfes);
ArrayList<Element> elements = new ArrayList<>(); ArrayList<Element> elements = axesInstance.buildAll( "Taille en mm", "Abondance", popXY, ABCoef[0], ABCoef[1] );
elements.addAll(axesInstance.buildAxes("Taille en mm", "Abondance"));
elements.addAll(axesInstance.buildXTicks());
elements.addAll(axesInstance.buildYTicks());
elements.addAll(axesInstance.buildPoints(popXY));
SVGFactory.createSVG(elements); SVGFactory.createSVG(elements);
} }
@@ -280,7 +275,7 @@ public class Application {
} else if (nameFile.contains("Peru")) { } else if (nameFile.contains("Peru")) {
PopPeru(nameFile); PopPeru(nameFile);
} else if (nameFile.contains("test2")) { } else if (nameFile.contains("test2")) {
test2Render(nameFile);
} }
} catch ( InputFileException e ){ } catch ( InputFileException e ){
System.out.println( e.getMessage() ); System.out.println( e.getMessage() );