From 656a6451bfcf9f1240c5e1f3f8c3ac589d324a20 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 3 Oct 2015 00:22:59 -0700 Subject: [PATCH] Improve bee complexity calculation by excluding blacklisted mutations --- .../forestry/core/utils/GeneticsUtil.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index cc42e9a45..1ba51dc3f 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -195,20 +195,19 @@ public class GeneticsUtil { exclude.add(species); for (IMutation mutation : species.getRoot().getPaths(species, speciesChromosome)) { - if (!exclude.contains(mutation.getAllele0())) { - int otherAdvance = getGeneticAdvancement(mutation.getAllele0(), exclude, speciesChromosome); - if (otherAdvance > highest) { - highest = otherAdvance; - } - } - if (!exclude.contains(mutation.getAllele1())) { - int otherAdvance = getGeneticAdvancement(mutation.getAllele1(), exclude, speciesChromosome); - if (otherAdvance > highest) { - highest = otherAdvance; - } - } + highest = getHighestAdvancement(mutation.getAllele0(), highest, exclude, speciesChromosome); + highest = getHighestAdvancement(mutation.getAllele1(), highest, exclude, speciesChromosome); } return 1 + highest; } + + private static int getHighestAdvancement(IAlleleSpecies mutationSpecies, int highest, Set exclude, IChromosomeType speciesChromosome) { + if (exclude.contains(mutationSpecies) || AlleleManager.alleleRegistry.isBlacklisted(mutationSpecies.getUID())) { + return highest; + } + + int otherAdvance = getGeneticAdvancement(mutationSpecies, exclude, speciesChromosome); + return otherAdvance > highest ? otherAdvance : highest; + } }