src/ecoparasite/LectureEval.java

@@ -1,122 +0,0 @@
-package ecoparasite;
-
-import ecoparasite.completion.Completion;
-import ecoparasite.input.InputFactory;
-import ecoparasite.input.InputFileException;
-import ecoparasite.input.RawData;
-import ecoparasite.input.RawDataOverflow;
-import ecoparasite.nettoyage.Nettoyage;
-import ecoparasite.poisson.Poisson;
-import ecoparasite.population.Population;
-import ecoparasite.population.PopulationArgInterval;
-import ecoparasite.population.PopulationArgs;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-
-public class LectureEval {
-
-    public static HashSet<Population> parseEval( RawData popRaw ){
-
-        HashSet<Population> popEspece =  new HashSet<>();
-
-        int index = 1;
-        try {
-            while(true){
-                HashMap<String,String> 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<Population> pop = parseEval(popRaw);
-
-        // System.out.println( popRaw.getEntry(1) );
-
-        for( Population p: pop){
-            System.out.println(p);
-        }
-
-        // Complétion de la masse.
-        Function<Population,Double> getWeight = population -> {
-            return population.getTotal().getWidth() != null ? population.getTotal().getWidth().transformToDouble() : null;
-        };
-        BiConsumer<Population,Double> setWeight = (population, aDouble) -> {
-            population.getTotal().setWidth(new PopulationArgInterval(aDouble,aDouble));
-        };
-
-        // Complétion de la masse.
-        pop = Completion.completeColumnsMoyenne(pop, getWeight, setWeight);
-        System.out.println("---");
-        for( Population p: pop){
-            System.out.println(p);
-        }
-
-        // Nettoyage de la masse.
-        pop = Nettoyage.nettoieColumnsMoyenne(pop, getWeight, setWeight, false);
-        System.out.println("---");
-        for( Population p: pop){
-            System.out.println(p);
-        }
-
-    }
-
-}

src/ecoparasite/svg/SVGFactory.java

@@ -107,16 +107,54 @@ public class SVGFactory {
 
         }
 
-        double step_x = (max_x - min_x); //TODO
-        double step_y = (max_y - min_y); //TODO
+        double range_x = max_x-min_x;
+        double range_y = max_y-min_y;
 
+        int target = 10; // Ideal Number of Gradation
 
-        //TODO
+        double step_x = niceStep(range_x,target);
+        double step_y = niceStep(range_y,target);
+
+        double nicemin_x = roundMin(min_x,step_x);
+        double nicemax_x = roundMax(max_x,step_x);
+        double nicemin_y = roundMin(min_y,step_y);
+        double nicemax_y = roundMax(max_y,step_y);
+
+        HashSet<ValeursXY> axe_x = new HashSet<>();
+        HashSet<ValeursXY> axe_y = new HashSet<>();
 
 
         return null;
     }
 
+    /**
+     * Fonction de calcul d'un step rond
+     * Cette fonction est basé sur une idée demandée à ChatGPT
+     * @param range écart entre la plus petite et la plus grande valeur
+     * @param targetTicks nombre de gradation ideal
+     * @return
+     */
+    public static double niceStep(double range, int targetTicks) {
+
+        double rawStep = range / targetTicks;
+
+        double exponent = Math.floor(Math.log10(rawStep));
+        double fraction = rawStep / Math.pow(10, exponent);
+
+        double niceFraction;
+
+        if (fraction < 1.5)
+            niceFraction = 1;
+        else if (fraction < 3)
+            niceFraction = 2;
+        else if (fraction < 7)
+            niceFraction = 5;
+        else
+            niceFraction = 10;
+
+        return niceFraction * Math.pow(10, exponent);
+    }
+
     /**
      * retourne une valeur arrondi "joli" adapter à un graphique
      * @param value