No commit message

No commit message

src/main/java/pikelake/Cell.java

@@ -21,7 +21,7 @@ public class Cell extends IndexedCell {
      */
     private transient List<Pike> pikes;
 
-    public Cell(int index, double habitatQuality) {
+    public Cell (int index, double habitatQuality) {
         super(index);
         this.habitatQuality = habitatQuality;
 
@@ -29,22 +29,22 @@ public class Cell extends IndexedCell {
     }
 
     
-    public List<Pike> getPikes() {
+    public List<Pike> getPikes () {
         return pikes;
     }
 
     
-    public boolean addPike(Pike pike) {
+    public boolean addPike (Pike pike) {
         return pikes.add(pike);
     }
 
     
-    public boolean removePike(Pike pike) {
+    public boolean removePike (Pike pike) {
         return pikes.remove(pike);
     }
 
     
-    public double getHabitatQuality() {
+    public double getHabitatQuality () {
         return habitatQuality;
     }
 

src/main/java/pikelake/Grid.java

@@ -19,7 +19,7 @@ import fr.cemagref.simaqualife.extensions.spatial2D.Grid2D;
 import fr.cemagref.simaqualife.kernel.util.TransientParameters.InitTransientParameters;
 
 /**
- *		Classes qui initialise la grille de la simulation (lac et cellule non accesible)
+ *		Classe qui initialise la grille de la simulation (lac et cellule non accessible)
  *		@author Guillaume GARBAY
  *		@version 1.0
  */
@@ -34,7 +34,7 @@ public class Grid extends Grid2D<Cell, Individual> {
 	 *		@param neighborsType Type de voisinnage utilise
 	 *		@return /
 	 */
-    public Grid(int gridWidth, int gridHeight, NeighborsType neighborsType) {
+    public Grid (int gridWidth, int gridHeight, NeighborsType neighborsType) {
         super(gridWidth, gridHeight, neighborsType);
         // Auto-generated constructor stub
     }
@@ -46,7 +46,7 @@ public class Grid extends Grid2D<Cell, Individual> {
 	 *		@return /
 	 */
     @InitTransientParameters
-    public void initTransientParameters(Pilot pilot) throws FileNotFoundException {
+    public void initTransientParameters (Pilot pilot) throws FileNotFoundException {
     	
         StringTokenizer sLigne;
         @SuppressWarnings("unused")
@@ -126,7 +126,7 @@ public class Grid extends Grid2D<Cell, Individual> {
 	 *		@param group Groupe des individus
 	 *		@return /
 	 */
-	public void addAquaNism(Individual ind, AquaNismsGroup<?, ?> group) {
+	public void addAquaNism (Individual ind, AquaNismsGroup<?, ?> group) {
         super.addAquaNism(ind, group);
         ind.getPosition().addPike((Pike) ind);
     }
@@ -138,7 +138,7 @@ public class Grid extends Grid2D<Cell, Individual> {
 	 *		@param dest Cellule de destination de l'individu
 	 *		@return /
 	 */
-    public void moveAquaNism(Individual ind, AquaNismsGroup<?, ?> group, Cell dest) {
+    public void moveAquaNism (Individual ind, AquaNismsGroup<?, ?> group, Cell dest) {
         super.moveAquaNism(ind, group, dest);
         this.removeAquaNism(ind, group);
         dest.addPike((Pike) ind);
@@ -150,7 +150,7 @@ public class Grid extends Grid2D<Cell, Individual> {
 	 *		@param group Groupe auquel appartient l'individu
 	 *		@return /
 	 */
-    public void removeAquaNism(Individual ind, AquaNismsGroup<?, ?> group) {
+    public void removeAquaNism (Individual ind, AquaNismsGroup<?, ?> group) {
         super.removeAquaNism(ind, group);
         ind.getPosition().removePike((Pike) ind);
     }
@@ -160,7 +160,7 @@ public class Grid extends Grid2D<Cell, Individual> {
      *		@param position ID de la cellule initiale
      *		@return neighbours Liste des cellules (id) accessibles
      */
-    public List<Cell> getNeighbours(Cell position) {
+    public List<Cell> getNeighbours (Cell position) {
 
     	List<Cell> neighbours = new ArrayList<Cell>();
     	int[][] listeCoord;

src/main/java/pikelake/Individual.java

@@ -22,33 +22,33 @@ public abstract class Individual extends AquaNism<Cell, Grid> implements Compara
 	 */
 	protected boolean sexe;
 
-	public Individual(Pilot pilot, Cell position) {
+	public Individual (Pilot pilot, Cell position) {
 		super(pilot, position);
 		this.age = 0;
 	}
 
-	public Individual(Pilot pilot, Cell position, double weight) {
+	public Individual (Pilot pilot, Cell position, double weight) {
 		this(pilot, position);
 		this.weight = weight;
 	}
 
-	public final double getWeight() {
+	public final double getWeight () {
 		return weight;
 	}
 
-	public final void setWeight(double weight) {
+	public final void setWeight (double weight) {
 		this.weight = weight;
 	}
 
-	public final int getAge() {
+	public final int getAge () {
 		return age;
 	}
 
-	public final void incAge() {
+	public final void incAge () {
 		age++;
 	}
 
-	public int compareTo(Individual ind) {
+	public int compareTo (Individual ind) {
 		return (int) Math.signum(this.weight - ind.weight);
 	}
 

src/main/java/pikelake/environment/AreaMovement.java

@@ -161,7 +161,7 @@ public class AreaMovement extends AquaNismsGroupProcess<Pike, PikesGroup> {
 	}
 	
 	/**
-	 *		Retourne la distance std
+	 *		Retourne l'ecart type de la distance (std)
 	 *		@param / 
 	 *		@return std Entier contenant la distance std
 	 */

src/main/java/pikelake/pikes/PikeHuntProcess.java

@@ -80,7 +80,7 @@ LoopAquaNismsGroupProcess<Pike, AquaNismsGroup<Pike, ?>> {
 	}
 
 	@InitTransientParameters
-	public void initTransientParameters(Pilot pilot) {
+	public void initTransientParameters (Pilot pilot) {
 		sorted = true;
 		comparator = new Comparator<Pike>() {
 			public int compare(Pike o1, Pike o2) {

src/main/java/pikelake/pikes/PikeMovement.java

@@ -17,12 +17,12 @@ public class PikeMovement extends LoopAquaNismsGroupProcess<Pike, PikesGroup> {
 	private double basicMovingRate;
     transient private UniformGen uniformGen;
 
-    public PikeMovement(Pilot pilot) {
+    public PikeMovement (Pilot pilot) {
         uniformGen = new UniformGen(pilot.getRandomStream(), new UniformDist());
     }
 
     @InitTransientParameters
-    public void initTransientParameters(Pilot pilot) {
+    public void initTransientParameters (Pilot pilot) {
         uniformGen = new UniformGen(pilot.getRandomStream(), new UniformDist(0, 1));
     }
 

src/main/java/pikelake/pikes/PikePlopProcess.java

@@ -6,7 +6,7 @@ public class PikePlopProcess extends AquaNismsGroupProcess<Pike,PikesGroup> {
 
 	private int temporisation = 3000; // in ms
 	
-	public void doProcess(PikesGroup object) {
+	public void doProcess (PikesGroup object) {
 		System.out.println("PikePlopProcess");
 		
     	try {

src/main/java/pikelake/pikes/PikeTrackLocation.java

@@ -23,7 +23,7 @@ public class PikeTrackLocation extends AquaNismsGroupProcess<Pike, PikesGroup> {
 	 *		@param group Represente les individus
 	 *		@return /
 	 */		
-	public void doProcess(PikesGroup group) {
+	public void doProcess (PikesGroup group) {
 		
 		// Enregistrement de la date + nombre de pas de la simulation
 		trackDate[0][cpt] = (int) group.getPilot().getCurrentTime();	// pas de temps de la simulation