This commit is contained in:
2014-10-28 18:53:52 +01:00
parent 90f006a239
commit 3a3ebc502b
9 changed files with 4 additions and 44 deletions

View File

@@ -727,10 +727,6 @@ public class BinaryScatterSearch extends AbstractOptimizer implements java.io.Se
this.refSetSize = pop.getTargetSize();
}
public String populationTipText() {
return "The Population";
}
@Override
public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(this.refSet);

View File

@@ -261,10 +261,6 @@ public class ClusteringHillClimbing implements InterfacePopulationChangedEventLi
this.population = pop;
}
public String populationTipText() {
return "Change the number of starting individuals stored (Cluster-HC).";
}
@Override
public InterfaceSolutionSet getAllSolutions() {
Population tmp = new Population();

View File

@@ -689,11 +689,6 @@ public class DifferentialEvolution extends AbstractOptimizer implements java.io.
return "Differential Evolution";
}
public String populationTipText() {
return "Edit the properties of the population used.";
}
@Override
public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(this.population);

View File

@@ -138,11 +138,6 @@ public class EvolutionaryProgramming extends AbstractOptimizer implements java.i
return "EP";
}
public String populationTipText() {
return "Edit the properties of the population used.";
}
@Override
public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(getPopulation());

View File

@@ -9,6 +9,7 @@ import eva2.optimization.population.SolutionSet;
import eva2.problems.B1Problem;
import eva2.problems.InterfaceOptimizationProblem;
import eva2.util.annotation.Description;
import eva2.util.annotation.Parameter;
/**
* The flood algorithm, and alternative to the threshold algorithms. No really
@@ -26,6 +27,8 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali
private int fitnessCallsNeeded = 0;
GAIndividualBinaryData bestIndividual, testIndividual;
public double initialFloodPeak = 2000.0, currentFloodPeak;
@Parameter(name = "drainRate", description = "Set the drain rate that reduces the current flood level each generation.")
public double drainRate = 1.0;
public FloodAlgorithm() {
@@ -193,17 +196,13 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali
return "MS-FA";
}
public String populationTipText() {
return "Change the number of best individuals stored (MS-FA).";
}
@Override
public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(getPopulation());
}
/**
* This methods allow you to set/get the temperatur of the flood algorithm
* This methods allow you to set/get the temperature of the flood algorithm
* procedure
*
* @return The initial flood level.
@@ -236,8 +235,4 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali
this.drainRate = 0.0;
}
}
public String drainRateTipText() {
return "Set the drain rate that reduces the current flood level each generation.";
}
}

View File

@@ -139,8 +139,4 @@ public class HillClimbing extends AbstractOptimizer implements java.io.Serializa
public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(getPopulation());
}
public String populationTipText() {
return "Change the number of best individuals stored (MS-HC).";
}
}

View File

@@ -250,10 +250,6 @@ public class MemeticAlgorithm implements InterfaceOptimizer, java.io.Serializabl
this.globalOptimizer.setPopulation(pop);
}
public String populationTipText() {
return "Edit the properties of the population used.";
}
/**
* Choose the global optimization strategy to use
*

View File

@@ -242,10 +242,6 @@ public class MultiObjectiveEA implements InterfaceOptimizer, java.io.Serializabl
this.optimizer.setPopulation(pop);
}
public String populationTipText() {
return "Edit the properties of the Population used.";
}
@Override
public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(getPopulation(), ArchivingNSGAII.getNonDominatedSortedFront(getPopulation().getArchive()).getSortedPop(new EAIndividualComparator(0)));

View File

@@ -144,11 +144,6 @@ public class SteadyStateGA extends AbstractOptimizer implements java.io.Serializ
return "SS-GA";
}
public String populationTipText() {
return "Edit the properties of the population used.";
}
@Override
public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(getPopulation());