Skip to content

Commit 48e4cfb

Browse files
committed
Fixed minor issues
1 parent 36c79e9 commit 48e4cfb

11 files changed

Lines changed: 14 additions & 53 deletions

File tree

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/AbstractGeneticAlgorithm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public abstract class AbstractGeneticAlgorithm<P> {
5656
* @param mutationPolicy The {@link MutationPolicy}
5757
* @param selectionPolicy The {@link SelectionPolicy}
5858
*/
59-
public AbstractGeneticAlgorithm(final CrossoverPolicy<P> crossoverPolicy, final MutationPolicy<P> mutationPolicy,
59+
protected AbstractGeneticAlgorithm(final CrossoverPolicy<P> crossoverPolicy, final MutationPolicy<P> mutationPolicy,
6060
final SelectionPolicy<P> selectionPolicy) {
6161
this.crossoverPolicy = crossoverPolicy;
6262
this.mutationPolicy = mutationPolicy;
@@ -70,7 +70,7 @@ public AbstractGeneticAlgorithm(final CrossoverPolicy<P> crossoverPolicy, final
7070
* @param selectionPolicy The {@link SelectionPolicy}
7171
* @param elitismRate The elitism rate
7272
*/
73-
public AbstractGeneticAlgorithm(final CrossoverPolicy<P> crossoverPolicy, final MutationPolicy<P> mutationPolicy,
73+
protected AbstractGeneticAlgorithm(final CrossoverPolicy<P> crossoverPolicy, final MutationPolicy<P> mutationPolicy,
7474
final SelectionPolicy<P> selectionPolicy, double elitismRate) {
7575
this.crossoverPolicy = crossoverPolicy;
7676
this.mutationPolicy = mutationPolicy;

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/chromosome/AbstractChromosome.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public abstract class AbstractChromosome<P> implements Chromosome<P> {
5151
* @param fitnessFunction The {@link FitnessFunction}
5252
* @param decoder The {@link Decoder}
5353
*/
54-
public AbstractChromosome(final FitnessFunction<P> fitnessFunction, final Decoder<P> decoder) {
54+
protected AbstractChromosome(final FitnessFunction<P> fitnessFunction, final Decoder<P> decoder) {
5555
ValidationUtils.checkForNull("fitness-function", fitnessFunction);
5656
ValidationUtils.checkForNull("decoder", decoder);
5757
this.fitnessFunction = fitnessFunction;

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/chromosome/AbstractListChromosome.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public abstract class AbstractListChromosome<T, P> extends AbstractChromosome<P>
4646
* @param decoder An instance of {@link AbstractListChromosomeDecoder},
4747
* to decode list chromosome.
4848
*/
49-
public AbstractListChromosome(final List<T> representation, final FitnessFunction<P> fitnessFunction,
49+
protected AbstractListChromosome(final List<T> representation, final FitnessFunction<P> fitnessFunction,
5050
final AbstractListChromosomeDecoder<T, P> decoder) {
5151
this(representation, true, fitnessFunction, decoder);
5252
}
@@ -59,7 +59,7 @@ public AbstractListChromosome(final List<T> representation, final FitnessFunctio
5959
* @param decoder An instance of {@link AbstractListChromosomeDecoder},
6060
* to decode list chromosome.
6161
*/
62-
public AbstractListChromosome(final T[] representation, FitnessFunction<P> fitnessFunction,
62+
protected AbstractListChromosome(final T[] representation, FitnessFunction<P> fitnessFunction,
6363
AbstractListChromosomeDecoder<T, P> decoder) {
6464
this(Arrays.asList(representation), fitnessFunction, decoder);
6565
}
@@ -73,7 +73,7 @@ public AbstractListChromosome(final T[] representation, FitnessFunction<P> fitne
7373
* @param fitnessFunction The {@link FitnessFunction}
7474
* @param decoder The instance of {@link AbstractListChromosomeDecoder}
7575
*/
76-
public AbstractListChromosome(final List<T> representation, final boolean copyList,
76+
protected AbstractListChromosome(final List<T> representation, final boolean copyList,
7777
final FitnessFunction<P> fitnessFunction, final AbstractListChromosomeDecoder<T, P> decoder) {
7878
super(fitnessFunction, decoder);
7979
ValidationUtils.checkForNull("representation", representation);

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/chromosome/BinaryChromosome.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public BinaryChromosome(Integer[] representation, FitnessFunction<P> fitnessFunc
5656
*/
5757
@Override
5858
public BinaryChromosome<P> newChromosome(List<Integer> chromosomeRepresentation) {
59-
return new BinaryChromosome<P>(chromosomeRepresentation, getFitnessFunction(), getDecoder());
59+
return new BinaryChromosome<>(chromosomeRepresentation, getFitnessFunction(), getDecoder());
6060
}
6161

6262
/**

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/chromosome/IntegralValuedChromosome.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void checkValidity() {
104104
*/
105105
@Override
106106
public IntegralValuedChromosome<P> newChromosome(List<Integer> chromosomeRepresentation) {
107-
return new IntegralValuedChromosome<P>(chromosomeRepresentation, getFitnessFunction(), getDecoder(), this.min,
107+
return new IntegralValuedChromosome<>(chromosomeRepresentation, getFitnessFunction(), getDecoder(), this.min,
108108
this.max);
109109
}
110110

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/chromosome/RealValuedChromosome.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private void checkValidity() {
129129
*/
130130
@Override
131131
public RealValuedChromosome<P> newChromosome(List<Double> chromosomeRepresentation) {
132-
return new RealValuedChromosome<P>(chromosomeRepresentation, getFitnessFunction(), getDecoder(), this.min,
132+
return new RealValuedChromosome<>(chromosomeRepresentation, getFitnessFunction(), getDecoder(), this.min,
133133
this.max);
134134
}
135135

@@ -146,7 +146,7 @@ public RealValuedChromosome<P> newChromosome(List<Double> chromosomeRepresentati
146146
*/
147147
public static <P> RealValuedChromosome<P> randomChromosome(int length, FitnessFunction<P> fitnessFunction,
148148
AbstractListChromosomeDecoder<Double, P> decoder, double min, double max) {
149-
return new RealValuedChromosome<P>(ChromosomeRepresentationUtils.randomDoubleRepresentation(length, min, max),
149+
return new RealValuedChromosome<>(ChromosomeRepresentationUtils.randomDoubleRepresentation(length, min, max),
150150
fitnessFunction, decoder, min, max);
151151
}
152152

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/convergencecond/StoppingCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface StoppingCondition<P> {
2929
/**
3030
* Determine whether or not the given population satisfies the stopping
3131
* condition.
32-
* @param population TODO
32+
* @param population population of chromosome
3333
*
3434
* @return <code>true</code> if this stopping condition is met by the given
3535
* population, <code>false</code> otherwise.

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/crossover/rategenerator/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/mutation/rategenerator/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

commons-math4-genetics/src/main/java/org/apache/commons/math4/genetics/population/ListPopulation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public Population<P> nextGeneration(final double elitismRate) {
197197

198198
if (oldChromosomes.size() * elitismRate == 0) {
199199
// if no of elite chromosome is 0 crete and return an empty population instance.
200-
return new ListPopulation<P>(getPopulationLimit());
200+
return new ListPopulation<>(getPopulationLimit());
201201
} else {
202202
// create a new generation of chromosomes with same parameters and add the elit
203203
// individuals.

0 commit comments

Comments
 (0)