From 173ebd67c6b41219d06aec37abd608a66b4768b9 Mon Sep 17 00:00:00 2001
From: Fabian Becker <halfdan@xnorfz.de>
Date: Sun, 2 Nov 2014 16:10:57 +0100
Subject: [PATCH] Cleanup as well as moving TipText methods to useful
 @Parameter annotations.

---
 .../individuals/InterfaceDataTypeDouble.java       |  3 +++
 .../strategies/ParticleSwarmOptimization.java      |  4 ++--
 src/eva2/problems/AbstractProblemDouble.java       | 14 +++-----------
 src/eva2/tools/ToolBox.java                        |  3 +--
 src/eva2/tools/math/Mathematics.java               |  4 +++-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/eva2/optimization/individuals/InterfaceDataTypeDouble.java b/src/eva2/optimization/individuals/InterfaceDataTypeDouble.java
index fe7df601..2eca7aee 100644
--- a/src/eva2/optimization/individuals/InterfaceDataTypeDouble.java
+++ b/src/eva2/optimization/individuals/InterfaceDataTypeDouble.java
@@ -1,5 +1,7 @@
 package eva2.optimization.individuals;
 
+import eva2.util.annotation.Parameter;
+
 /**
  * This interface gives access to a double phenotype and except
  * for problemspecific operators should only be used by the
@@ -28,6 +30,7 @@ public interface InterfaceDataTypeDouble {
      *
      * @param range The new range for the double data.
      */
+    @Parameter(name = "range", description = "The initialization range for the individual.")
     public void setDoubleRange(double[][] range);
 
     /**
diff --git a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java
index cbdcf2ae..0e327590 100644
--- a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java
+++ b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java
@@ -1422,7 +1422,7 @@ public class ParticleSwarmOptimization extends AbstractOptimizer implements java
     /**
      * Randomly assign groups of size groupSize.
      *
-     * @param links
+     * @param pop
      * @param groupSize
      */
     private Vector<int[]> regroupSwarm(Population pop, int groupSize) {
@@ -1680,7 +1680,7 @@ public class ParticleSwarmOptimization extends AbstractOptimizer implements java
     /**
      * This method allows you to choose the topology type.
      *
-     * @param s The type.
+     * @param t The type.
      */
     public void setTopology(PSOTopology t) {
         this.topology = t;
diff --git a/src/eva2/problems/AbstractProblemDouble.java b/src/eva2/problems/AbstractProblemDouble.java
index 1962b064..518a1181 100644
--- a/src/eva2/problems/AbstractProblemDouble.java
+++ b/src/eva2/problems/AbstractProblemDouble.java
@@ -274,9 +274,7 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem
      * @return
      */
     public static Matrix initializeDefaultRotationMatrix(double rotAngle, int dim) {
-        Matrix rotation = null;
-        rotation = Mathematics.getRotationMatrix((rotAngle * Math.PI / 180.), dim).transpose();
-        return rotation;
+        return Mathematics.getRotationMatrix((rotAngle * Math.PI / 180.), dim).transpose();
     }
 
     /**
@@ -498,28 +496,22 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem
         return constraintArray;
     }
 
+    @Parameter(description = "Add constraints to the problem.")
     public void setConstraints(AbstractConstraint[] constrArray) {
         this.constraintArray = constrArray;
     }
 
-    public String constraintsTipText() {
-        return "Add constraints to the problem.";
-    }
-
     public boolean isWithConstraints() {
         return withConstraints;
     }
 
+    @Parameter(description = "(De-)Activate constraints for the problem.")
     public void setWithConstraints(boolean withConstraints) {
         this.withConstraints = withConstraints;
         GenericObjectEditor.setShowProperty(this.getClass(), "constraints",
                 withConstraints);
     }
 
-    public String withConstraintsTipText() {
-        return "(De-)Activate constraints for the problem.";
-    }
-
     @Override
     public String[] getAdditionalDataHeader() {
         String[] superHeader = super.getAdditionalDataHeader();
diff --git a/src/eva2/tools/ToolBox.java b/src/eva2/tools/ToolBox.java
index 697ee4a9..9ac24240 100644
--- a/src/eva2/tools/ToolBox.java
+++ b/src/eva2/tools/ToolBox.java
@@ -13,8 +13,7 @@ public final class ToolBox {
     /**
      * Private constructor to prevent instances of module class.
      */
-    private ToolBox() {
-    }
+    private ToolBox() {}
 
     /**
      * Convert all items of an enum to a String array and append the given String array at the end.
diff --git a/src/eva2/tools/math/Mathematics.java b/src/eva2/tools/math/Mathematics.java
index 012d13d6..63c07fd4 100644
--- a/src/eva2/tools/math/Mathematics.java
+++ b/src/eva2/tools/math/Mathematics.java
@@ -10,7 +10,9 @@ import eva2.tools.math.interpolation.SplineInterpolation;
 import java.util.Arrays;
 import java.util.List;
 
-public class Mathematics {
+public final class Mathematics {
+    private Mathematics() {}
+
     /**
      * Computes the full adjoint matrix.
      *