Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize distr

Browse Source
This commit is contained in:
Jesse Boyd 2016-12-24 17:38:46 +11:00
parent 1987f7c34a
commit 4ea09c11de
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -2523,8 +2523,7 @@ public class EditSession extends AbstractWorld implements HasFaweQueue, Lighting
* @return the results * @return the results
*/ */
public List<Countable<Integer>> getBlockDistribution(final Region region) { public List<Countable<Integer>> getBlockDistribution(final Region region) {
final List<Countable<Integer>> distribution = new ArrayList<Countable<Integer>>(); int[] counter = new int[256];
final Map<Integer, Countable<Integer>> map = new HashMap<Integer, Countable<Integer>>();
if (region instanceof CuboidRegion) { if (region instanceof CuboidRegion) {
// Doing this for speed // Doing this for speed
@ -2542,28 +2541,23 @@ public class EditSession extends AbstractWorld implements HasFaweQueue, Lighting
for (int y = minY; y <= maxY; ++y) { for (int y = minY; y <= maxY; ++y) {
for (int z = minZ; z <= maxZ; ++z) { for (int z = minZ; z <= maxZ; ++z) {
int id = FaweCache.getId(queue.getCombinedId4Data(x, y, z)); int id = FaweCache.getId(queue.getCombinedId4Data(x, y, z));
if (map.containsKey(id)) { counter[id]++;
map.get(id).increment();
} else {
final Countable<Integer> c = new Countable<Integer>(id, 1);
map.put(id, c);
distribution.add(c);
}
} }
} }
} }
} else { } else {
for (final Vector pt : region) { for (final Vector pt : region) {
final int id = this.getBlockType(pt); final int id = this.getBlockType(pt);
if (map.containsKey(id)) { counter[id]++;
map.get(id).increment(); }
} else { }
final Countable<Integer> c = new Countable<Integer>(id, 1); List<Countable<Integer>> distribution = new ArrayList<>();
map.put(id, c); for (int i = 0; i < counter.length; i++) {
} int count = counter[i];
if (count != 0) {
distribution.add(new Countable<Integer>(i, count));
} }
} }
Collections.sort(distribution); Collections.sort(distribution);
// Collections.reverse(distribution); // Collections.reverse(distribution);
@ -2577,8 +2571,7 @@ public class EditSession extends AbstractWorld implements HasFaweQueue, Lighting
* @return the results * @return the results
*/ */
public List<Countable<BaseBlock>> getBlockDistributionWithData(final Region region) { public List<Countable<BaseBlock>> getBlockDistributionWithData(final Region region) {
final List<Countable<BaseBlock>> distribution = new ArrayList<Countable<BaseBlock>>(); int[] counter = new int[Character.MAX_VALUE + 1];
final Map<BaseBlock, Countable<BaseBlock>> map = new HashMap<BaseBlock, Countable<BaseBlock>>();
if (region instanceof CuboidRegion) { if (region instanceof CuboidRegion) {
// Doing this for speed // Doing this for speed
@ -2596,29 +2589,23 @@ public class EditSession extends AbstractWorld implements HasFaweQueue, Lighting
for (int y = minY; y <= maxY; ++y) { for (int y = minY; y <= maxY; ++y) {
for (int z = minZ; z <= maxZ; ++z) { for (int z = minZ; z <= maxZ; ++z) {
final BaseBlock blk = getLazyBlock(x, y, z); final BaseBlock blk = getLazyBlock(x, y, z);
if (map.containsKey(blk)) { counter[FaweCache.getCombined(blk)]++;
map.get(blk).increment();
} else {
final Countable<BaseBlock> c = new Countable<BaseBlock>(blk, 1);
map.put(blk, c);
distribution.add(c);
}
} }
} }
} }
} else { } else {
for (final Vector pt : region) { for (final Vector pt : region) {
final BaseBlock blk = FaweCache.getBlock(this.getBlockType(pt), this.getBlockData(pt)); final BaseBlock blk = FaweCache.getBlock(this.getBlockType(pt), this.getBlockData(pt));
counter[FaweCache.getCombined(blk)]++;
if (map.containsKey(blk)) { }
map.get(blk).increment(); }
} else { List<Countable<BaseBlock>> distribution = new ArrayList<>();
final Countable<BaseBlock> c = new Countable<BaseBlock>(blk, 1); for (int i = 0; i < counter.length; i++) {
map.put(blk, c); int count = counter[i];
} if (count != 0) {
distribution.add(new Countable<BaseBlock>(FaweCache.CACHE_BLOCK[i], count));
} }
} }
Collections.sort(distribution); Collections.sort(distribution);
// Collections.reverse(distribution); // Collections.reverse(distribution);