From d0268527b0abdc29c35edfcf44718db20a140d33 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Sat, 1 Nov 2014 18:18:58 +0100 Subject: [PATCH] Rename InterfaceStatisticsParameter to InterfaceStatisticsParameters for consistentcy with OptimizationParameters --- src/eva2/OptimizerRunnable.java | 2 +- src/eva2/gui/Main.java | 5 ++- .../modules/GenericModuleAdapter.java | 2 +- .../operator/postprocess/PostProcess.java | 4 +-- .../statistics/AbstractStatistics.java | 20 +++++------ .../statistics/InterfaceStatistics.java | 2 +- .../InterfaceStatisticsListener.java | 4 +-- ...ava => InterfaceStatisticsParameters.java} | 4 +-- .../statistics/StatisticsDummy.java | 12 +++---- ...rameter.java => StatisticsParameters.java} | 34 +++++++++---------- .../statistics/StatisticsStandalone.java | 12 +++---- .../statistics/StatisticsWithGUI.java | 4 +-- 12 files changed, 52 insertions(+), 53 deletions(-) rename src/eva2/optimization/statistics/{InterfaceStatisticsParameter.java => InterfaceStatisticsParameters.java} (94%) rename src/eva2/optimization/statistics/{StatisticsParameter.java => StatisticsParameters.java} (91%) diff --git a/src/eva2/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java index 52fe1070..1d5252de 100644 --- a/src/eva2/OptimizerRunnable.java +++ b/src/eva2/OptimizerRunnable.java @@ -268,7 +268,7 @@ public class OptimizerRunnable implements Runnable { * @param outp */ public void setOutputTo(int outp) { - ((StatisticsParameter) proc.getStatistics().getStatisticsParameter()).setOutputTo(outp); + ((StatisticsParameters) proc.getStatistics().getStatisticsParameter()).setOutputTo(outp); } /** diff --git a/src/eva2/gui/Main.java b/src/eva2/gui/Main.java index ddca4331..9e0b1735 100644 --- a/src/eva2/gui/Main.java +++ b/src/eva2/gui/Main.java @@ -2,14 +2,13 @@ package eva2.gui; import eva2.EvAInfo; import eva2.optimization.modules.*; -import eva2.problems.InterfaceOptimizationProblem; +import eva2.optimization.statistics.InterfaceStatisticsParameters; import eva2.util.ClassPreloader; import eva2.util.EvAComAdapter; import eva2.optimization.OptimizationStateListener; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.statistics.AbstractStatistics; import eva2.optimization.statistics.InterfaceStatisticsListener; -import eva2.optimization.statistics.InterfaceStatisticsParameter; import eva2.tools.BasicResourceLoader; import eva2.tools.EVAERROR; import eva2.tools.ReflectPackage; @@ -759,7 +758,7 @@ public class Main extends JFrame implements OptimizationStateListener { return ((GenericModuleAdapter) currentModuleAdapter).getStatistics(); } - public InterfaceStatisticsParameter getStatisticsParameter() { + public InterfaceStatisticsParameters getStatisticsParameter() { return ((GenericModuleAdapter) currentModuleAdapter).getStatistics().getStatisticsParameter(); } diff --git a/src/eva2/optimization/modules/GenericModuleAdapter.java b/src/eva2/optimization/modules/GenericModuleAdapter.java index 1dc4e371..f5fc6dff 100644 --- a/src/eva2/optimization/modules/GenericModuleAdapter.java +++ b/src/eva2/optimization/modules/GenericModuleAdapter.java @@ -83,7 +83,7 @@ public class GenericModuleAdapter extends AbstractModuleAdapter implements Seria } EvATabbedFrameMaker frmMkr = new EvATabbedFrameMaker(); - InterfaceStatisticsParameter Stat = statisticsModule.getStatisticsParameter(); + InterfaceStatisticsParameters Stat = statisticsModule.getStatisticsParameter(); EvAModuleButtonPanelMaker buttonPanel = new EvAModuleButtonPanelMaker(remoteModuleAdapter, ((Processor) processor).isOptimizationRunning()); buttonPanel.setHelperFilename(helperFilename); frmMkr.addPanelMaker(buttonPanel); diff --git a/src/eva2/optimization/operator/postprocess/PostProcess.java b/src/eva2/optimization/operator/postprocess/PostProcess.java index 13b7d703..a4f023eb 100644 --- a/src/eva2/optimization/operator/postprocess/PostProcess.java +++ b/src/eva2/optimization/operator/postprocess/PostProcess.java @@ -23,9 +23,9 @@ import eva2.optimization.operator.selection.SelectBestIndividuals; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; +import eva2.optimization.statistics.StatisticsParameters; import eva2.problems.*; import eva2.optimization.statistics.InterfaceTextListener; -import eva2.optimization.statistics.StatisticsParameter; import eva2.optimization.strategies.EvolutionStrategies; import eva2.optimization.strategies.GradientDescentAlgorithm; import eva2.optimization.strategies.HillClimbing; @@ -814,7 +814,7 @@ public class PostProcess { */ private static void runPP(OptimizerRunnable rnbl) { rnbl.getOptimizationParameters().setDoPostProcessing(false); - rnbl.setVerbosityLevel(StatisticsParameter.VERBOSITY_NONE); + rnbl.setVerbosityLevel(StatisticsParameters.VERBOSITY_NONE); ppRunnables.add(rnbl); rnbl.run(); rnbl.getOptimizationParameters().setDoPostProcessing(true); diff --git a/src/eva2/optimization/statistics/AbstractStatistics.java b/src/eva2/optimization/statistics/AbstractStatistics.java index cdc80287..5cf849a1 100644 --- a/src/eva2/optimization/statistics/AbstractStatistics.java +++ b/src/eva2/optimization/statistics/AbstractStatistics.java @@ -41,7 +41,7 @@ import java.util.*; */ public abstract class AbstractStatistics implements InterfaceTextListener, InterfaceStatistics { private transient PrintWriter resultOut; - protected InterfaceStatisticsParameter statisticsParameter; + protected InterfaceStatisticsParameters statisticsParameter; /** * Keep track of all intermediate fitness values, best, avg. and worst, averaging over all runs @@ -199,7 +199,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter String startDate = getDateString(); // open the result file: if (doFileOutput() // not "text-window only" - && (statisticsParameter.getOutputVerbosity().getSelectedTagID() > StatisticsParameter.VERBOSITY_NONE)) { // verbosity accordingly high + && (statisticsParameter.getOutputVerbosity().getSelectedTagID() > StatisticsParameters.VERBOSITY_NONE)) { // verbosity accordingly high //!resFName.equalsIgnoreCase("none") && !resFName.equals("")) { String fnameBase = makeOutputFileName(statisticsParameter.getResultFilePrefix(), infoString, startDate); int cnt = 0; @@ -672,7 +672,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter } @Override - public InterfaceStatisticsParameter getStatisticsParameter() { + public InterfaceStatisticsParameters getStatisticsParameter() { return statisticsParameter; } @@ -1209,22 +1209,22 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter * @return */ private boolean printLineByVerbosity(int iteration) { - return (statisticsParameter.getOutputVerbosity().getSelectedTagID() > StatisticsParameter.VERBOSITY_KTH_IT) - || ((statisticsParameter.getOutputVerbosity().getSelectedTagID() == StatisticsParameter.VERBOSITY_KTH_IT) + return (statisticsParameter.getOutputVerbosity().getSelectedTagID() > StatisticsParameters.VERBOSITY_KTH_IT) + || ((statisticsParameter.getOutputVerbosity().getSelectedTagID() == StatisticsParameters.VERBOSITY_KTH_IT) && (isKthRun(iteration, statisticsParameter.getOutputVerbosityK()))); } private boolean printRunIntroVerbosity() { - return (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameter.VERBOSITY_KTH_IT) - || (optRunsPerformed == 0 && (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameter.VERBOSITY_FINAL)); + return (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameters.VERBOSITY_KTH_IT) + || (optRunsPerformed == 0 && (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameters.VERBOSITY_FINAL)); } private boolean printRunStoppedVerbosity() { - return (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameter.VERBOSITY_KTH_IT); + return (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameters.VERBOSITY_KTH_IT); } private boolean printFinalVerbosity() { - return (statisticsParameter.getOutputVerbosity().getSelectedTagID() > StatisticsParameter.VERBOSITY_NONE); + return (statisticsParameter.getOutputVerbosity().getSelectedTagID() > StatisticsParameters.VERBOSITY_NONE); } private boolean isKthRun(int i, int k) { @@ -1244,7 +1244,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter } private boolean printHeaderByVerbosity() { - return (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameter.VERBOSITY_KTH_IT); + return (statisticsParameter.getOutputVerbosity().getSelectedTagID() >= StatisticsParameters.VERBOSITY_KTH_IT); } private static void divideMean(Double[] mean, double d) { diff --git a/src/eva2/optimization/statistics/InterfaceStatistics.java b/src/eva2/optimization/statistics/InterfaceStatistics.java index ccb1356d..a2438073 100644 --- a/src/eva2/optimization/statistics/InterfaceStatistics.java +++ b/src/eva2/optimization/statistics/InterfaceStatistics.java @@ -36,7 +36,7 @@ public interface InterfaceStatistics { void createNextGenerationPerformed(double[] bestFit, double[] worstFit, int calls); - InterfaceStatisticsParameter getStatisticsParameter(); // called from moduleadapter + InterfaceStatisticsParameters getStatisticsParameter(); // 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/InterfaceStatisticsListener.java b/src/eva2/optimization/statistics/InterfaceStatisticsListener.java index a9985cd7..c15cf140 100644 --- a/src/eva2/optimization/statistics/InterfaceStatisticsListener.java +++ b/src/eva2/optimization/statistics/InterfaceStatisticsListener.java @@ -7,7 +7,7 @@ import java.util.List; * * @author mkron * @see AbstractStatistics - * @see InterfaceStatisticsParameter + * @see InterfaceStatisticsParameters */ public interface InterfaceStatisticsListener { /** @@ -44,7 +44,7 @@ public interface InterfaceStatisticsListener { * * @param header * @param multiRunFinalObjectData - * @see InterfaceStatisticsParameter + * @see InterfaceStatisticsParameters * @see AbstractStatistics */ public void finalMultiRunResults(String[] header, List multiRunFinalObjectData); diff --git a/src/eva2/optimization/statistics/InterfaceStatisticsParameter.java b/src/eva2/optimization/statistics/InterfaceStatisticsParameters.java similarity index 94% rename from src/eva2/optimization/statistics/InterfaceStatisticsParameter.java rename to src/eva2/optimization/statistics/InterfaceStatisticsParameters.java index 1ff5ec78..fe94a46d 100644 --- a/src/eva2/optimization/statistics/InterfaceStatisticsParameter.java +++ b/src/eva2/optimization/statistics/InterfaceStatisticsParameters.java @@ -6,9 +6,9 @@ import eva2.tools.StringSelection; /** * An interface to encapsulate statistics parameters. * - * @see StatisticsParameter + * @see StatisticsParameters */ -public interface InterfaceStatisticsParameter { +public interface InterfaceStatisticsParameters { String getName(); void saveInstance(); diff --git a/src/eva2/optimization/statistics/StatisticsDummy.java b/src/eva2/optimization/statistics/StatisticsDummy.java index 6118f245..661026bb 100644 --- a/src/eva2/optimization/statistics/StatisticsDummy.java +++ b/src/eva2/optimization/statistics/StatisticsDummy.java @@ -15,19 +15,19 @@ import java.util.List; */ public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListener { private boolean consoleOut = false; - private StatisticsParameter sParams = null; + private StatisticsParameters sParams = null; private AbstractEAIndividual bestCurrentIndividual, bestRunIndy, bestIndividualAllover; public StatisticsDummy() { bestIndividualAllover = null; - sParams = new StatisticsParameter(); - sParams.setOutputVerbosityK(StatisticsParameter.VERBOSITY_NONE); + sParams = new StatisticsParameters(); + sParams.setOutputVerbosityK(StatisticsParameters.VERBOSITY_NONE); } public StatisticsDummy(boolean doConsoleOut) { bestIndividualAllover = null; - sParams = new StatisticsParameter(); - sParams.setOutputVerbosityK(StatisticsParameter.VERBOSITY_NONE); + sParams = new StatisticsParameters(); + sParams.setOutputVerbosityK(StatisticsParameters.VERBOSITY_NONE); consoleOut = doConsoleOut; } @@ -73,7 +73,7 @@ public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListen } @Override - public InterfaceStatisticsParameter getStatisticsParameter() { + public InterfaceStatisticsParameters getStatisticsParameter() { return sParams; } diff --git a/src/eva2/optimization/statistics/StatisticsParameter.java b/src/eva2/optimization/statistics/StatisticsParameters.java similarity index 91% rename from src/eva2/optimization/statistics/StatisticsParameter.java rename to src/eva2/optimization/statistics/StatisticsParameters.java index 2724671c..849c36cd 100644 --- a/src/eva2/optimization/statistics/StatisticsParameter.java +++ b/src/eva2/optimization/statistics/StatisticsParameters.java @@ -30,9 +30,9 @@ import java.util.logging.Logger; * @see AbstractStatistics */ @Description(value = "Configure statistics and output of the optimization run. Changes to the data selection state will not take effect during a run.") -public class StatisticsParameter implements InterfaceStatisticsParameter, InterfaceNotifyOnInformers, Serializable { +public class StatisticsParameters implements InterfaceStatisticsParameters, InterfaceNotifyOnInformers, Serializable { private static final long serialVersionUID = -8681061379203108390L; - private static final Logger LOGGER = Logger.getLogger(StatisticsParameter.class.getName()); + private static final Logger LOGGER = Logger.getLogger(StatisticsParameters.class.getName()); public final static int VERBOSITY_NONE = 0; public final static int VERBOSITY_FINAL = 1; public final static int VERBOSITY_KTH_IT = 2; @@ -55,11 +55,11 @@ public class StatisticsParameter implements InterfaceStatisticsParameter, Interf /** * */ - public static StatisticsParameter getInstance(boolean loadDefaultSerFile) { + public static StatisticsParameters getInstance(boolean loadDefaultSerFile) { if (loadDefaultSerFile) { return getInstance("Statistics.ser"); } else { - return new StatisticsParameter(); + return new StatisticsParameters(); } } @@ -68,17 +68,17 @@ public class StatisticsParameter implements InterfaceStatisticsParameter, Interf * * @return A loaded (from file) or new instance of the class. */ - public static StatisticsParameter getInstance(String serFileName) { - StatisticsParameter instance = null; + public static StatisticsParameters getInstance(String serFileName) { + StatisticsParameters instance = null; try { FileInputStream fileStream = new FileInputStream(serFileName); - instance = (StatisticsParameter) Serializer.loadObject(fileStream); + instance = (StatisticsParameters) Serializer.loadObject(fileStream); } catch (FileNotFoundException ex) { LOGGER.log(Level.WARNING, "Could not store instance object.", ex); } if (instance == null) { - instance = new StatisticsParameter(); + instance = new StatisticsParameters(); } return instance; } @@ -86,7 +86,7 @@ public class StatisticsParameter implements InterfaceStatisticsParameter, Interf /** * */ - public StatisticsParameter() { + public StatisticsParameters() { name = "Statistics"; outputVerbosity.setSelectedTag(VERBOSITY_KTH_IT); outputTo.setSelectedTag(1); @@ -121,20 +121,20 @@ public class StatisticsParameter implements InterfaceStatisticsParameter, Interf /** * */ - private StatisticsParameter(StatisticsParameter statisticsParameter) { - convergenceRateThreshold = statisticsParameter.convergenceRateThreshold; - useStatPlot = statisticsParameter.useStatPlot; - textOutput = statisticsParameter.textOutput; - multiRuns = statisticsParameter.multiRuns; - resultFilePrefix = statisticsParameter.resultFilePrefix; - verbosityK = statisticsParameter.verbosityK; + private StatisticsParameters(StatisticsParameters statisticsParameters) { + convergenceRateThreshold = statisticsParameters.convergenceRateThreshold; + useStatPlot = statisticsParameters.useStatPlot; + textOutput = statisticsParameters.textOutput; + multiRuns = statisticsParameters.multiRuns; + resultFilePrefix = statisticsParameters.resultFilePrefix; + verbosityK = statisticsParameters.verbosityK; } /** * */ public Object getClone() { - return new StatisticsParameter(this); + return new StatisticsParameters(this); } /** diff --git a/src/eva2/optimization/statistics/StatisticsStandalone.java b/src/eva2/optimization/statistics/StatisticsStandalone.java index d8721c59..53e55cce 100644 --- a/src/eva2/optimization/statistics/StatisticsStandalone.java +++ b/src/eva2/optimization/statistics/StatisticsStandalone.java @@ -24,30 +24,30 @@ public class StatisticsStandalone extends AbstractStatistics implements Interfac private boolean collectData = false; - public StatisticsStandalone(InterfaceStatisticsParameter statParams) { + public StatisticsStandalone(InterfaceStatisticsParameters statParams) { super(); statisticsParameter = statParams; } public StatisticsStandalone(String resultFileName) { - this(resultFileName, 1, resultFileName == null ? StatisticsParameter.VERBOSITY_NONE : StatisticsParameter.VERBOSITY_FINAL, false); + this(resultFileName, 1, resultFileName == null ? StatisticsParameters.VERBOSITY_NONE : StatisticsParameters.VERBOSITY_FINAL, false); } public StatisticsStandalone(String resultFileName, int multiRuns, int verbosity, boolean outputAllFieldsAsText) { - this(StatisticsParameter.getInstance(false)); + this(StatisticsParameters.getInstance(false)); statisticsParameter.setMultiRuns(multiRuns); statisticsParameter.setOutputVerbosity(statisticsParameter.getOutputVerbosity().setSelectedTag(verbosity)); statisticsParameter.setResultFilePrefix(resultFileName); statisticsParameter.setOutputAllFieldsAsText(outputAllFieldsAsText); if (resultFileName == null) { - statisticsParameter.getOutputTo().setSelectedTag(StatisticsParameter.OUTPUT_WINDOW); + statisticsParameter.getOutputTo().setSelectedTag(StatisticsParameters.OUTPUT_WINDOW); } else { - statisticsParameter.setOutputTo(statisticsParameter.getOutputTo().setSelectedTag(StatisticsParameter.OUTPUT_FILE)); + statisticsParameter.setOutputTo(statisticsParameter.getOutputTo().setSelectedTag(StatisticsParameters.OUTPUT_FILE)); } } public StatisticsStandalone() { - this(new StatisticsParameter()); + this(new StatisticsParameters()); } @Override diff --git a/src/eva2/optimization/statistics/StatisticsWithGUI.java b/src/eva2/optimization/statistics/StatisticsWithGUI.java index 6858eea6..c5eac350 100644 --- a/src/eva2/optimization/statistics/StatisticsWithGUI.java +++ b/src/eva2/optimization/statistics/StatisticsWithGUI.java @@ -45,7 +45,7 @@ public class StatisticsWithGUI extends AbstractStatistics implements Serializabl * */ public StatisticsWithGUI() { - statisticsParameter = StatisticsParameter.getInstance(true); + statisticsParameter = StatisticsParameters.getInstance(true); proxyPrinter = new JTextoutputFrame("Optimization Log"); addTextListener(proxyPrinter); } @@ -113,7 +113,7 @@ public class StatisticsWithGUI extends AbstractStatistics implements Serializabl @Override protected void initPlots(PopulationInterface pop, List informerList) { - if (statisticsParameter instanceof StatisticsParameter) { + if (statisticsParameter instanceof StatisticsParameters) { graphDesc = lastFieldSelection.getSelectedWithIndex(); } else { graphDesc = null;