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

Cosmetics

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-08-28 17:18:54 +00:00
parent b9d392738d
commit 3e948f3807
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eva2/server/go/strategies/ParticleSwarmOptimization.java
View File

@ -1190,11 +1190,11 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se
} }
} }
protected void addSortedIndicesTo(Population pop) { protected void addSortedIndicesTo(Object[] sortedPopulation, Population pop) {
int origIndex; int origIndex;
for (int i=0; i<pop.size(); i++) { for (int i=0; i<pop.size(); i++) {
// cross-link the sorted list for faster access // cross-link the sorted list for faster access
origIndex = (Integer)((AbstractEAIndividual)sortedPop[i]).getData(indexKey); origIndex = (Integer)((AbstractEAIndividual)sortedPopulation[i]).getData(indexKey);
((AbstractEAIndividual)pop.get(origIndex)).SetData(sortedIndexKey, new Integer(i)); ((AbstractEAIndividual)pop.get(origIndex)).SetData(sortedIndexKey, new Integer(i));
} }
} }
@ -1206,7 +1206,7 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se
sortedPop = pop.toArray(); sortedPop = pop.toArray();
if ((topoID == 3) || (treeStruct>=2)) Arrays.sort(sortedPop, new AbstractEAIndividualComparator()); if ((topoID == 3) || (treeStruct>=2)) Arrays.sort(sortedPop, new AbstractEAIndividualComparator());
else Arrays.sort(sortedPop, new AbstractEAIndividualComparator(partBestFitKey)); else Arrays.sort(sortedPop, new AbstractEAIndividualComparator(partBestFitKey));
addSortedIndicesTo(pop); addSortedIndicesTo(sortedPop, pop);
} }
if (topoID == 3) { if (topoID == 3) {
// prepare multi swarm topology // prepare multi swarm topology