Finish Completion Linear.

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 );
+    }
+
 }

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());

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
+        );
+    }
+
+
 }