From: Gary P. <gpa...@gm...> - 2009-07-31 07:56:40
|
The fact that fitness evalautions can be bypassed was not correct. These patches prevent such ambiguity and result in a cleaner API. Gary Pampara (2): Removed calculateFitness(boolean) from Entity. Always increment evaluations problem. .../algorithm/MultistartOptimisationAlgorithm.java | 2 +- .../cilib/bioinf/rnaprediction/RNAParticle.java | 2 +- .../net/sourceforge/cilib/boa/bee/AbstractBee.java | 10 +--- .../cilib/clustering/kmeans/KMeans.java | 6 +- .../cilib/cooperative/CooperativeEntity.java | 9 +-- .../SelectiveContributionUpdateStrategy.java | 2 +- .../java/net/sourceforge/cilib/ec/Individual.java | 10 +--- .../DifferentialEvolutionIterationStrategy.java | 2 +- .../java/net/sourceforge/cilib/entity/Entity.java | 7 -- .../java/net/sourceforge/cilib/entity/Harmony.java | 12 +--- .../crossover/BlendCrossoverStrategy.java | 4 +- .../crossover/OnePointCrossoverStrategy.java | 4 +- .../crossover/UniformCrossoverStrategy.java | 4 +- .../criterion/CriterionBasedMOProblemAdapter.java | 2 +- .../ArchivingIterationStrategy.java | 4 +- .../foundation/NeuralNetworkProblem.java | 7 +- .../CooperativeOptimisationProblemAdapter.java | 2 +- .../net/sourceforge/cilib/problem/MOFitness.java | 8 +- .../cilib/problem/MOOptimisationProblem.java | 12 ++-- .../cilib/problem/OptimisationProblem.java | 4 +- .../cilib/problem/OptimisationProblemAdapter.java | 6 +- .../cilib/pso/dynamic/DynamicParticle.java | 2 +- ...NeighbourhoodBestSentriesDetectionStrategy.java | 2 +- .../RandomSentriesDetectionStrategy.java | 2 +- .../RandomSentryDetectionStrategy.java | 4 +- .../RandomSentryPointsDetectionStrategy.java | 2 +- .../TopologyBestSentryDetectionStrategy.java | 2 +- .../ArchiveReevaluationResponseStrategy.java | 4 +- ...lutionParticleReevaluationResponseStrategy.java | 2 +- .../DominantGuideUpdateStrategy.java | 4 +- .../cilib/pso/particle/AbstractParticle.java | 10 +--- .../cilib/pso/particle/MultiObjectiveParticle.java | 2 +- .../cilib/pso/particle/ParticleDecorator.java | 4 +- .../cilib/pso/particle/StandardParticle.java | 4 +- .../DEPositionUpdateStrategy.java | 4 +- .../GCVelocityUpdateStrategy.java | 2 +- .../calculator/EntityBasedFitnessCalculator.java | 6 +- .../cilib/util/calculator/FitnessCalculator.java | 4 +- .../calculator/PropertyBasedFitnessCalculator.java | 4 +- .../StructuredTypeFitnessCalculator.java | 4 +- .../crossover/BlendCrossoverStrategyTest.java | 2 +- .../crossover/OnePointCrossoverStrategyTest.java | 2 +- .../crossover/UniformCrossoverStrategyTest.java | 2 +- .../entity/topologies/VonNeumannTopologyTest.java | 2 +- .../cilib/moo/archive/constrained/ArchiveTest.java | 74 ++++++++++---------- .../constrained/ConstrainedArchiveTest.java | 4 +- .../solutionweighing/SolutionWeighingTest.java | 12 ++-- .../sourceforge/cilib/problem/MOFitnessTest.java | 10 +-- 48 files changed, 123 insertions(+), 172 deletions(-) |