halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removes deprecated method createNextGenerationPerformed from

Browse Source 
InterfaceStatistics. This was only used in EvA2ESModel.
This commit is contained in:
Fabian Becker 2014-11-13 17:57:49 +01:00
parent ca70b48bd2
commit c3eddfbee4
4 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/eva2/cli/Main.java
View File

@ -67,6 +67,8 @@ public class Main {
final class YamlStatistics implements InterfaceStatistics {
private static final Logger LOGGER = Logger.getLogger(YamlStatistics.class.getName());
private InterfaceStatisticsParameters statisticsParameters;
private List<LinkedHashMap<String, Object>> runs = new ArrayList<>();
public YamlStatistics(InterfaceStatisticsParameters statisticsParameters) {
super();
@ -113,11 +115,6 @@ final class YamlStatistics implements InterfaceStatistics {
}
@Override
public void createNextGenerationPerformed(double[] bestFit, double[] worstFit, int calls) {
}
@Override
public InterfaceStatisticsParameters getStatisticsParameters() {
return statisticsParameters;

31
src/eva2/optimization/statistics/AbstractStatistics.java
View File

@ -920,37 +920,6 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
return new Pair<>(statValuesString, statValues.toArray(new Object[statValues.size()]));
}
/**
* @deprecated The method {@link #createNextGenerationPerformed(eva2.optimization.population.PopulationInterface, eva2.optimization.strategies.InterfaceOptimizer, java.util.List)} should be used instead.
*/
@Override
public synchronized void createNextGenerationPerformed(double[] bestFit,
double[] worstFit, int calls) {
functionCalls = calls;
currentBestFit = bestFit;
currentWorstFit = worstFit;
currentBestFeasibleFit = null;
currentMeanFit = null;
if (firstPlot) {
initializePlots(null, null);
firstPlot = false;
}
if ((iterationCounter == 0) && printHeaderByVerbosity()) {
printToTextListener(getOutputHeaderFieldNamesAsString(null) + '\n');
}
if (doTextOutput() && printLineByVerbosity(calls)) {
Pair<String, Object[]> addInfo = getOutputData(null, null);
printToTextListener(addInfo.head() + '\n');
if (addInfo.tail() != null) {
statDataSumOverAll = updateSum(statDataSumOverAll, ToolBox.parseDoubles(addInfo.tail()));
}
}
plotCurrentResults();
iterationCounter++;
}
/**
* Add the given array to the member array. Do some checks etc.
* If a resultSum array is provided, it is used to add the info and returned. Otherwise

2
src/eva2/optimization/statistics/InterfaceStatistics.java
View File

@ -35,8 +35,6 @@ public interface InterfaceStatistics {
void createNextGenerationPerformed(PopulationInterface Pop, InterfaceOptimizer opt, List<InterfaceAdditionalPopulationInformer> informerList);
void createNextGenerationPerformed(double[] bestFit, double[] worstFit, int calls);
InterfaceStatisticsParameters getStatisticsParameters(); // called from moduleadapter
IndividualInterface getRunBestSolution(); // return the best fitness of the last run (may not be equal to the last population)

5
src/eva2/optimization/statistics/StatisticsDummy.java
View File

@ -49,11 +49,6 @@ public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListen
}
}
@Override
public void createNextGenerationPerformed(double[] bestFit,
double[] worstFit, int calls) {
}
@Override
public double[] getBestFitness() {
if (bestIndividualAllover != null) {