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

Cosmetics

Browse Source
This commit is contained in:
Marcel Kronfeld 2011-05-05 13:36:01 +00:00
parent 88575949cd
commit d70a0b8043
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eva2/EvAInfo.java
View File

@ -9,8 +9,9 @@ import eva2.tools.BasicResourceLoader;
* Main product and version information strings.
*
* ---- Changelog
* 2.047: Added ScatterSearch (real-valued), BinaryScatterSearch, and the Bayesian Optimization Algorithm (thanks
* to Alexander Seitz) to the base package.
* 2.05: Added ScatterSearch (real-valued), BinaryScatterSearch, and the Bayesian Optimization Algorithm (thanks
* to Alexander Seitz) to the base package. Added JobList and some statistical measures. Requires to put
* the JSC package on the class path for Mann-Whitney test.
* 2.046: Adaptions to the MatlabInterface: explicit data types are used now, added integer problem support.
* Additional Integer operators: segment-wise mutation and crossover. Added an abstraction over individual
* initialization methods. Added the ERPStarter class which is an example for running a csv-configured

21
src/eva2/server/stat/EvAJobList.java
View File

@ -38,8 +38,6 @@ public class EvAJobList extends PropertySelectableList<EvAJob> implements Serial
List<InterfaceTextListener> listeners = null;
private ModuleAdapter module = null;
// private static transient LogPanel logPanel = null;
// private static transient JFrame statsFrame = null;
public EvAJobList(EvAJob[] initial) {
super(initial);
@ -147,25 +145,6 @@ public class EvAJobList extends PropertySelectableList<EvAJob> implements Serial
return null;
}
// private static List<JButton> getActionButtons(final EvAJobList jobList, final GenericArrayEditor edi) {
// LinkedList<JButton> buts = new LinkedList<JButton>();
// buts.add(getRunButton(jobList, edi));
// return buts;
// }
// private static JButton getRunButton(final EvAJobList jobList, final GenericArrayEditor edi) {
// JButton runBut = new JButton("Exec");
// runBut.addActionListener(new ActionListener() {
// public void actionPerformed(ActionEvent e) {
// System.out.println("PING!");
// System.out.println(BeanInspector.toString(edi.getSelectedIndices()));
// EvAStatisticalEvaluation.evaluate((InterfaceTextListener)jobList, jobList.getObjects(), edi.getSelectedIndices());
// System.out.println(BeanInspector.toString(EvAStatisticalEvaluation.statsParams.getPairedStats().getSelected()));
// }
// });
// return runBut;
// }
/**
* Create a customized editor for the job list based on an array editor.
*

11
src/eva2/server/stat/EvAStatisticalEvaluationParams.java
View File

@ -8,10 +8,7 @@ import javax.swing.JButton;
import eva2.tools.StringSelection;
public class EvAStatisticalEvaluationParams implements Serializable {
// private StatsOnDataSetPairEnum[] pairedStats = new StatsOnDataSetPairEnum[] {StatsOnDataSetPairEnum.tTestEqual, StatsOnDataSetPairEnum.tTestUnequal};
// private StatsOnSingleDataSetEnum[] singleStats = new StatsOnSingleDataSetEnum[] {StatsOnSingleDataSetEnum.mean, StatsOnSingleDataSetEnum.median};
private StringSelection singleStats = new StringSelection(StatsOnSingleDataSetEnum.mean, StatsOnSingleDataSetEnum.getInfoStrings());
private StringSelection twoSampledStats = new StringSelection(StatsOnTwoSampledDataEnum.tTestUneqLenEqVar, StatsOnTwoSampledDataEnum.getInfoStrings());
private List<JButton> additionalButtons = null;
@ -23,8 +20,8 @@ public class EvAStatisticalEvaluationParams implements Serializable {
public StringSelection getTwoSampledStats() {
return twoSampledStats;
}
public void setTwoSampledStats(StringSelection pairedStats) {
this.twoSampledStats = pairedStats;
public void setTwoSampledStats(StringSelection twoSStats) {
this.twoSampledStats = twoSStats;
}
public String twoSampledStatsTipText() {
return "Statistical tests on two-sampled data";
@ -45,7 +42,7 @@ public class EvAStatisticalEvaluationParams implements Serializable {
}
public String globalInfo() {
return "Select statistical values to be calculated and paired tests to be performed.";
return "Select statistical values to be calculated and tests to be performed.";
}
public List<JButton> getAdditionalButtons() {