From 8f35b0c6d4f9531c49c630c88b9259809af6c1cd Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Sun, 9 Nov 2014 18:50:15 +0100 Subject: [PATCH] Rename StatisticalParameters to remove EvA in name. --- .../statistics/OptimizationJobList.java | 8 ++++---- ...lEvaluation.java => StatisticalEvaluation.java} | 14 +++++++------- ...s.java => StatisticalEvaluationParameters.java} | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) rename src/eva2/optimization/statistics/{EvAStatisticalEvaluation.java => StatisticalEvaluation.java} (96%) rename src/eva2/optimization/statistics/{EvAStatisticalEvaluationParams.java => StatisticalEvaluationParameters.java} (96%) diff --git a/src/eva2/optimization/statistics/OptimizationJobList.java b/src/eva2/optimization/statistics/OptimizationJobList.java index 5af07169..6df84d64 100644 --- a/src/eva2/optimization/statistics/OptimizationJobList.java +++ b/src/eva2/optimization/statistics/OptimizationJobList.java @@ -162,9 +162,9 @@ public class OptimizationJobList extends PropertySelectableList @Override public void actionPerformed(ActionEvent e) { - EvAStatisticalEvaluation.evaluate(jobList, jobList.getObjects(), genericArrayEditor.getSelectedIndices(), - (StatisticsOnSingleDataSet[]) EvAStatisticalEvaluation.statsParams.getOneSampledStats().getSelectedEnum(StatisticsOnSingleDataSet.values()), - (StatisticsOnTwoSampledData[]) EvAStatisticalEvaluation.statsParams.getTwoSampledStats().getSelectedEnum(StatisticsOnTwoSampledData.values())); + StatisticalEvaluation.evaluate(jobList, jobList.getObjects(), genericArrayEditor.getSelectedIndices(), + (StatisticsOnSingleDataSet[]) StatisticalEvaluation.statsParams.getOneSampledStats().getSelectedEnum(StatisticsOnSingleDataSet.values()), + (StatisticsOnTwoSampledData[]) StatisticalEvaluation.statsParams.getTwoSampledStats().getSelectedEnum(StatisticsOnTwoSampledData.values())); } }; ActionListener sl = new ActionListener() { @@ -193,7 +193,7 @@ public class OptimizationJobList extends PropertySelectableList } private static JComponent createStatsPanel(final OptimizationJobList jobList, final GenericArrayEditor edi) { - JParaPanel pan = new JParaPanel(EvAStatisticalEvaluation.statsParams, "Statistics"); + JParaPanel pan = new JParaPanel(StatisticalEvaluation.statsParams, "Statistics"); return pan.makePanel(); } diff --git a/src/eva2/optimization/statistics/EvAStatisticalEvaluation.java b/src/eva2/optimization/statistics/StatisticalEvaluation.java similarity index 96% rename from src/eva2/optimization/statistics/EvAStatisticalEvaluation.java rename to src/eva2/optimization/statistics/StatisticalEvaluation.java index e5d5cab3..a429c364 100644 --- a/src/eva2/optimization/statistics/EvAStatisticalEvaluation.java +++ b/src/eva2/optimization/statistics/StatisticalEvaluation.java @@ -18,10 +18,10 @@ import java.util.logging.Logger; * Do some statistical tests on a set of job results. Note that the plausibility (comparability of the * jobs) is not tested here. */ -public class EvAStatisticalEvaluation { +public class StatisticalEvaluation { - private static Logger LOGGER = Logger.getLogger(EvAStatisticalEvaluation.class.getName()); - public static EvAStatisticalEvaluationParams statsParams = new EvAStatisticalEvaluationParams(); + private static Logger LOGGER = Logger.getLogger(StatisticalEvaluation.class.getName()); + public static StatisticalEvaluationParameters statsParams = new StatisticalEvaluationParameters(); public static void evaluate(InterfaceTextListener textout, OptimizationJob[] jobList, int[] selectedIndices, @@ -189,7 +189,7 @@ public class EvAStatisticalEvaluation { double mean = Double.NaN; if (dat != null) { mean = Mathematics.mean(dat); - mean = EvAStatisticalEvaluation.formatOutput(mean); + mean = StatisticalEvaluation.formatOutput(mean); } return "" + mean; } @@ -199,7 +199,7 @@ public class EvAStatisticalEvaluation { double median = Double.NaN; if (dat != null) { median = Mathematics.median2(dat, true); - median = EvAStatisticalEvaluation.formatOutput(median); + median = StatisticalEvaluation.formatOutput(median); } return "" + median; @@ -210,7 +210,7 @@ public class EvAStatisticalEvaluation { double variance = Double.NaN; if (dat != null) { variance = Mathematics.variance(dat); - variance = EvAStatisticalEvaluation.formatOutput(variance); + variance = StatisticalEvaluation.formatOutput(variance); } return "" + variance; } @@ -220,7 +220,7 @@ public class EvAStatisticalEvaluation { double stdDev = Double.NaN; if (dat != null) { stdDev = Mathematics.stdDev(dat); - stdDev = EvAStatisticalEvaluation.formatOutput(stdDev); + stdDev = StatisticalEvaluation.formatOutput(stdDev); } return "" + stdDev; } diff --git a/src/eva2/optimization/statistics/EvAStatisticalEvaluationParams.java b/src/eva2/optimization/statistics/StatisticalEvaluationParameters.java similarity index 96% rename from src/eva2/optimization/statistics/EvAStatisticalEvaluationParams.java rename to src/eva2/optimization/statistics/StatisticalEvaluationParameters.java index fbafe600..c627578f 100644 --- a/src/eva2/optimization/statistics/EvAStatisticalEvaluationParams.java +++ b/src/eva2/optimization/statistics/StatisticalEvaluationParameters.java @@ -9,7 +9,7 @@ import java.io.Serializable; import java.util.List; @eva2.util.annotation.Description(value = "Select statistical values to be calculated and tests to be performed.") -public class EvAStatisticalEvaluationParams implements Serializable { +public class StatisticalEvaluationParameters implements Serializable { private StringSelection singleStats = new StringSelection(StatisticsOnSingleDataSet.mean, StatisticsOnSingleDataSet.getInfoStrings()); private StringSelection twoSampledStats = new StringSelection(StatisticsOnTwoSampledData.tTestUneqLenEqVar, StatisticsOnTwoSampledData.getInfoStrings());