Menu
▾
▴
[cilib-devel] [PATCH] Removed getBehaviouralDomain().
|
From: Gary P. <gpa...@gm...> - 2009-09-03 10:18:16
|
The getBehaviouralDomain() method is not used at all and is simply
clogging up the code base.
Signed-off-by: Gary Pampara <gpa...@gm...>
---
.../algorithm/MultistartOptimisationAlgorithm.java | 4 ----
.../rnaprediction/RNAOptimisationProblem.java | 8 --------
.../bioinf/sequencealignment/BinaryMSAProblem.java | 7 -------
.../cilib/bioinf/sequencealignment/MSAProblem.java | 4 ----
.../criterion/CriterionBasedMOProblemAdapter.java | 5 -----
.../foundation/NeuralNetworkProblem.java | 4 ----
.../cilib/problem/ClusteringProblem.java | 10 ----------
.../CooperativeOptimisationProblemAdapter.java | 5 -----
.../cilib/problem/FunctionLearningProblem.java | 13 -------------
.../cilib/problem/FunctionOptimisationProblem.java | 8 --------
.../cilib/problem/MOOptimisationProblem.java | 5 -----
.../cilib/problem/OptimisationProblem.java | 10 ----------
.../CompetitiveCoevolutionProblemAdapter.java | 4 ----
.../GameLearningOptimizationProblem.java | 8 --------
.../FunctionDimensionMappingProblem.java | 5 -----
.../mappingproblem/LinearMappingProblem.java | 4 ----
.../cilib/moo/archive/constrained/ArchiveTest.java | 20 --------------------
.../constrained/ConstrainedArchiveTest.java | 20 --------------------
.../solutionweighing/SolutionWeighingTest.java | 5 -----
.../sourceforge/cilib/problem/MOFitnessTest.java | 6 ------
20 files changed, 0 insertions(+), 155 deletions(-)
diff --git a/src/main/java/net/sourceforge/cilib/algorithm/MultistartOptimisationAlgorithm.java b/src/main/java/net/sourceforge/cilib/algorithm/MultistartOptimisationAlgorithm.java
index 8ef8f51..837c577 100644
--- a/src/main/java/net/sourceforge/cilib/algorithm/MultistartOptimisationAlgorithm.java
+++ b/src/main/java/net/sourceforge/cilib/algorithm/MultistartOptimisationAlgorithm.java
@@ -264,10 +264,6 @@ public class MultistartOptimisationAlgorithm extends Algorithm implements Partic
return null;
}
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
private OptimisationProblem target;
}
diff --git a/src/main/java/net/sourceforge/cilib/bioinf/rnaprediction/RNAOptimisationProblem.java b/src/main/java/net/sourceforge/cilib/bioinf/rnaprediction/RNAOptimisationProblem.java
index 4f55cde..51e83c1 100644
--- a/src/main/java/net/sourceforge/cilib/bioinf/rnaprediction/RNAOptimisationProblem.java
+++ b/src/main/java/net/sourceforge/cilib/bioinf/rnaprediction/RNAOptimisationProblem.java
@@ -102,12 +102,4 @@ public class RNAOptimisationProblem extends OptimisationProblemAdapter {
return null;
}
- /**
- * {@inheritDoc}
- */
- public DomainRegistry getBehaviouralDomain() {
- // TODO Auto-generated method stub
- return null;
- }
-
}
diff --git a/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/BinaryMSAProblem.java b/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/BinaryMSAProblem.java
index 43a407d..7780f31 100644
--- a/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/BinaryMSAProblem.java
+++ b/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/BinaryMSAProblem.java
@@ -127,13 +127,6 @@ public class BinaryMSAProblem extends OptimisationProblemAdapter {
/**
* {@inheritDoc}
*/
- public DomainRegistry getBehaviouralDomain() {
- return this.domainRegistry;
- }
-
- /**
- * {@inheritDoc}
- */
protected Fitness calculateFitness(Type solution) { // solution = particule position vector
Vector realValuedPosition = (Vector) solution;
//System.out.println("Fitness for matches: "+alignmentCreator.getFitness(strings, realValuedPosition, gapsArray)); // debug purpose
diff --git a/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/MSAProblem.java b/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/MSAProblem.java
index 0192eac..2dc0f9b 100644
--- a/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/MSAProblem.java
+++ b/src/main/java/net/sourceforge/cilib/bioinf/sequencealignment/MSAProblem.java
@@ -86,10 +86,6 @@ public class MSAProblem extends OptimisationProblemAdapter {
return gapPenaltyMethod;
}
- public DomainRegistry getBehaviouralDomain() {
- return this.domainRegistry;
- }
-
public OptimisationProblemAdapter getClone() {
return this;
}
diff --git a/src/main/java/net/sourceforge/cilib/moo/criterion/CriterionBasedMOProblemAdapter.java b/src/main/java/net/sourceforge/cilib/moo/criterion/CriterionBasedMOProblemAdapter.java
index c0c23ff..204179c 100644
--- a/src/main/java/net/sourceforge/cilib/moo/criterion/CriterionBasedMOProblemAdapter.java
+++ b/src/main/java/net/sourceforge/cilib/moo/criterion/CriterionBasedMOProblemAdapter.java
@@ -87,11 +87,6 @@ public class CriterionBasedMOProblemAdapter extends OptimisationProblemAdapter {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return getActiveOptimisationProblem().getBehaviouralDomain();
- }
-
- @Override
public DomainRegistry getDomain() {
return getActiveOptimisationProblem().getDomain();
}
diff --git a/src/main/java/net/sourceforge/cilib/neuralnetwork/foundation/NeuralNetworkProblem.java b/src/main/java/net/sourceforge/cilib/neuralnetwork/foundation/NeuralNetworkProblem.java
index de82adf..c4e1541 100644
--- a/src/main/java/net/sourceforge/cilib/neuralnetwork/foundation/NeuralNetworkProblem.java
+++ b/src/main/java/net/sourceforge/cilib/neuralnetwork/foundation/NeuralNetworkProblem.java
@@ -106,10 +106,6 @@ public class NeuralNetworkProblem implements OptimisationProblem, Initializable
return null;
}
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
public void setEvaluationStrategy(EvaluationMediator evaluationStrategy) {
this.evaluationStrategy = evaluationStrategy;
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java b/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java
index f490df0..ca19e98 100644
--- a/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/ClusteringProblem.java
@@ -207,16 +207,6 @@ 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.
- *
- * @return the {@link #domainRegistry} of this clustering problem
- */
- public DomainRegistry getBehaviouralDomain() {
- return domainRegistry;
- }
-
- /**
* Sets the domain of the dataset being clustered. Once this domain string is set
* (changed), the domain of the {@link net.sourceforge.cilib.functions.clustering.ClusteringFitnessFunction}
* is automatically {@link #regenerateDomain() regenerated}.
diff --git a/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java b/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java
index 42ed4ab..32c6d05 100644
--- a/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java
+++ b/src/main/java/net/sourceforge/cilib/problem/CooperativeOptimisationProblemAdapter.java
@@ -118,9 +118,4 @@ public class CooperativeOptimisationProblemAdapter extends OptimisationProblemAd
return domainRegistry;
}
- public DomainRegistry getBehaviouralDomain() {
- // QUESTION What exactly does the problem.getBehaviouralDomain() method return and what is
- // really needed?
- return domainRegistry;
- }
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/FunctionLearningProblem.java b/src/main/java/net/sourceforge/cilib/problem/FunctionLearningProblem.java
index eac5b74..7a2583c 100644
--- a/src/main/java/net/sourceforge/cilib/problem/FunctionLearningProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/FunctionLearningProblem.java
@@ -314,17 +314,4 @@ public class FunctionLearningProblem extends OptimisationProblemAdapter {
return null;
}
- public DomainRegistry getBehaviouralDomain() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* public void setNeuralNetwork(NN neuralNetwork) {
- this.neuralNetwork = neuralNetwork;
- domain = new Compound(neuralNetwork.getNumberOfWeights(), new Real(-1.0, 1.0));
- }
-
- public NN getNeuralNetwork() {
- return neuralNetwork;
- }*/
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/FunctionOptimisationProblem.java b/src/main/java/net/sourceforge/cilib/problem/FunctionOptimisationProblem.java
index 66438f7..7ce45c4 100644
--- a/src/main/java/net/sourceforge/cilib/problem/FunctionOptimisationProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/FunctionOptimisationProblem.java
@@ -90,14 +90,6 @@ public abstract class FunctionOptimisationProblem extends OptimisationProblemAda
}
/**
- *
- */
- public DomainRegistry getBehaviouralDomain() {
-// return function.getBehavioralDomainRegistry();
- return null;
- }
-
- /**
* Returns the error (as a double for now) that the given solution has with respect to the actual optimum solution.
*
* @param solution the solution for which an error should be determined
diff --git a/src/main/java/net/sourceforge/cilib/problem/MOOptimisationProblem.java b/src/main/java/net/sourceforge/cilib/problem/MOOptimisationProblem.java
index ccc139f..2a3f720 100644
--- a/src/main/java/net/sourceforge/cilib/problem/MOOptimisationProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/MOOptimisationProblem.java
@@ -84,11 +84,6 @@ public class MOOptimisationProblem implements OptimisationProblem, List<Optimisa
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- throw new UnsupportedOperationException("This method is not implemented");
- }
-
- @Override
public DataSetBuilder getDataSetBuilder() {
throw new UnsupportedOperationException("This method is not implemented");
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/OptimisationProblem.java b/src/main/java/net/sourceforge/cilib/problem/OptimisationProblem.java
index 454aaa9..1d567a6 100644
--- a/src/main/java/net/sourceforge/cilib/problem/OptimisationProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/OptimisationProblem.java
@@ -73,16 +73,6 @@ public interface OptimisationProblem extends Problem {
/**
- * Returns the domain component that describes the search space of the needed
- * behavioral characteristics of the problem. This is mainly used for ECs, however,
- * the use of behavioral parameters with PSO will be investigated.
- *
- * @return The domain of the behavioral component
- */
- public DomainRegistry getBehaviouralDomain();
-
-
- /**
* Get the associated {@link net.sourceforge.cilib.problem.dataset.DataSetBuilder}.
* @return The currently associated {@link net.sourceforge.cilib.problem.dataset.DataSetBuilder}.
*/
diff --git a/src/main/java/net/sourceforge/cilib/problem/coevolution/CompetitiveCoevolutionProblemAdapter.java b/src/main/java/net/sourceforge/cilib/problem/coevolution/CompetitiveCoevolutionProblemAdapter.java
index 4165153..166723b 100644
--- a/src/main/java/net/sourceforge/cilib/problem/coevolution/CompetitiveCoevolutionProblemAdapter.java
+++ b/src/main/java/net/sourceforge/cilib/problem/coevolution/CompetitiveCoevolutionProblemAdapter.java
@@ -77,10 +77,6 @@ public class CompetitiveCoevolutionProblemAdapter extends OptimisationProblemAda
return new CompetitiveCoevolutionProblemAdapter(this);
}
- public DomainRegistry getBehaviouralDomain() {
- return domain;
- }
-
public DomainRegistry getDomain() {
return domain;
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/coevolution/GameLearningOptimizationProblem.java b/src/main/java/net/sourceforge/cilib/problem/coevolution/GameLearningOptimizationProblem.java
index 1f012a8..159d5b4 100644
--- a/src/main/java/net/sourceforge/cilib/problem/coevolution/GameLearningOptimizationProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/coevolution/GameLearningOptimizationProblem.java
@@ -68,14 +68,6 @@ public class GameLearningOptimizationProblem extends
* {@inheritDoc}
*/
@Override
- public DomainRegistry getBehaviouralDomain() {
- return game.getDomainForPlayer(1); //player one is the player being optimized
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public DomainRegistry getDomain() {
return game.getDomainForPlayer(1); //player one is the player being optimized
}
diff --git a/src/main/java/net/sourceforge/cilib/problem/mappingproblem/FunctionDimensionMappingProblem.java b/src/main/java/net/sourceforge/cilib/problem/mappingproblem/FunctionDimensionMappingProblem.java
index 6677879..910140c 100755
--- a/src/main/java/net/sourceforge/cilib/problem/mappingproblem/FunctionDimensionMappingProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/mappingproblem/FunctionDimensionMappingProblem.java
@@ -76,11 +76,6 @@ public class FunctionDimensionMappingProblem extends OptimisationProblemAdapter
return function.getDomainRegistry();
}
- public DomainRegistry getBehaviouralDomain() {
- return function.getDomainRegistry();
- }
-
-
/**
* @return Returns the function.
diff --git a/src/main/java/net/sourceforge/cilib/problem/mappingproblem/LinearMappingProblem.java b/src/main/java/net/sourceforge/cilib/problem/mappingproblem/LinearMappingProblem.java
index 7ed790e..7fe8336 100644
--- a/src/main/java/net/sourceforge/cilib/problem/mappingproblem/LinearMappingProblem.java
+++ b/src/main/java/net/sourceforge/cilib/problem/mappingproblem/LinearMappingProblem.java
@@ -110,8 +110,4 @@ public class LinearMappingProblem extends MappingProblem {
return null;
}
- public DomainRegistry getBehaviouralDomain() {
- // TODO Auto-generated method stub
- return null;
- }
}
diff --git a/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ArchiveTest.java b/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ArchiveTest.java
index 8a1a84a..8f4a325 100644
--- a/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ArchiveTest.java
+++ b/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ArchiveTest.java
@@ -75,11 +75,6 @@ public class ArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
@@ -105,11 +100,6 @@ public class ArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
@@ -135,11 +125,6 @@ public class ArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
@@ -165,11 +150,6 @@ public class ArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
diff --git a/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ConstrainedArchiveTest.java b/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ConstrainedArchiveTest.java
index 8a8491f..87a845f 100644
--- a/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ConstrainedArchiveTest.java
+++ b/src/test/java/net/sourceforge/cilib/moo/archive/constrained/ConstrainedArchiveTest.java
@@ -66,11 +66,6 @@ public class ConstrainedArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
@@ -96,11 +91,6 @@ public class ConstrainedArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
@@ -126,11 +116,6 @@ public class ConstrainedArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
@@ -156,11 +141,6 @@ public class ConstrainedArchiveTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DomainRegistry getDomain() {
return null;
}
diff --git a/src/test/java/net/sourceforge/cilib/moo/archive/solutionweighing/SolutionWeighingTest.java b/src/test/java/net/sourceforge/cilib/moo/archive/solutionweighing/SolutionWeighingTest.java
index 9d2ef20..0229f68 100644
--- a/src/test/java/net/sourceforge/cilib/moo/archive/solutionweighing/SolutionWeighingTest.java
+++ b/src/test/java/net/sourceforge/cilib/moo/archive/solutionweighing/SolutionWeighingTest.java
@@ -88,11 +88,6 @@ public class SolutionWeighingTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- return null;
- }
-
- @Override
public DataSetBuilder getDataSetBuilder() {
return null;
}
diff --git a/src/test/java/net/sourceforge/cilib/problem/MOFitnessTest.java b/src/test/java/net/sourceforge/cilib/problem/MOFitnessTest.java
index ae5d5d5..da5c624 100644
--- a/src/test/java/net/sourceforge/cilib/problem/MOFitnessTest.java
+++ b/src/test/java/net/sourceforge/cilib/problem/MOFitnessTest.java
@@ -96,12 +96,6 @@ public class MOFitnessTest {
}
@Override
- public DomainRegistry getBehaviouralDomain() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
public DataSetBuilder getDataSetBuilder() {
// TODO Auto-generated method stub
return null;
--
1.6.4.2
|