replaced boxed integers with plain ones. initial fill of arrays with zeros.

This commit is contained in:
Maxmtg
2013-05-12 07:55:21 +00:00
parent 6dcfe506f1
commit 07f7a1b9bc

View File

@@ -2,6 +2,7 @@ package forge.game.ai;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -826,7 +827,10 @@ public class ComputerUtilCard {
public static List<String> getColorByProminence(final List<Card> list) { public static List<String> getColorByProminence(final List<Card> list) {
int cntColors = MagicColor.WUBRG.length; int cntColors = MagicColor.WUBRG.length;
final Integer[] map = new Integer[cntColors]; final int[] map = new int[cntColors];
for(int i = 0; i < map.length; i++) {
map[i] = 0;
}
for (final Card crd : list) { for (final Card crd : list) {
ColorSet color = CardUtil.getColors(crd); ColorSet color = CardUtil.getColors(crd);
@@ -836,20 +840,20 @@ public class ComputerUtilCard {
} }
} // for } // for
Integer[] indices = new Integer[cntColors]; int[] indices = new int[cntColors];
for(int i = 0; i < cntColors; i++) for(int i = 0; i < cntColors; i++)
indices[i] = Integer.valueOf(i); indices[i] = Integer.valueOf(i);
// sort indices for WUBRG array, to get indices for most prominent colors first. // sort indices for WUBRG array
Arrays.sort(indices, new Comparator<Integer>() { Arrays.sort(indices);
@Override public int compare(final Integer a, final Integer b) { return map[b] - map[a]; }
});
// fetch color names in the same order // fetch color names in the same order
List<String> result = new ArrayList<String>(cntColors); List<String> result = new ArrayList<String>(cntColors);
for(Integer idx : indices) { for(int idx : indices) {
result.add(MagicColor.toLongString(MagicColor.WUBRG[idx])); result.add(MagicColor.toLongString(MagicColor.WUBRG[idx]));
} }
// reverse to get indices for most prominent colors first.
Collections.reverse(result);
return result; return result;
} }