diff --git a/src/eva2/cli/Main.java b/src/eva2/cli/Main.java index 3c806305..60bc8399 100644 --- a/src/eva2/cli/Main.java +++ b/src/eva2/cli/Main.java @@ -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> 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; diff --git a/src/eva2/optimization/statistics/AbstractStatistics.java b/src/eva2/optimization/statistics/AbstractStatistics.java index 013482bd..74216e6b 100644 --- a/src/eva2/optimization/statistics/AbstractStatistics.java +++ b/src/eva2/optimization/statistics/AbstractStatistics.java @@ -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 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 diff --git a/src/eva2/optimization/statistics/InterfaceStatistics.java b/src/eva2/optimization/statistics/InterfaceStatistics.java index eccf03e6..732d6e13 100644 --- a/src/eva2/optimization/statistics/InterfaceStatistics.java +++ b/src/eva2/optimization/statistics/InterfaceStatistics.java @@ -35,8 +35,6 @@ public interface InterfaceStatistics { void createNextGenerationPerformed(PopulationInterface Pop, InterfaceOptimizer opt, List 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) diff --git a/src/eva2/optimization/statistics/StatisticsDummy.java b/src/eva2/optimization/statistics/StatisticsDummy.java index 45a3aee7..ff906973 100644 --- a/src/eva2/optimization/statistics/StatisticsDummy.java +++ b/src/eva2/optimization/statistics/StatisticsDummy.java @@ -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) {