Menu
▾
▴
[cilib-devel] [PATCH] Rename of util classes to ease readibility.
|
From: Gary P. <gpa...@gm...> - 2009-06-11 10:26:05
|
The readability of some of the utility classes was rather annoying.
Applied the current new trend of naming:
- Types instead of TypeUtil
- Stats instead of StatUtil
- etc
Signed-off-by: Gary Pampara <gpa...@gm...>
---
.../net/sourceforge/cilib/boa/bee/AbstractBee.java | 4 +-
.../cilib/clustering/kmeans/KMeans.java | 4 +-
.../java/net/sourceforge/cilib/ec/Individual.java | 6 ++--
.../java/net/sourceforge/cilib/entity/Harmony.java | 6 ++--
.../cilib/functions/activation/Sigmoid.java | 6 ++--
.../clustering/ParametricClusteringFunction.java | 6 ++--
.../ClusterMeanStrategy.java | 4 +-
.../validityindices/HalkidiVazirgiannisIndex.java | 4 +-
.../VeenmanReindersBackerIndex.java | 4 +-
.../cilib/math/{MathUtil.java => Maths.java} | 4 +-
.../cilib/math/{StatUtils.java => Stats.java} | 4 +-
.../cilib/math/random/DiscreteRandomNumber.java | 6 ++--
.../cilib/neuralnetwork/generic/Weight.java | 4 +-
.../CooperativeOptimisationProblemAdapter.java | 4 +-
.../BouncingBoundaryConstraint.java | 4 +-
.../ClampingBoundaryConstraint.java | 4 +-
.../NearestBoundaryConstraint.java | 12 ++++----
.../PerElementReinitialisation.java | 8 +++---
.../RandomBoundaryConstraint.java | 4 +-
.../ReinitialisationBoundary.java | 6 ++--
.../dataset/AssociatedPairDataSetBuilder.java | 10 +++----
.../NeighbourhoodBestSentriesReactionStrategy.java | 4 +-
.../PartialReinitialisationResponseStrategy.java | 4 +-
.../ReinitializationReactionStrategy.java | 4 +-
.../RandomizedPositionInitialisationStrategy.java | 4 +-
.../BoundedPersonalBestUpdateStrategy.java | 4 +-
.../java/net/sourceforge/cilib/type/types/Int.java | 6 ++--
.../net/sourceforge/cilib/type/types/Long.java | 6 ++--
.../net/sourceforge/cilib/type/types/Real.java | 6 ++--
.../cilib/type/types/{TypeUtil.java => Types.java} | 4 +-
.../cilib/type/types/container/AbstractList.java | 6 ++--
.../cilib/type/types/container/Vector.java | 1 +
.../cilib/util/{VectorUtils.java => Vectors.java} | 4 +-
.../crossover/BlendCrossoverStrategyTest.java | 6 ++--
.../crossover/OnePointCrossoverStrategyTest.java | 6 ++--
.../crossover/UniformCrossoverStrategyTest.java | 6 ++--
.../math/{MathUtilTest.java => MathsTest.java} | 28 ++++++++++----------
.../math/{StatUtilsTest.java => StatsTest.java} | 12 ++++----
.../ClampingBoundaryConstraintTest.java | 4 +-
.../cilib/type/StringBasedDomainRegistryTest.java | 10 +++---
.../sourceforge/cilib/type/types/NumericTest.java | 6 ++--
.../cilib/type/types/StringTypeTest.java | 2 +-
.../types/{TypeUtilTest.java => TypesTest.java} | 12 ++++----
.../cilib/type/types/container/VectorTest.java | 4 +-
.../{VectorUtilsTest.java => VectorsTest.java} | 24 ++++++++--------
45 files changed, 143 insertions(+), 144 deletions(-)
rename src/main/java/net/sourceforge/cilib/math/{MathUtil.java => Maths.java} (98%)
rename src/main/java/net/sourceforge/cilib/math/{StatUtils.java => Stats.java} (98%)
rename src/main/java/net/sourceforge/cilib/type/types/{TypeUtil.java => Types.java} (99%)
rename src/main/java/net/sourceforge/cilib/util/{VectorUtils.java => Vectors.java} (98%)
rename src/test/java/net/sourceforge/cilib/math/{MathUtilTest.java => MathsTest.java} (66%)
rename src/test/java/net/sourceforge/cilib/math/{StatUtilsTest.java => StatsTest.java} (89%)
rename src/test/java/net/sourceforge/cilib/type/types/{TypeUtilTest.java => TypesTest.java} (87%)
rename src/test/java/net/sourceforge/cilib/util/{VectorUtilsTest.java => VectorsTest.java} (84%)
diff --git a/src/main/java/net/sourceforge/cilib/boa/bee/AbstractBee.java b/src/main/java/net/sourceforge/cilib/boa/bee/AbstractBee.java
index 0623861..5627183 100644
--- a/src/main/java/net/sourceforge/cilib/boa/bee/AbstractBee.java
+++ b/src/main/java/net/sourceforge/cilib/boa/bee/AbstractBee.java
@@ -21,7 +21,7 @@
*/
package net.sourceforge.cilib.boa.bee;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.boa.positionupdatestrategies.BeePositionUpdateStrategy;
import net.sourceforge.cilib.boa.positionupdatestrategies.VisualPositionUpdateStategy;
import net.sourceforge.cilib.entity.AbstractEntity;
@@ -136,7 +136,7 @@ public abstract class AbstractBee extends AbstractEntity implements HoneyBee {
@Override
public void initialise(OptimisationProblem problem) {
this.setCandidateSolution(problem.getDomain().getBuiltRepresenation().getClone());
- TypeUtil.randomize(this.getCandidateSolution());
+ Types.randomize(this.getCandidateSolution());
// this.getCandidateSolution().randomise();
this.dimension = this.getCandidateSolution().size();
diff --git a/src/main/java/net/sourceforge/cilib/clustering/kmeans/KMeans.java b/src/main/java/net/sourceforge/cilib/clustering/kmeans/KMeans.java
index beba140..ff40a13 100644
--- a/src/main/java/net/sourceforge/cilib/clustering/kmeans/KMeans.java
+++ b/src/main/java/net/sourceforge/cilib/clustering/kmeans/KMeans.java
@@ -28,7 +28,7 @@ import java.util.List;
import net.sourceforge.cilib.algorithm.Algorithm;
import net.sourceforge.cilib.algorithm.SingularAlgorithm;
-import net.sourceforge.cilib.math.StatUtils;
+import net.sourceforge.cilib.math.Stats;
import net.sourceforge.cilib.problem.OptimisationSolution;
import net.sourceforge.cilib.problem.dataset.ClusterableDataSet.Pattern;
import net.sourceforge.cilib.type.types.container.Vector;
@@ -121,7 +121,7 @@ public class KMeans extends SingularAlgorithm {
centroid = reinitialiseCentroid(centroid);
}
else { // the centroid becomes the mean of cluster i
- centroid = StatUtils.meanVector(cluster.values());
+ centroid = Stats.meanVector(cluster.values());
}
updateCentroid(centroid, i);
}
diff --git a/src/main/java/net/sourceforge/cilib/ec/Individual.java b/src/main/java/net/sourceforge/cilib/ec/Individual.java
index 5557fbe..848a1a3 100644
--- a/src/main/java/net/sourceforge/cilib/ec/Individual.java
+++ b/src/main/java/net/sourceforge/cilib/ec/Individual.java
@@ -24,7 +24,7 @@ package net.sourceforge.cilib.ec;
import net.sourceforge.cilib.entity.AbstractEntity;
import net.sourceforge.cilib.entity.Entity;
import net.sourceforge.cilib.entity.EntityType;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.problem.InferiorFitness;
import net.sourceforge.cilib.problem.OptimisationProblem;
import net.sourceforge.cilib.type.types.Type;
@@ -110,11 +110,11 @@ public class Individual extends AbstractEntity {
// which is always enforced due to the semantics of the performInitialisation methods
this.setCandidateSolution(problem.getDomain().getBuiltRepresenation().getClone());
- TypeUtil.randomize(this.getCandidateSolution());
+ Types.randomize(this.getCandidateSolution());
if (problem.getBehaviouralDomain().getBuiltRepresenation() != null) {
this.getProperties().put(EntityType.Individual.PHENOTYPES, problem.getBehaviouralDomain().getBuiltRepresenation().getClone());
- TypeUtil.randomize(this.getProperties().get(EntityType.Individual.PHENOTYPES));
+ Types.randomize(this.getProperties().get(EntityType.Individual.PHENOTYPES));
}
this.dimension = this.getCandidateSolution().size();
diff --git a/src/main/java/net/sourceforge/cilib/entity/Harmony.java b/src/main/java/net/sourceforge/cilib/entity/Harmony.java
index f3122e2..ea0188e 100644
--- a/src/main/java/net/sourceforge/cilib/entity/Harmony.java
+++ b/src/main/java/net/sourceforge/cilib/entity/Harmony.java
@@ -21,7 +21,7 @@
*/
package net.sourceforge.cilib.entity;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.problem.Fitness;
import net.sourceforge.cilib.problem.InferiorFitness;
import net.sourceforge.cilib.problem.OptimisationProblem;
@@ -116,7 +116,7 @@ public class Harmony extends AbstractEntity {
@Override
public void initialise(OptimisationProblem problem) {
StructuredType harmony = problem.getDomain().getBuiltRepresenation().getClone();
- TypeUtil.randomize(harmony);
+ Types.randomize(harmony);
setCandidateSolution(harmony);
this.getProperties().put(EntityType.FITNESS, InferiorFitness.instance());
@@ -127,7 +127,7 @@ public class Harmony extends AbstractEntity {
*/
@Override
public void reinitialise() {
- TypeUtil.randomize(getCandidateSolution());
+ Types.randomize(getCandidateSolution());
}
}
diff --git a/src/main/java/net/sourceforge/cilib/functions/activation/Sigmoid.java b/src/main/java/net/sourceforge/cilib/functions/activation/Sigmoid.java
index 01c1dfa..947092c 100644
--- a/src/main/java/net/sourceforge/cilib/functions/activation/Sigmoid.java
+++ b/src/main/java/net/sourceforge/cilib/functions/activation/Sigmoid.java
@@ -26,7 +26,7 @@ import net.sourceforge.cilib.controlparameter.ControlParameter;
import net.sourceforge.cilib.type.types.Real;
import net.sourceforge.cilib.type.types.Type;
import net.sourceforge.cilib.type.types.container.Vector;
-import net.sourceforge.cilib.util.VectorUtils;
+import net.sourceforge.cilib.util.Vectors;
/**
* The generalised sigmoid function. The function is the general case of the sigmoid function
@@ -108,7 +108,7 @@ public class Sigmoid extends ActivationFunction {
double valueAtPoint = evaluate(point);
double result = valueAtPoint * (1 - valueAtPoint);
- return VectorUtils.create(result);
+ return Vectors.create(result);
}
/**
@@ -116,7 +116,7 @@ public class Sigmoid extends ActivationFunction {
*/
@Override
public Double getGradient(Number number) {
- return getGradient(VectorUtils.create(number)).getReal(0);
+ return getGradient(Vectors.create(number)).getReal(0);
}
/**
diff --git a/src/main/java/net/sourceforge/cilib/functions/clustering/ParametricClusteringFunction.java b/src/main/java/net/sourceforge/cilib/functions/clustering/ParametricClusteringFunction.java
index b21794e..6157557 100644
--- a/src/main/java/net/sourceforge/cilib/functions/clustering/ParametricClusteringFunction.java
+++ b/src/main/java/net/sourceforge/cilib/functions/clustering/ParametricClusteringFunction.java
@@ -24,7 +24,7 @@ package net.sourceforge.cilib.functions.clustering;
import net.sourceforge.cilib.controlparameter.ConstantControlParameter;
import net.sourceforge.cilib.controlparameter.ControlParameter;
import net.sourceforge.cilib.type.types.container.Vector;
-import net.sourceforge.cilib.util.VectorUtils;
+import net.sourceforge.cilib.util.Vectors;
/**
* This class makes use of the helper/member functions defined and implemented in
@@ -115,8 +115,8 @@ public class ParametricClusteringFunction extends ClusteringFitnessFunction {
*/
protected double zMax() {
Vector prototype = (Vector) helper.getClusteringProblem().getDomain().getBuiltRepresenation();
- Vector upperBoundVector = VectorUtils.createUpperBoundVector(prototype);
- Vector lowerBoundVector = VectorUtils.createLowerBoundVector(prototype);
+ Vector upperBoundVector = Vectors.createUpperBoundVector(prototype);
+ Vector lowerBoundVector = Vectors.createLowerBoundVector(prototype);
return helper.calculateDistance(upperBoundVector, lowerBoundVector);
}
diff --git a/src/main/java/net/sourceforge/cilib/functions/clustering/clustercenterstrategies/ClusterMeanStrategy.java b/src/main/java/net/sourceforge/cilib/functions/clustering/clustercenterstrategies/ClusterMeanStrategy.java
index 38b21a1..cd56219 100644
--- a/src/main/java/net/sourceforge/cilib/functions/clustering/clustercenterstrategies/ClusterMeanStrategy.java
+++ b/src/main/java/net/sourceforge/cilib/functions/clustering/clustercenterstrategies/ClusterMeanStrategy.java
@@ -23,7 +23,7 @@ package net.sourceforge.cilib.functions.clustering.clustercenterstrategies;
import java.util.Collection;
-import net.sourceforge.cilib.math.StatUtils;
+import net.sourceforge.cilib.math.Stats;
import net.sourceforge.cilib.problem.dataset.ClusterableDataSet.Pattern;
import net.sourceforge.cilib.type.types.container.Vector;
import net.sourceforge.cilib.util.ClusteringUtils;
@@ -48,6 +48,6 @@ public class ClusterMeanStrategy implements ClusterCenterStrategy {
public Vector getCenter(int i) {
Collection<Pattern> cluster = ClusteringUtils.get().getArrangedClusters().get(i).values();
- return StatUtils.meanVector(cluster);
+ return Stats.meanVector(cluster);
}
}
diff --git a/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/HalkidiVazirgiannisIndex.java b/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/HalkidiVazirgiannisIndex.java
index 11a6684..3a6ee17 100644
--- a/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/HalkidiVazirgiannisIndex.java
+++ b/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/HalkidiVazirgiannisIndex.java
@@ -22,7 +22,7 @@
package net.sourceforge.cilib.functions.clustering.validityindices;
import net.sourceforge.cilib.functions.clustering.ClusteringFitnessFunction;
-import net.sourceforge.cilib.math.StatUtils;
+import net.sourceforge.cilib.math.Stats;
import net.sourceforge.cilib.problem.dataset.ClusterableDataSet.Pattern;
import net.sourceforge.cilib.type.types.container.Vector;
@@ -68,7 +68,7 @@ public class HalkidiVazirgiannisIndex extends ClusteringFitnessFunction {
stdev = 0.0;
for (int i = 0; i < clustersFormed; i++) {
- clusterVariance = StatUtils.variance(arrangedClusters.get(i).values(), clusterCenterStrategy.getCenter(i));
+ clusterVariance = Stats.variance(arrangedClusters.get(i).values(), clusterCenterStrategy.getCenter(i));
scattering += clusterVariance;
stdev += clusterVariance;
}
diff --git a/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/VeenmanReindersBackerIndex.java b/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/VeenmanReindersBackerIndex.java
index db39f5e..b811e7f 100644
--- a/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/VeenmanReindersBackerIndex.java
+++ b/src/main/java/net/sourceforge/cilib/functions/clustering/validityindices/VeenmanReindersBackerIndex.java
@@ -28,7 +28,7 @@ import net.sourceforge.cilib.controlparameter.ConstantControlParameter;
import net.sourceforge.cilib.controlparameter.ControlParameter;
import net.sourceforge.cilib.functions.clustering.ClusteringFitnessFunction;
import net.sourceforge.cilib.functions.clustering.clustercenterstrategies.ClusterMeanStrategy;
-import net.sourceforge.cilib.math.StatUtils;
+import net.sourceforge.cilib.math.Stats;
import net.sourceforge.cilib.problem.dataset.ClusterableDataSet.Pattern;
import net.sourceforge.cilib.type.types.container.Vector;
@@ -82,7 +82,7 @@ public class VeenmanReindersBackerIndex extends ClusteringFitnessFunction {
union.addAll(arrangedClusters.get(i).values());
union.addAll(arrangedClusters.get(j).values());
- if (StatUtils.variance(union, helper.getDataSetMean()) < getMaximumVariance()) {
+ if (Stats.variance(union, helper.getDataSetMean()) < getMaximumVariance()) {
return false;
}
}
diff --git a/src/main/java/net/sourceforge/cilib/math/MathUtil.java b/src/main/java/net/sourceforge/cilib/math/Maths.java
similarity index 98%
rename from src/main/java/net/sourceforge/cilib/math/MathUtil.java
rename to src/main/java/net/sourceforge/cilib/math/Maths.java
index 71a9216..30f84c6 100644
--- a/src/main/java/net/sourceforge/cilib/math/MathUtil.java
+++ b/src/main/java/net/sourceforge/cilib/math/Maths.java
@@ -33,13 +33,13 @@ import net.sourceforge.cilib.math.random.generator.Random;
*
* @author Gary Pampara
*/
-public final class MathUtil {
+public final class Maths {
public static double EPSILON = 1.0E-15d;
private static Random random;
- private MathUtil() {
+ private Maths() {
}
/**
diff --git a/src/main/java/net/sourceforge/cilib/math/StatUtils.java b/src/main/java/net/sourceforge/cilib/math/Stats.java
similarity index 98%
rename from src/main/java/net/sourceforge/cilib/math/StatUtils.java
rename to src/main/java/net/sourceforge/cilib/math/Stats.java
index 792211c..72f9019 100644
--- a/src/main/java/net/sourceforge/cilib/math/StatUtils.java
+++ b/src/main/java/net/sourceforge/cilib/math/Stats.java
@@ -31,9 +31,9 @@ import net.sourceforge.cilib.type.types.container.Vector;
* Some simple methods for determining some statistics.
*
*/
-public final class StatUtils {
+public final class Stats {
- private StatUtils() {
+ private Stats() {
}
/**
diff --git a/src/main/java/net/sourceforge/cilib/math/random/DiscreteRandomNumber.java b/src/main/java/net/sourceforge/cilib/math/random/DiscreteRandomNumber.java
index 3d259e7..22e83d2 100644
--- a/src/main/java/net/sourceforge/cilib/math/random/DiscreteRandomNumber.java
+++ b/src/main/java/net/sourceforge/cilib/math/random/DiscreteRandomNumber.java
@@ -21,7 +21,7 @@
*/
package net.sourceforge.cilib.math.random;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
/**
*
@@ -45,7 +45,7 @@ public final class DiscreteRandomNumber {
*/
public static double getPoisson(double x, double lambda) {
double numerator = Math.pow(Math.E, -lambda) * Math.pow(lambda, x);
- double denominator = MathUtil.factorial(x);
+ double denominator = Maths.factorial(x);
return numerator / denominator;
}
@@ -58,7 +58,7 @@ public final class DiscreteRandomNumber {
* @return The value of the binomial distribution.
*/
public static double getBinomial(double x, double p, double n) {
- return MathUtil.combination(n, x) * Math.pow(p, x) * Math.pow((1-p), (n-x));
+ return Maths.combination(n, x) * Math.pow(p, x) * Math.pow((1-p), (n-x));
}
}
diff --git a/src/main/java/net/sourceforge/cilib/neuralnetwork/generic/Weight.java b/src/main/java/net/sourceforge/cilib/neuralnetwork/generic/Weight.java
index 800bece..2657c4f 100644
--- a/src/main/java/net/sourceforge/cilib/neuralnetwork/generic/Weight.java
+++ b/src/main/java/net/sourceforge/cilib/neuralnetwork/generic/Weight.java
@@ -22,7 +22,7 @@
package net.sourceforge.cilib.neuralnetwork.generic;
import net.sourceforge.cilib.type.types.Type;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.util.Cloneable;
/**
@@ -50,7 +50,7 @@ public class Weight implements Cloneable {
super();
this.weightValue = w.getClone();
this.previousChange = w.getClone();
- TypeUtil.reset(this.previousChange);
+ Types.reset(this.previousChange);
// this.previousChange.reset();
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java b/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java
index 37fee26..e1176d7 100644
--- a/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java
+++ b/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java
@@ -29,7 +29,7 @@ import net.sourceforge.cilib.type.StringBasedDomainRegistry;
import net.sourceforge.cilib.type.parser.DomainParser;
import net.sourceforge.cilib.type.parser.ParseException;
import net.sourceforge.cilib.type.types.Type;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.type.types.container.Vector;
/**
@@ -62,7 +62,7 @@ public class CooperativeOptimisationProblemAdapter extends OptimisationProblemAd
domainRegistry = new StringBasedDomainRegistry();
String expandedDomain = "";
for (int i = offset; i < offset + dimension; i++) {
- String tmp = TypeUtil.getRepresentation(((Vector) context.getCandidateSolution()).get(i));
+ String tmp = Types.getRepresentation(((Vector) context.getCandidateSolution()).get(i));
expandedDomain += tmp;//((Vector) context.getCandidateSolution()).get(i).getRepresentation();
if (i < offset + dimension - 1)
expandedDomain += ",";
diff --git a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/BouncingBoundaryConstraint.java b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/BouncingBoundaryConstraint.java
index 514ce0f..15eb36e 100644
--- a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/BouncingBoundaryConstraint.java
+++ b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/BouncingBoundaryConstraint.java
@@ -25,7 +25,7 @@ package net.sourceforge.cilib.problem.boundaryconstraint;
import java.util.Iterator;
import net.sourceforge.cilib.entity.Entity;
import net.sourceforge.cilib.entity.EntityType;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
import net.sourceforge.cilib.type.types.Bounds;
import net.sourceforge.cilib.type.types.Numeric;
import net.sourceforge.cilib.type.types.container.StructuredType;
@@ -76,7 +76,7 @@ public class BouncingBoundaryConstraint implements BoundaryConstraint {
velocity.set(previousPosition - position.getReal());
}
else if (Double.compare(position.getReal(), bounds.getUpperBound()) > 0) {
- position.set(bounds.getUpperBound() - MathUtil.EPSILON);
+ position.set(bounds.getUpperBound() - Maths.EPSILON);
velocity.set(previousPosition - position.getReal());
}
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraint.java b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraint.java
index 8804bd3..d6ad51c 100644
--- a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraint.java
+++ b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraint.java
@@ -24,7 +24,7 @@ package net.sourceforge.cilib.problem.boundaryconstraint;
import java.util.Iterator;
import net.sourceforge.cilib.entity.Entity;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
import net.sourceforge.cilib.type.types.Bounds;
import net.sourceforge.cilib.type.types.Numeric;
import net.sourceforge.cilib.type.types.container.StructuredType;
@@ -61,7 +61,7 @@ public class ClampingBoundaryConstraint implements BoundaryConstraint {
numeric.setReal(bounds.getLowerBound());
}
else if (Double.compare(numeric.getReal(), bounds.getUpperBound()) > 0) { // number > upper bound
- numeric.setReal(bounds.getUpperBound() - MathUtil.EPSILON);
+ numeric.setReal(bounds.getUpperBound() - Maths.EPSILON);
}
}
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/NearestBoundaryConstraint.java b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/NearestBoundaryConstraint.java
index 5a81997..a8a5b98 100644
--- a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/NearestBoundaryConstraint.java
+++ b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/NearestBoundaryConstraint.java
@@ -27,7 +27,7 @@ import net.sourceforge.cilib.controlparameter.ConstantControlParameter;
import net.sourceforge.cilib.controlparameter.ControlParameter;
import net.sourceforge.cilib.entity.Entity;
import net.sourceforge.cilib.entity.EntityType;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
import net.sourceforge.cilib.type.types.Bounds;
import net.sourceforge.cilib.type.types.Numeric;
import net.sourceforge.cilib.type.types.container.StructuredType;
@@ -106,15 +106,15 @@ public class NearestBoundaryConstraint implements BoundaryConstraint {
if (Double.compare(position.getReal(), bounds.getLowerBound()) < 0) {
position.set(bounds.getLowerBound()); // lower boundary is inclusive
- if (MathUtil.random() < turbulenceProbability.getParameter()) {
- position.set(position.getReal() + MathUtil.random() * bounds.getRange());
+ if (Maths.random() < turbulenceProbability.getParameter()) {
+ position.set(position.getReal() + Maths.random() * bounds.getRange());
}
velocity.set(position.getReal() - previousPosition);
}
else if (Double.compare(position.getReal(), bounds.getUpperBound()) > 0) {
- position.set(bounds.getUpperBound() - MathUtil.EPSILON); // upper boundary is exclusive
- if (MathUtil.random() < turbulenceProbability.getParameter()) {
- position.set(position.getReal() - MathUtil.random() * bounds.getRange());
+ position.set(bounds.getUpperBound() - Maths.EPSILON); // upper boundary is exclusive
+ if (Maths.random() < turbulenceProbability.getParameter()) {
+ position.set(position.getReal() - Maths.random() * bounds.getRange());
}
velocity.set(position.getReal() - previousPosition);
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/PerElementReinitialisation.java b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/PerElementReinitialisation.java
index 13a300e..db2fc5a 100644
--- a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/PerElementReinitialisation.java
+++ b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/PerElementReinitialisation.java
@@ -24,7 +24,7 @@ package net.sourceforge.cilib.problem.boundaryconstraint;
import net.sourceforge.cilib.entity.Entity;
import net.sourceforge.cilib.type.types.Numeric;
import net.sourceforge.cilib.type.types.Type;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.type.types.container.Vector;
/**
@@ -32,7 +32,7 @@ import net.sourceforge.cilib.type.types.container.Vector;
* it is no longer within the valid search space. Each element violating the
* condition will be reinitilaised witin the domain of the problem (search space).
*
- * @see TypeUtil#isInsideBounds(net.sourceforge.cilib.type.types.Type)
+ * @see Types#isInsideBounds(net.sourceforge.cilib.type.types.Type)
*/
public class PerElementReinitialisation extends ReinitialisationBoundary {
private static final long serialVersionUID = 7080824227269710787L;
@@ -67,8 +67,8 @@ public class PerElementReinitialisation extends ReinitialisationBoundary {
}
private void enforce(Numeric numeric) {
- if (!TypeUtil.isInsideBounds(numeric)) {
- TypeUtil.randomize(numeric);
+ if (!Types.isInsideBounds(numeric)) {
+ Types.randomize(numeric);
}
}
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/RandomBoundaryConstraint.java b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/RandomBoundaryConstraint.java
index 6ff98ee..be82f80 100644
--- a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/RandomBoundaryConstraint.java
+++ b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/RandomBoundaryConstraint.java
@@ -26,7 +26,7 @@ import net.sourceforge.cilib.entity.Entity;
import net.sourceforge.cilib.entity.EntityType;
import net.sourceforge.cilib.type.types.Bounds;
import net.sourceforge.cilib.type.types.Numeric;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.type.types.container.StructuredType;
/**
@@ -96,7 +96,7 @@ public class RandomBoundaryConstraint implements BoundaryConstraint {
*/
private void constrain(Numeric position, Numeric velocity) {
Numeric previousPosition = position.getClone();
- TypeUtil.randomize(position);
+ Types.randomize(position);
velocity.set(position.getReal() - previousPosition.getReal());
}
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ReinitialisationBoundary.java b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ReinitialisationBoundary.java
index c2db3ff..1af4855 100644
--- a/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ReinitialisationBoundary.java
+++ b/src/main/java/net/sourceforge/cilib/problem/boundaryconstraint/ReinitialisationBoundary.java
@@ -22,14 +22,14 @@
package net.sourceforge.cilib.problem.boundaryconstraint;
import net.sourceforge.cilib.entity.Entity;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
/**
* Once the entity has over shot the search space boundaries, re-initialise
* the Entity once again to be witihin the search space of the problem at a
* random position.
*
- * @see TypeUtil#isInsideBounds(net.sourceforge.cilib.type.types.Type)
+ * @see Types#isInsideBounds(net.sourceforge.cilib.type.types.Type)
*/
public class ReinitialisationBoundary implements BoundaryConstraint {
private static final long serialVersionUID = -512973040124015665L;
@@ -46,7 +46,7 @@ public class ReinitialisationBoundary implements BoundaryConstraint {
* {@inheritDoc}
*/
public void enforce(Entity entity) {
- if (!TypeUtil.isInsideBounds(entity.getCandidateSolution())) {
+ if (!Types.isInsideBounds(entity.getCandidateSolution())) {
entity.reinitialise();
}
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/dataset/AssociatedPairDataSetBuilder.java b/src/main/java/net/sourceforge/cilib/problem/dataset/AssociatedPairDataSetBuilder.java
index b8e8136..caf5000 100644
--- a/src/main/java/net/sourceforge/cilib/problem/dataset/AssociatedPairDataSetBuilder.java
+++ b/src/main/java/net/sourceforge/cilib/problem/dataset/AssociatedPairDataSetBuilder.java
@@ -23,9 +23,7 @@ package net.sourceforge.cilib.problem.dataset;
import java.util.ArrayList;
-import net.sourceforge.cilib.math.StatUtils;
-import net.sourceforge.cilib.problem.Problem;
-import net.sourceforge.cilib.simulator.Simulation;
+import net.sourceforge.cilib.math.Stats;
import net.sourceforge.cilib.type.types.container.Vector;
import net.sourceforge.cilib.util.ClusteringUtils;
@@ -105,7 +103,7 @@ public class AssociatedPairDataSetBuilder extends DataSetBuilder implements Clus
}
patterns.addAll(data);
- if (identifier == "") {
+ if (identifier.equals("")) {
identifier += dataset.getFile();
}
else {
@@ -128,8 +126,8 @@ public class AssociatedPairDataSetBuilder extends DataSetBuilder implements Clus
* Calculate and cache the mean ({@link Vector}) and variance (scalar) of the dataset.
*/
private void cacheMeanAndVariance() {
- cachedMean = StatUtils.meanVector(patterns);
- cachedVariance = StatUtils.variance(patterns, cachedMean);
+ cachedMean = Stats.meanVector(patterns);
+ cachedVariance = Stats.variance(patterns, cachedMean);
}
/**
diff --git a/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/NeighbourhoodBestSentriesReactionStrategy.java b/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/NeighbourhoodBestSentriesReactionStrategy.java
index 2c7d2b0..69630ad 100644
--- a/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/NeighbourhoodBestSentriesReactionStrategy.java
+++ b/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/NeighbourhoodBestSentriesReactionStrategy.java
@@ -25,7 +25,7 @@ package net.sourceforge.cilib.pso.dynamic.responsestrategies;
import net.sourceforge.cilib.algorithm.population.PopulationBasedAlgorithm;
import net.sourceforge.cilib.entity.Entity;
import net.sourceforge.cilib.entity.Topologies;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
public class NeighbourhoodBestSentriesReactionStrategy<E extends PopulationBasedAlgorithm> extends EnvironmentChangeResponseStrategy<E> {
private static final long serialVersionUID = -2142727048293776335L;
@@ -46,7 +46,7 @@ public class NeighbourhoodBestSentriesReactionStrategy<E extends PopulationBased
@Override
public void performReaction(PopulationBasedAlgorithm algorithm) {
for (Entity entity : Topologies.getNeighbourhoodBestEntities(algorithm.getTopology()))
- TypeUtil.randomize(entity.getCandidateSolution());
+ Types.randomize(entity.getCandidateSolution());
// TODO: What is the influence of reevaluation?
// entity.calculateFitness(false);
}
diff --git a/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/PartialReinitialisationResponseStrategy.java b/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/PartialReinitialisationResponseStrategy.java
index f40e7cb..4b49937 100644
--- a/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/PartialReinitialisationResponseStrategy.java
+++ b/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/PartialReinitialisationResponseStrategy.java
@@ -28,7 +28,7 @@ import net.sourceforge.cilib.entity.Topology;
import net.sourceforge.cilib.math.random.generator.MersenneTwister;
import net.sourceforge.cilib.math.random.generator.Random;
import net.sourceforge.cilib.type.types.Type;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
/**
* @author Anna Rakitianskaia
@@ -79,7 +79,7 @@ public class PartialReinitialisationResponseStrategy<E extends PopulationBasedAl
// ELSE
Particle aParticle = (Particle) topology.get(index);
Type position = aParticle.getPosition();
- TypeUtil.randomize(position);
+ Types.randomize(position);
used[index] = true;
gotParticle = true;
}
diff --git a/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/ReinitializationReactionStrategy.java b/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/ReinitializationReactionStrategy.java
index 66e07be..ad04349 100644
--- a/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/ReinitializationReactionStrategy.java
+++ b/src/main/java/net/sourceforge/cilib/pso/dynamic/responsestrategies/ReinitializationReactionStrategy.java
@@ -29,7 +29,7 @@ import net.sourceforge.cilib.entity.Entity;
import net.sourceforge.cilib.entity.Topology;
import net.sourceforge.cilib.math.random.generator.MersenneTwister;
import net.sourceforge.cilib.math.random.generator.Random;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
/**
* This reaction strategy reinitializes the specified
@@ -87,7 +87,7 @@ public class ReinitializationReactionStrategy<E extends PopulationBasedAlgorithm
for (int i = 0; i < reinitializeCount; i++) {
int random = randomGenerator.nextInt(entities.size());
Entity entity = entities.get(random);
- TypeUtil.randomize(entity.getCandidateSolution()); // entity contents -> current position
+ Types.randomize(entity.getCandidateSolution()); // entity contents -> current position
// remove the selected element from the all list preventing it from being selected again
entities.remove(random);
}
diff --git a/src/main/java/net/sourceforge/cilib/pso/particle/initialisation/RandomizedPositionInitialisationStrategy.java b/src/main/java/net/sourceforge/cilib/pso/particle/initialisation/RandomizedPositionInitialisationStrategy.java
index 4e90b18..0144a36 100644
--- a/src/main/java/net/sourceforge/cilib/pso/particle/initialisation/RandomizedPositionInitialisationStrategy.java
+++ b/src/main/java/net/sourceforge/cilib/pso/particle/initialisation/RandomizedPositionInitialisationStrategy.java
@@ -24,7 +24,7 @@ package net.sourceforge.cilib.pso.particle.initialisation;
import net.sourceforge.cilib.entity.EntityType;
import net.sourceforge.cilib.entity.Particle;
import net.sourceforge.cilib.problem.OptimisationProblem;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
/**
@@ -47,7 +47,7 @@ public class RandomizedPositionInitialisationStrategy implements
public void initialise(Particle particle, OptimisationProblem problem) {
particle.setCandidateSolution(problem.getDomain().getBuiltRepresenation().getClone());
// particle.getPosition().randomise();
- TypeUtil.randomize(particle.getPosition());
+ Types.randomize(particle.getPosition());
particle.getProperties().put(EntityType.Particle.BEST_POSITION, particle.getPosition().getClone());
}
diff --git a/src/main/java/net/sourceforge/cilib/pso/positionupdatestrategies/BoundedPersonalBestUpdateStrategy.java b/src/main/java/net/sourceforge/cilib/pso/positionupdatestrategies/BoundedPersonalBestUpdateStrategy.java
index 99effec..3273f95 100644
--- a/src/main/java/net/sourceforge/cilib/pso/positionupdatestrategies/BoundedPersonalBestUpdateStrategy.java
+++ b/src/main/java/net/sourceforge/cilib/pso/positionupdatestrategies/BoundedPersonalBestUpdateStrategy.java
@@ -25,7 +25,7 @@ package net.sourceforge.cilib.pso.positionupdatestrategies;
import net.sourceforge.cilib.entity.EntityType;
import net.sourceforge.cilib.entity.Particle;
import net.sourceforge.cilib.problem.InferiorFitness;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
/**
* Update the personal best of the particle, if it is a valid update. Valid updates are
@@ -53,7 +53,7 @@ public class BoundedPersonalBestUpdateStrategy extends StandardPersonalBestUpdat
*/
@Override
public void updatePersonalBest(Particle particle) {
- if (!TypeUtil.isInsideBounds(particle.getPosition())) {
+ if (!Types.isInsideBounds(particle.getPosition())) {
particle.getProperties().put(EntityType.FITNESS, InferiorFitness.instance());
return;
}
diff --git a/src/main/java/net/sourceforge/cilib/type/types/Int.java b/src/main/java/net/sourceforge/cilib/type/types/Int.java
index 2b411ab..6c6a220 100644
--- a/src/main/java/net/sourceforge/cilib/type/types/Int.java
+++ b/src/main/java/net/sourceforge/cilib/type/types/Int.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
/**
@@ -55,7 +55,7 @@ public class Int extends Numeric {
* @param upper The upper bound.
*/
public Int(int lower, int upper) {
- value = Double.valueOf(MathUtil.random()*(upper-lower)).intValue() + lower;
+ value = Double.valueOf(Maths.random()*(upper-lower)).intValue() + lower;
this.setBounds(BoundsFactory.create(lower, upper));
}
@@ -223,7 +223,7 @@ public class Int extends Numeric {
* {@inheritDoc}
*/
public void randomize() {
- double tmp = MathUtil.random()*(getBounds().getUpperBound()-getBounds().getLowerBound()) + getBounds().getLowerBound();
+ double tmp = Maths.random()*(getBounds().getUpperBound()-getBounds().getLowerBound()) + getBounds().getLowerBound();
this.value = Double.valueOf(tmp).intValue();
}
diff --git a/src/main/java/net/sourceforge/cilib/type/types/Long.java b/src/main/java/net/sourceforge/cilib/type/types/Long.java
index 5fede48..b27f368 100644
--- a/src/main/java/net/sourceforge/cilib/type/types/Long.java
+++ b/src/main/java/net/sourceforge/cilib/type/types/Long.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
/**
*
* @author leo
@@ -50,7 +50,7 @@ public class Long extends Numeric {
* @param upper The upper bound.
*/
public Long(long lower, long upper) {
- value = Double.valueOf(MathUtil.random()*(upper-lower)).longValue() + lower;
+ value = Double.valueOf(Maths.random()*(upper-lower)).longValue() + lower;
this.setBounds(BoundsFactory.create(lower, upper));
}
@@ -225,7 +225,7 @@ public class Long extends Numeric {
* {@inheritDoc}
*/
public void randomize() {
- double tmp = MathUtil.random()*(getBounds().getUpperBound()-getBounds().getLowerBound()) + getBounds().getLowerBound();
+ double tmp = Maths.random()*(getBounds().getUpperBound()-getBounds().getLowerBound()) + getBounds().getLowerBound();
this.value = Double.valueOf(tmp).intValue();
}
diff --git a/src/main/java/net/sourceforge/cilib/type/types/Real.java b/src/main/java/net/sourceforge/cilib/type/types/Real.java
index c5a4f81..bc63470 100644
--- a/src/main/java/net/sourceforge/cilib/type/types/Real.java
+++ b/src/main/java/net/sourceforge/cilib/type/types/Real.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
/**
@@ -62,7 +62,7 @@ public class Real extends Numeric {
public Real(double lower, double upper) {
double bottom = (lower == Double.NEGATIVE_INFINITY) ? -Double.MAX_VALUE : lower;
double top = (upper == Double.POSITIVE_INFINITY) ? Double.MAX_VALUE : upper;
- value = (top-bottom)*MathUtil.random() + bottom;
+ value = (top-bottom)*Maths.random() + bottom;
this.setBounds(BoundsFactory.create(lower, upper));
}
@@ -227,7 +227,7 @@ public class Real extends Numeric {
* Re-randomize the <code>Real</code> object based on the upper and lower bounds.
*/
public void randomize() {
- this.value = (getBounds().getUpperBound()-getBounds().getLowerBound())*MathUtil.random() + getBounds().getLowerBound();
+ this.value = (getBounds().getUpperBound()-getBounds().getLowerBound())*Maths.random() + getBounds().getLowerBound();
}
diff --git a/src/main/java/net/sourceforge/cilib/type/types/TypeUtil.java b/src/main/java/net/sourceforge/cilib/type/types/Types.java
similarity index 99%
rename from src/main/java/net/sourceforge/cilib/type/types/TypeUtil.java
rename to src/main/java/net/sourceforge/cilib/type/types/Types.java
index 2b62a7f..b062dbe 100644
--- a/src/main/java/net/sourceforge/cilib/type/types/TypeUtil.java
+++ b/src/main/java/net/sourceforge/cilib/type/types/Types.java
@@ -29,9 +29,9 @@ import net.sourceforge.cilib.type.types.container.StructuredType;
*
* @author gpampara
*/
-public final class TypeUtil {
+public final class Types {
- private TypeUtil() {
+ private Types() {
}
/**
diff --git a/src/main/java/net/sourceforge/cilib/type/types/container/AbstractList.java b/src/main/java/net/sourceforge/cilib/type/types/container/AbstractList.java
index a3ff4b4..0e8ad79 100644
--- a/src/main/java/net/sourceforge/cilib/type/types/container/AbstractList.java
+++ b/src/main/java/net/sourceforge/cilib/type/types/container/AbstractList.java
@@ -22,7 +22,7 @@
package net.sourceforge.cilib.type.types.container;
import net.sourceforge.cilib.type.types.Type;
-import net.sourceforge.cilib.type.types.TypeUtil;
+import net.sourceforge.cilib.type.types.Types;
/**
* The basic definition for all {@linkplain Type} objects that are based on a list.
@@ -77,7 +77,7 @@ public abstract class AbstractList<E extends Type> implements StructuredType<E>
* @param value The {@linkplain Type} to add.
*/
public void append(E value) {
- int position = TypeUtil.getDimension(this);
+ int position = Types.getDimension(this);
insert(position, value);
}
@@ -125,7 +125,7 @@ public abstract class AbstractList<E extends Type> implements StructuredType<E>
int dimension = 1;
for (int i = 0; i < size(); i++) {
- current = TypeUtil.getRepresentation(this.get(i));
+ current = Types.getRepresentation(this.get(i));
if (current.equals(previous)) {
dimension++;
}
diff --git a/src/main/java/net/sourceforge/cilib/type/types/container/Vector.java b/src/main/java/net/sourceforge/cilib/type/types/container/Vector.java
index 22dc036..7503893 100644
--- a/src/main/java/net/sourceforge/cilib/type/types/container/Vector.java
+++ b/src/main/java/net/sourceforge/cilib/type/types/container/Vector.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import net.sourceforge.cilib.container.visitor.Visitor;
import net.sourceforge.cilib.math.VectorMath;
+import net.sourceforge.cilib.type.types.Types;
import net.sourceforge.cilib.type.types.Numeric;
import net.sourceforge.cilib.type.types.Resetable;
diff --git a/src/main/java/net/sourceforge/cilib/util/VectorUtils.java b/src/main/java/net/sourceforge/cilib/util/Vectors.java
similarity index 98%
rename from src/main/java/net/sourceforge/cilib/util/VectorUtils.java
rename to src/main/java/net/sourceforge/cilib/util/Vectors.java
index 150b6ba..656e0fd 100644
--- a/src/main/java/net/sourceforge/cilib/util/VectorUtils.java
+++ b/src/main/java/net/sourceforge/cilib/util/Vectors.java
@@ -29,13 +29,13 @@ import net.sourceforge.cilib.type.types.container.Vector;
/**
* Utility methods for {@linkplain Vector}s.
*/
-public final class VectorUtils {
+public final class Vectors {
/**
* Default constructor. Specified constructor to be private so that an instance
* of this utility class cannot be created.
*/
- private VectorUtils() {
+ private Vectors() {
}
/**
diff --git a/src/test/java/net/sourceforge/cilib/entity/operators/crossover/BlendCrossoverStrategyTest.java b/src/test/java/net/sourceforge/cilib/entity/operators/crossover/BlendCrossoverStrategyTest.java
index 8a72d58..5936d0c 100644
--- a/src/test/java/net/sourceforge/cilib/entity/operators/crossover/BlendCrossoverStrategyTest.java
+++ b/src/test/java/net/sourceforge/cilib/entity/operators/crossover/BlendCrossoverStrategyTest.java
@@ -31,7 +31,7 @@ import net.sourceforge.cilib.entity.EntityType;
import net.sourceforge.cilib.problem.Fitness;
import net.sourceforge.cilib.problem.InferiorFitness;
import net.sourceforge.cilib.type.types.container.Vector;
-import net.sourceforge.cilib.util.VectorUtils;
+import net.sourceforge.cilib.util.Vectors;
import net.sourceforge.cilib.util.calculator.FitnessCalculator;
import org.junit.Assert;
import org.junit.Test;
@@ -47,8 +47,8 @@ public class BlendCrossoverStrategyTest {
Individual i1 = new Individual();
Individual i2 = new Individual();
- i1.getProperties().put(EntityType.CANDIDATE_SOLUTION, VectorUtils.create(0.0, 1.0, 2.0, 3.0, 4.0));
- i2.getProperties().put(EntityType.CANDIDATE_SOLUTION, VectorUtils.create(5.0, 6.0, 7.0, 8.0, 9.0));
+ i1.getProperties().put(EntityType.CANDIDATE_SOLUTION, Vectors.create(0.0, 1.0, 2.0, 3.0, 4.0));
+ i2.getProperties().put(EntityType.CANDIDATE_SOLUTION, Vectors.create(5.0, 6.0, 7.0, 8.0, 9.0));
i1.setFitnessCalculator(new MockFitnessCalculator());
i2.setFitnessCalculator(new MockFitnessCalculator());
diff --git a/src/test/java/net/sourceforge/cilib/entity/operators/crossover/OnePointCrossoverStrategyTest.java b/src/test/java/net/sourceforge/cilib/entity/operators/crossover/OnePointCrossoverStrategyTest.java
index afe5b59..a1a0261 100644
--- a/src/test/java/net/sourceforge/cilib/entity/operators/crossover/OnePointCrossoverStrategyTest.java
+++ b/src/test/java/net/sourceforge/cilib/entity/operators/crossover/OnePointCrossoverStrategyTest.java
@@ -31,7 +31,7 @@ import net.sourceforge.cilib.entity.EntityType;
import net.sourceforge.cilib.problem.Fitness;
import net.sourceforge.cilib.problem.InferiorFitness;
import net.sourceforge.cilib.type.types.container.Vector;
-import net.sourceforge.cilib.util.VectorUtils;
+import net.sourceforge.cilib.util.Vectors;
import net.sourceforge.cilib.util.calculator.FitnessCalculator;
import org.junit.Assert;
import org.junit.Test;
@@ -47,8 +47,8 @@ public class OnePointCrossoverStrategyTest {
Individual i1 = new Individual();
Individual i2 = new Individual();
- i1.getProperties().put(EntityType.CANDIDATE_SOLUTION, VectorUtils.create(0.0, 1.0, 2.0, 3.0, 4.0));
- i2.getProperties().put(EntityType.CANDIDATE_SOLUTION, VectorUtils.create(5.0, 6.0, 7.0, 8.0, 9.0));
+ i1.getProperties().put(EntityType.CANDIDATE_SOLUTION, Vectors.create(0.0, 1.0, 2.0, 3.0, 4.0));
+ i2.getProperties().put(EntityType.CANDIDATE_SOLUTION, Vectors.create(5.0, 6.0, 7.0, 8.0, 9.0));
i1.setFitnessCalculator(new MockFitnessCalculator());
i2.setFitnessCalculator(new MockFitnessCalculator());
diff --git a/src/test/java/net/sourceforge/cilib/entity/operators/crossover/UniformCrossoverStrategyTest.java b/src/test/java/net/sourceforge/cilib/entity/operators/crossover/UniformCrossoverStrategyTest.java
index f7335dd..e42777b 100644
--- a/src/test/java/net/sourceforge/cilib/entity/operators/crossover/UniformCrossoverStrategyTest.java
+++ b/src/test/java/net/sourceforge/cilib/entity/operators/crossover/UniformCrossoverStrategyTest.java
@@ -31,7 +31,7 @@ import net.sourceforge.cilib.entity.EntityType;
import net.sourceforge.cilib.problem.Fitness;
import net.sourceforge.cilib.problem.InferiorFitness;
import net.sourceforge.cilib.type.types.container.Vector;
-import net.sourceforge.cilib.util.VectorUtils;
+import net.sourceforge.cilib.util.Vectors;
import net.sourceforge.cilib.util.calculator.FitnessCalculator;
import org.junit.Assert;
import org.junit.Test;
@@ -47,8 +47,8 @@ public class UniformCrossoverStrategyTest {
Individual i1 = new Individual();
Individual i2 = new Individual();
- i1.getProperties().put(EntityType.CANDIDATE_SOLUTION, VectorUtils.create(0.0, 1.0, 2.0, 3.0, 4.0));
- i2.getProperties().put(EntityType.CANDIDATE_SOLUTION, VectorUtils.create(5.0, 6.0, 7.0, 8.0, 9.0));
+ i1.getProperties().put(EntityType.CANDIDATE_SOLUTION, Vectors.create(0.0, 1.0, 2.0, 3.0, 4.0));
+ i2.getProperties().put(EntityType.CANDIDATE_SOLUTION, Vectors.create(5.0, 6.0, 7.0, 8.0, 9.0));
i1.setFitnessCalculator(new MockFitnessCalculator());
i2.setFitnessCalculator(new MockFitnessCalculator());
diff --git a/src/test/java/net/sourceforge/cilib/math/MathUtilTest.java b/src/test/java/net/sourceforge/cilib/math/MathsTest.java
similarity index 66%
rename from src/test/java/net/sourceforge/cilib/math/MathUtilTest.java
rename to src/test/java/net/sourceforge/cilib/math/MathsTest.java
index 659115e..3a2976c 100644
--- a/src/test/java/net/sourceforge/cilib/math/MathUtilTest.java
+++ b/src/test/java/net/sourceforge/cilib/math/MathsTest.java
@@ -31,47 +31,47 @@ import org.junit.Test;
*
* @author Gary Pampara
*/
-public class MathUtilTest {
+public class MathsTest {
@Test(expected = IllegalArgumentException.class)
public void invalidFactorialParameter() {
- MathUtil.factorial(-1.0);
+ Maths.factorial(-1.0);
}
@Test
public void testFactorial() {
- assertEquals(1.0, MathUtil.factorial(0.0), Double.MIN_NORMAL);
- assertEquals(1.0, MathUtil.factorial(1.0), Double.MIN_NORMAL);
- assertEquals(6.0, MathUtil.factorial(3), Double.MIN_NORMAL);
- assertEquals(720.0, MathUtil.factorial(6), Double.MIN_NORMAL);
- assertEquals(9.33262154439441E157, MathUtil.factorial(100), Double.MIN_NORMAL);
+ assertEquals(1.0, Maths.factorial(0.0), Double.MIN_NORMAL);
+ assertEquals(1.0, Maths.factorial(1.0), Double.MIN_NORMAL);
+ assertEquals(6.0, Maths.factorial(3), Double.MIN_NORMAL);
+ assertEquals(720.0, Maths.factorial(6), Double.MIN_NORMAL);
+ assertEquals(9.33262154439441E157, Maths.factorial(100), Double.MIN_NORMAL);
}
@Test
public void testCombination() {
- assertEquals(792.0, MathUtil.combination(12, 5), Double.MIN_NORMAL);
+ assertEquals(792.0, Maths.combination(12, 5), Double.MIN_NORMAL);
try {
- MathUtil.combination(-1, -5);
+ Maths.combination(-1, -5);
fail("Invalid input!");
}
catch (Exception e) {}
try {
- MathUtil.combination(-1, 5);
+ Maths.combination(-1, 5);
fail("Invalid input!");
}
catch (Exception e) {}
try {
- MathUtil.combination(1, -5);
+ Maths.combination(1, -5);
fail("Invalid input!");
}
catch (Exception e) {}
- assertEquals(1.0, MathUtil.combination(0, 0), Double.MIN_NORMAL);
- assertEquals(1.0, MathUtil.combination(1, 0), Double.MIN_NORMAL);
- assertEquals(1.0, MathUtil.combination(1, 1), Double.MIN_NORMAL);
+ assertEquals(1.0, Maths.combination(0, 0), Double.MIN_NORMAL);
+ assertEquals(1.0, Maths.combination(1, 0), Double.MIN_NORMAL);
+ assertEquals(1.0, Maths.combination(1, 1), Double.MIN_NORMAL);
}
}
diff --git a/src/test/java/net/sourceforge/cilib/math/StatUtilsTest.java b/src/test/java/net/sourceforge/cilib/math/StatsTest.java
similarity index 89%
rename from src/test/java/net/sourceforge/cilib/math/StatUtilsTest.java
rename to src/test/java/net/sourceforge/cilib/math/StatsTest.java
index bd7a9d3..7694e75 100644
--- a/src/test/java/net/sourceforge/cilib/math/StatUtilsTest.java
+++ b/src/test/java/net/sourceforge/cilib/math/StatsTest.java
@@ -1,5 +1,5 @@
/*
- * StatUtilsTest.java
+ * StatsTest.java
*
* Copyright (C) 2003 - 2008
* Computational Intelligence Research Group (CIRG@UP)
@@ -36,7 +36,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-public class StatUtilsTest {
+public class StatsTest {
private static ArrayList<Pattern> set;
private static Vector mean = null;
private static final int SIZE = 3;
@@ -75,24 +75,24 @@ public class StatUtilsTest {
@Test(expected = IllegalArgumentException.class)
public void testEmptySetForMeanVector() {
- StatUtils.meanVector(new ArrayList<Pattern>());
+ Stats.meanVector(new ArrayList<Pattern>());
}
@Test(expected = IllegalArgumentException.class)
public void testEmptySetForVarianceScalar() {
- StatUtils.variance(new ArrayList<Pattern>(), mean);
+ Stats.variance(new ArrayList<Pattern>(), mean);
}
@Test
public void testMeanVector() {
Vector calculated = new Vector(SIZE, new Real(2));
- mean = StatUtils.meanVector(set);
+ mean = Stats.meanVector(set);
assertThat(mean, equalTo(calculated));
}
@Test
public void testVarianceScalar() {
- assertThat(StatUtils.variance(set, mean), equalTo(1.2)); // more accurate than StatUtils.varianceVector()
+ assertThat(Stats.variance(set, mean), equalTo(1.2)); // more accurate than Stats.varianceVector()
}
}
diff --git a/src/test/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraintTest.java b/src/test/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraintTest.java
index 7a6b885..e46d13b 100644
--- a/src/test/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraintTest.java
+++ b/src/test/java/net/sourceforge/cilib/problem/boundaryconstraint/ClampingBoundaryConstraintTest.java
@@ -23,7 +23,7 @@
package net.sourceforge.cilib.problem.boundaryconstraint;
import net.sourceforge.cilib.ec.Individual;
-import net.sourceforge.cilib.math.MathUtil;
+import net.sourceforge.cilib.math.Maths;
import net.sourceforge.cilib.type.types.Bounds;
import net.sourceforge.cilib.type.types.Real;
import net.sourceforge.cilib.type.types.container.Vector;
@@ -62,7 +62,7 @@ public class ClampingBoundaryConstraintTest {
Assert.assertThat(((Real)candidateSolution.get(0)).getReal(), is(-5.0));
Assert.assertThat(((Real)candidateSolution.get(1)).getReal(), is(3.0));
- Assert.assertThat(((Real)candidateSolution.get(2)).getReal(), is(5.0-MathUtil.EPSILON));
+ Assert.assertThat(((Real)candidateSolution.get(2)).getReal(), is(5.0-Maths.EPSILON));
}
}
\ No newline at end of file
diff --git a/src/test/java/net/sourceforge/cilib/type/StringBasedDomainRegistryTest.java b/src/test/java/net/sourceforge/cilib/type/StringBasedDomainRegistryTest.java
index 34c52e7..d68af56 100644
--- a/src/test/java/net/sourceforge/cilib/type/StringBasedDomainRegistryTest.java
+++ b/src/test/java/net/sourceforge/cilib/type/StringBasedDomainRegistryTest.java
@@ -22,8 +22,8 @@
package net.sourceforge.cilib.type;
-import net.sourceforge.cilib.type.types.TypeUtil;
-import net.sourceforge.cilib.type.types.container.StructuredType;
+import net.sourceforge.cilib.type.types.Types;
+import net.sourceforge.cilib.type.types.container.Vector;
import org.junit.Assert;
import org.junit.Test;
@@ -38,9 +38,9 @@ public class StringBasedDomainRegistryTest {
DomainRegistry registry = new StringBasedDomainRegistry();
registry.setDomainString("R(-30.0, 30)^30");
- StructuredType<?> structure = registry.getBuiltRepresenation();
- Assert.assertEquals(30, structure.size());
- Assert.assertTrue(TypeUtil.isInsideBounds(structure));
+ Vector vector = (Vector) registry.getBuiltRepresenation();
+ Assert.assertEquals(30, vector.getDimension());
+ Assert.assertTrue(Types.isInsideBounds(vector));
}
}
diff --git a/src/test/java/net/sourceforge/cilib/type/types/NumericTest.java b/src/test/java/net/sourceforge/cilib/type/types/NumericTest.java
index b7e9c9f..3674986 100644
--- a/src/test/java/net/sourceforge/cilib/type/types/NumericTest.java
+++ b/src/test/java/net/sourceforge/cilib/type/types/NumericTest.java
@@ -39,9 +39,9 @@ public class NumericTest {
Int i = new Int();
Bit b = new Bit();
- assertEquals(1, TypeUtil.getDimension(r));
- assertEquals(1, TypeUtil.getDimension(i));
- assertEquals(1, TypeUtil.getDimension(b));
+ assertEquals(1, Types.getDimension(r));
+ assertEquals(1, Types.getDimension(i));
+ assertEquals(1, Types.getDimension(b));
}
@Test(expected=UnsupportedOperationException.class)
diff --git a/src/test/java/net/sourceforge/cilib/type/types/StringTypeTest.java b/src/test/java/net/sourceforge/cilib/type/types/StringTypeTest.java
index f6cab51..5485308 100644
--- a/src/test/java/net/sourceforge/cilib/type/types/StringTypeTest.java
+++ b/src/test/java/net/sourceforge/cilib/type/types/StringTypeTest.java
@@ -48,7 +48,7 @@ public class StringTypeTest {
public void testDimensionality() {
StringType s = new StringType("This is a StringType");
- assertEquals(1, TypeUtil.getDimension(s));
+ assertEquals(1, Types.getDimension(s));
}
}
diff --git a/src/test/java/net/sourceforge/cilib/type/types/TypeUtilTest.java b/src/test/java/net/sourceforge/cilib/type/types/TypesTest.java
similarity index 87%
rename from src/test/java/net/sourceforge/cilib/type/types/TypeUtilTest.java
rename to src/test/java/net/sourceforge/cilib/type/types/TypesTest.java
index 53478dc..35736ef 100644
--- a/src/test/java/net/sourceforge/cilib/type/types/TypeUtilTest...
[truncated message content] |
