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

Rename StatisticalParameters to remove EvA in name.

Browse Source
This commit is contained in:
Fabian Becker 2014-11-09 18:50:15 +01:00
parent 88ef09db21
commit 8f35b0c6d4
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eva2/optimization/statistics/OptimizationJobList.java
View File

@ -162,9 +162,9 @@ public class OptimizationJobList extends PropertySelectableList<OptimizationJob>
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
EvAStatisticalEvaluation.evaluate(jobList, jobList.getObjects(), genericArrayEditor.getSelectedIndices(), StatisticalEvaluation.evaluate(jobList, jobList.getObjects(), genericArrayEditor.getSelectedIndices(),
(StatisticsOnSingleDataSet[]) EvAStatisticalEvaluation.statsParams.getOneSampledStats().getSelectedEnum(StatisticsOnSingleDataSet.values()), (StatisticsOnSingleDataSet[]) StatisticalEvaluation.statsParams.getOneSampledStats().getSelectedEnum(StatisticsOnSingleDataSet.values()),
(StatisticsOnTwoSampledData[]) EvAStatisticalEvaluation.statsParams.getTwoSampledStats().getSelectedEnum(StatisticsOnTwoSampledData.values())); (StatisticsOnTwoSampledData[]) StatisticalEvaluation.statsParams.getTwoSampledStats().getSelectedEnum(StatisticsOnTwoSampledData.values()));
} }
}; };
ActionListener sl = new ActionListener() { ActionListener sl = new ActionListener() {
@ -193,7 +193,7 @@ public class OptimizationJobList extends PropertySelectableList<OptimizationJob>
} }
private static JComponent createStatsPanel(final OptimizationJobList jobList, final GenericArrayEditor edi) { 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(); return pan.makePanel();
} }

14
src/eva2/optimization/statistics/EvAStatisticalEvaluation.java → src/eva2/optimization/statistics/StatisticalEvaluation.java
View File

@ -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 * Do some statistical tests on a set of job results. Note that the plausibility (comparability of the
* jobs) is not tested here. * jobs) is not tested here.
*/ */
public class EvAStatisticalEvaluation { public class StatisticalEvaluation {
private static Logger LOGGER = Logger.getLogger(EvAStatisticalEvaluation.class.getName()); private static Logger LOGGER = Logger.getLogger(StatisticalEvaluation.class.getName());
public static EvAStatisticalEvaluationParams statsParams = new EvAStatisticalEvaluationParams(); public static StatisticalEvaluationParameters statsParams = new StatisticalEvaluationParameters();
public static void evaluate(InterfaceTextListener textout, OptimizationJob[] jobList, int[] selectedIndices, public static void evaluate(InterfaceTextListener textout, OptimizationJob[] jobList, int[] selectedIndices,
@ -189,7 +189,7 @@ public class EvAStatisticalEvaluation {
double mean = Double.NaN; double mean = Double.NaN;
if (dat != null) { if (dat != null) {
mean = Mathematics.mean(dat); mean = Mathematics.mean(dat);
mean = EvAStatisticalEvaluation.formatOutput(mean); mean = StatisticalEvaluation.formatOutput(mean);
} }
return "" + mean; return "" + mean;
} }
@ -199,7 +199,7 @@ public class EvAStatisticalEvaluation {
double median = Double.NaN; double median = Double.NaN;
if (dat != null) { if (dat != null) {
median = Mathematics.median2(dat, true); median = Mathematics.median2(dat, true);
median = EvAStatisticalEvaluation.formatOutput(median); median = StatisticalEvaluation.formatOutput(median);
} }
return "" + median; return "" + median;
@ -210,7 +210,7 @@ public class EvAStatisticalEvaluation {
double variance = Double.NaN; double variance = Double.NaN;
if (dat != null) { if (dat != null) {
variance = Mathematics.variance(dat); variance = Mathematics.variance(dat);
variance = EvAStatisticalEvaluation.formatOutput(variance); variance = StatisticalEvaluation.formatOutput(variance);
} }
return "" + variance; return "" + variance;
} }
@ -220,7 +220,7 @@ public class EvAStatisticalEvaluation {
double stdDev = Double.NaN; double stdDev = Double.NaN;
if (dat != null) { if (dat != null) {
stdDev = Mathematics.stdDev(dat); stdDev = Mathematics.stdDev(dat);
stdDev = EvAStatisticalEvaluation.formatOutput(stdDev); stdDev = StatisticalEvaluation.formatOutput(stdDev);
} }
return "" + stdDev; return "" + stdDev;
} }

2
src/eva2/optimization/statistics/EvAStatisticalEvaluationParams.java → src/eva2/optimization/statistics/StatisticalEvaluationParameters.java
View File

@ -9,7 +9,7 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
@eva2.util.annotation.Description(value = "Select statistical values to be calculated and tests to be performed.") @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 singleStats = new StringSelection(StatisticsOnSingleDataSet.mean, StatisticsOnSingleDataSet.getInfoStrings());
private StringSelection twoSampledStats = new StringSelection(StatisticsOnTwoSampledData.tTestUneqLenEqVar, StatisticsOnTwoSampledData.getInfoStrings()); private StringSelection twoSampledStats = new StringSelection(StatisticsOnTwoSampledData.tTestUneqLenEqVar, StatisticsOnTwoSampledData.getInfoStrings());