[cilib-devel] [PATCH 04/14] Renames and JavaDoc comment updates.

[Theuns C. <the...@gm...>]

---
 .../measurement/single/NumberOfClustersFormed.java |   12 ++++++------
 .../cilib/problem/ClusteringProblem.java           |   10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/sourceforge/cilib/measurement/single/NumberOfClustersFormed.java b/src/main/java/net/sourceforge/cilib/measurement/single/NumberOfClustersFormed.java
index 835bd5c..480758e 100644
--- a/src/main/java/net/sourceforge/cilib/measurement/single/NumberOfClustersFormed.java
+++ b/src/main/java/net/sourceforge/cilib/measurement/single/NumberOfClustersFormed.java
@@ -73,15 +73,15 @@ public class NumberOfClustersFormed implements Measurement {
         ClusteringUtils helper = ClusteringUtils.get();
         Vector centroids = (Vector) algorithm.getBestSolution().getPosition();
         helper.arrangeClustersAndCentroids(centroids);
-        plotClusters();
+//		plotClustersAndCentroids();
         return new Int(helper.getArrangedCentroids().size());
     }
 
-    private void plotClusters() {
-//      System.out.println("reset");
-//      System.out.println("set term jpeg medium");
-//      System.out.println("set output \"iteration." + String.format("%04d", Algorithm.get().getIterations()) + ".jpg\"");
-//      System.out.print("plot [-0.5:10][-5:5] sin(x) - 0.5, 0.5 - sin(x), ");
+    private void plotClustersAndCentroids() {
+//		System.out.println("reset");
+//		System.out.println("set term jpeg medium");
+//		System.out.println("set output \"iteration." + String.format("%04d", Algorithm.get().getIterations()) + ".jpg\"");
+//		System.out.print("plot [-0.5:10][-5:5] sin(x) - 0.5, 0.5 - sin(x), ");
         System.out.print("plot ");
 
         ArrayList<Hashtable<Integer, Pattern>> arrangedClusters = ClusteringUtils.get().getArrangedClusters();
diff --git a/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java b/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java
index b8c8804..ee89d00 100644
--- a/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java
@@ -87,7 +87,6 @@ import net.sourceforge.cilib.util.EuclideanDistanceMeasure;
 public class ClusteringProblem extends OptimisationProblemAdapter {
     private static final long serialVersionUID = 7027242527499147957L;
     private static Logger logger = LoggerFactory.getLogger(ClusteringProblem.class);
-
     private FunctionOptimisationProblem innerProblem;
     private int numberOfClusters;
     private DomainRegistry domainRegistry;
@@ -211,7 +210,7 @@ public class ClusteringProblem extends OptimisationProblemAdapter {
 
     /**
      * Return the actual domain of the problem's dataset, i.e. NOT the duplicated domain
-     * string as used by the clustering fitness function.
+     * string as used by the clustering fitness function. For the duplicated domain string, see {@link #getDomain()}.
      *
      * @return the {@link #domainRegistry} of this clustering problem
      */
@@ -238,8 +237,8 @@ public class ClusteringProblem extends OptimisationProblemAdapter {
     }
 
     /**
-     * Return the domain as used by the configured fitness function, i.e. NOT the simplified
-     * domain string of the problem's dataset.
+     * Return the domain as used by the configured fitness function, i.e. NOT the basic
+     * domain string of the problem's dataset. For the basic domain string, see {@link #getBehaviouralDomain()}.
      *
      * @return the {@link #innerProblem}'s {@linkplain net.sourceforge.cilib.problem.FunctionOptimisationProblem#function function's}
      *         domain registry
@@ -262,8 +261,9 @@ public class ClusteringProblem extends OptimisationProblemAdapter {
      */
     @Override
     public void setDataSetBuilder(DataSetBuilder dsb) {
-        if (!(dsb instanceof StaticDataSetBuilder))
+        if (!(dsb instanceof StaticDataSetBuilder)) {
             throw new IllegalArgumentException("This ClusteringProblem expects a StaticDataSetBuilder\nONLY FOR NOW\nBECAUSE I didn't want to change the more generic DataSetBuilder");
+        }
 
         StaticDataSetBuilder builder = (StaticDataSetBuilder) dsb;
 
-- 
1.6.0.6