From d70a0b804306d71ee37f076f10ba5fd45d5af869 Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Thu, 5 May 2011 13:36:01 +0000
Subject: [PATCH] Cosmetics

---
 src/eva2/EvAInfo.java                         |  5 +++--
 src/eva2/server/stat/EvAJobList.java          | 21 -------------------
 .../stat/EvAStatisticalEvaluationParams.java  | 11 ++++------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/eva2/EvAInfo.java b/src/eva2/EvAInfo.java
index 01218785..6f184f71 100644
--- a/src/eva2/EvAInfo.java
+++ b/src/eva2/EvAInfo.java
@@ -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 
diff --git a/src/eva2/server/stat/EvAJobList.java b/src/eva2/server/stat/EvAJobList.java
index 3932193f..b5b9c7a3 100644
--- a/src/eva2/server/stat/EvAJobList.java
+++ b/src/eva2/server/stat/EvAJobList.java
@@ -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.
 	 * 
diff --git a/src/eva2/server/stat/EvAStatisticalEvaluationParams.java b/src/eva2/server/stat/EvAStatisticalEvaluationParams.java
index fc931ef3..4feaa9e2 100644
--- a/src/eva2/server/stat/EvAStatisticalEvaluationParams.java
+++ b/src/eva2/server/stat/EvAStatisticalEvaluationParams.java
@@ -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() {