halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed order of two commands in the generation of the linkage Tree in LTGA

Browse Source
This commit is contained in:
Alexander Seitz 2013-01-21 09:30:30 +00:00
parent dbcf20d1e3
commit c55a130ea0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/eva2/server/go/strategies/LTGA.java
View File

@ -161,7 +161,7 @@ public class LTGA implements InterfaceOptimizer, java.io.Serializable, Interface
// the final tree // the final tree
Stack<Set<Integer>> linkageTree = new Stack<Set<Integer>>(); Stack<Set<Integer>> linkageTree = new Stack<Set<Integer>>();
// the stack to cluster here clusters can be removed // the stack to cluster here clusters can be removed
Stack<Set<Integer>> workingStack = new Stack<Set<Integer>>(); Stack<Set<Integer>> workingTree = new Stack<Set<Integer>>();
// add the problem variables to the stacks // add the problem variables to the stacks
for (int i = 0; i < this.probDim; i++) { for (int i = 0; i < this.probDim; i++) {
Set<Integer> s1 = new HashSet<Integer>(); Set<Integer> s1 = new HashSet<Integer>();
@ -169,16 +169,16 @@ public class LTGA implements InterfaceOptimizer, java.io.Serializable, Interface
s1.add(i); s1.add(i);
s2.add(i); s2.add(i);
linkageTree.add(s1); linkageTree.add(s1);
workingStack.add(s2); workingTree.add(s2);
} }
// double[] probMass = calculateProbabilityMassFunction(); // double[] probMass = calculateProbabilityMassFunction();
// until there is only one cluster left // until there is only one cluster left
while (workingStack.size() > 1) { while (workingTree.size() > 1) {
Pair<Set<Integer>, Set<Integer>> toCluster = findNearestClusters(workingStack); Pair<Set<Integer>, Set<Integer>> toCluster = findNearestClusters(workingTree);
// remove the second cluster from the working set
workingStack.remove(toCluster.tail);
// add all elements from the second cluster to the first one // add all elements from the second cluster to the first one
toCluster.head.addAll(toCluster.tail); toCluster.head.addAll(toCluster.tail);
// remove the second cluster from the working set
workingTree.remove(toCluster.tail);
// add the combined cluster to the linkage tree // add the combined cluster to the linkage tree
linkageTree.add(toCluster.head); linkageTree.add(toCluster.head);
} }