diff --git a/src/main/java/be/cylab/java/wowa/training/AbstractSolution.java b/src/main/java/be/cylab/java/wowa/training/AbstractSolution.java index 0899e56f9eae761db4b8d077e374496aadc859c3..1e67a9427078935a02ab7cf4261bcf13dd8a2077 100644 --- a/src/main/java/be/cylab/java/wowa/training/AbstractSolution.java +++ b/src/main/java/be/cylab/java/wowa/training/AbstractSolution.java @@ -4,7 +4,11 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -public abstract class AbstractSolution implements Comparable<AbstractSolution>, Cloneable{ +/** + * Abstract class Solution. + */ +public abstract class AbstractSolution + implements Comparable<AbstractSolution>, Cloneable { protected double[] weights_w; protected double[] weights_p; @@ -61,6 +65,7 @@ public abstract class AbstractSolution implements Comparable<AbstractSolution>, /** * Change a random gene in a weight vector. * The gene is changed is the probability is higher than a random double + * * @param probability */ final void randomlyMutateWithProbability(final double probability) { @@ -100,7 +105,7 @@ public abstract class AbstractSolution implements Comparable<AbstractSolution>, } /** - *Function to normalize SolutionDistance weights. + * Function to normalize SolutionDistance weights. * Weights must be between 0 and 1 and the sum of the weight in a vector * must be equal to 1 */ @@ -116,6 +121,9 @@ public abstract class AbstractSolution implements Comparable<AbstractSolution>, return distance; } + /** + * @param distance + */ public final void setDistance(final double distance) { return; } @@ -149,7 +157,6 @@ public abstract class AbstractSolution implements Comparable<AbstractSolution>, } - /** * Copy. * diff --git a/src/main/java/be/cylab/java/wowa/training/SolutionAUC.java b/src/main/java/be/cylab/java/wowa/training/SolutionAUC.java index d027e25556fac7961fb490ceaf6a1e085420e009..f2dfe41a6aac29d6992c811c5c94606d8f1cfc73 100644 --- a/src/main/java/be/cylab/java/wowa/training/SolutionAUC.java +++ b/src/main/java/be/cylab/java/wowa/training/SolutionAUC.java @@ -1,18 +1,25 @@ package be.cylab.java.wowa.training; -import be.cylab.java.roc.Point; import info.debatty.java.aggregation.WOWA; -import java.util.ArrayList; import java.util.List; +/** + * Child class Solution. + * Fitness criterion is AUC + */ public class SolutionAUC extends AbstractSolution { - - public SolutionAUC(int weight_number) { + /** + * Default constructor. + * @param weight_number + */ + public SolutionAUC(final int weight_number) { super(weight_number); } - final void computeScoreTo(List<double[]> data, double[] expected) { + final void computeScoreTo( + final List<double[]> data, + final double[] expected) { this.distance = 0; double[] aggregated_values = new double[data.size()]; WOWA wowa = new WOWA(this.weights_w, this.weights_p); diff --git a/src/main/java/be/cylab/java/wowa/training/SolutionDistance.java b/src/main/java/be/cylab/java/wowa/training/SolutionDistance.java index 8b9b95b0a3d90dedfd79fafa437e97e98b054643..9f8a2a9238ed67e8dcf60be501df3fbb29317a7f 100644 --- a/src/main/java/be/cylab/java/wowa/training/SolutionDistance.java +++ b/src/main/java/be/cylab/java/wowa/training/SolutionDistance.java @@ -19,6 +19,11 @@ public class SolutionDistance extends AbstractSolution { super(weights_number); } + /** + * Constructor used for tests. + * @param weights_number + * @param seed + */ public SolutionDistance(final int weights_number, final int seed) { super(weights_number, seed); }