EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

More work on plot analysis

Browse Source
This commit is contained in:
boy0001 2015-06-26 19:46:06 +10:00
parent 411900f474
commit 6d2642afe7
3 changed files with 107 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
View File

@ -55,10 +55,15 @@ public class DebugExec extends SubCommand {
@Override @Override
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
final List<String> allowed_params = Arrays.asList(new String[] { "reset-modified", "stop-expire", "start-expire", "show-expired", "update-expired", "seen", "trim-check" }); final List<String> allowed_params = Arrays.asList(new String[] { "analyze", "reset-modified", "stop-expire", "start-expire", "show-expired", "update-expired", "seen", "trim-check" });
if (args.length > 0) { if (args.length > 0) {
final String arg = args[0].toLowerCase(); final String arg = args[0].toLowerCase();
switch (arg) { switch (arg) {
case "analyze": {
Plot plot = MainUtil.getPlot(player.getLocation());
HybridUtils.manager.analyzePlot(plot, null);
return true;
}
case "stop-expire": { case "stop-expire": {
if (ExpireManager.task != -1) { if (ExpireManager.task != -1) {
Bukkit.getScheduler().cancelTask(ExpireManager.task); Bukkit.getScheduler().cancelTask(ExpireManager.task);

106
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java
View File

@ -1,6 +1,7 @@
package com.intellectualcrafters.plot.generator; package com.intellectualcrafters.plot.generator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -12,8 +13,11 @@ import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;
import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.BiomeGrid;
import org.bukkit.material.Directional;
import org.bukkit.material.MaterialData;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import com.intellectualcrafters.plot.BukkitMain; import com.intellectualcrafters.plot.BukkitMain;
@ -34,6 +38,24 @@ import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
public class BukkitHybridUtils extends HybridUtils { public class BukkitHybridUtils extends HybridUtils {
public double getMean(int[] array) {
double count = 0;
for (int i : array) {
count += i;
}
return count / array.length;
}
public double getSD(int[] array) {
double av = getMean(array);
double sd = 0;
for (int i=0; i<array.length;i++)
{
sd += Math.pow(Math.abs(array[i] - av), 2);
}
return Math.sqrt(sd/array.length);
}
@Override @Override
public void analyzePlot(Plot plot, RunnableVal<PlotAnalysis> whenDone) { public void analyzePlot(Plot plot, RunnableVal<PlotAnalysis> whenDone) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
@ -53,24 +75,92 @@ public class BukkitHybridUtils extends HybridUtils {
World world = Bukkit.getWorld(plot.world); World world = Bukkit.getWorld(plot.world);
ChunkGenerator gen = world.getGenerator(); ChunkGenerator gen = world.getGenerator();
BiomeGrid base = new BiomeGrid() { @Override public void setBiome(int a, int b, Biome c) {} @Override public Biome getBiome(int a, int b) {return null;}}; BiomeGrid base = new BiomeGrid() { @Override public void setBiome(int a, int b, Biome c) {} @Override public Biome getBiome(int a, int b) {return null;}};
final Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1); ClassicPlotWorld cpw = (ClassicPlotWorld) PlotSquared.getPlotWorld(plot.world);
final Location top = MainUtil.getPlotTopLoc(plot.world, plot.id); final Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1 - cpw.ROAD_WIDTH, 0, 1 - cpw.ROAD_WIDTH);
final Location top = MainUtil.getPlotTopLoc(plot.world, plot.id).add(cpw.ROAD_WIDTH, 0, cpw.ROAD_WIDTH);
int bx = bot.getX() >> 4; int bx = bot.getX() >> 4;
int bz = bot.getZ() >> 4; int bz = bot.getZ() >> 4;
int tx = top.getX() >> 4; int tx = top.getX() >> 4;
int tz = top.getZ() >> 4; int tz = top.getZ() >> 4;
Random r = new Random(); Random r = new Random();
for (int X = bx; X <= tx; X++) { AugmentedPopulator.initCache();
for (int Z = bz; Z <= tz; Z++) { for (int X = bx + 1; X < tx; X++) {
for (int Z = bz + 1; Z < tz; Z++) {
Chunk chunk = world.getChunkAt(X, Z); Chunk chunk = world.getChunkAt(X, Z);
short[][] result = gen.generateExtBlockSections(world, r, x, z, base); short[][] result = gen.generateExtBlockSections(world, r, X, Z, base);
for (int x = 0; x < 16; x++) { short[][] current = new short[16][];
// load current chunk into a PlotBlock[][] map;
long changes = 0;
long rotations = 0;
long materialdata = 0;
HashSet<Short> variety = new HashSet<>();
int[] height = new int[256];
int collumn_index = 0;
for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) {
int max = 0;
for (int y = 0; y < 256; y++) {
Block block = chunk.getBlock(x, y, z);
int i = y >> 4;
int j = ((y & 0xF) << 8) | (z << 4) | x;
short id = (short) block.getTypeId();
if (id != 0) {
if (y > max) {
max = y;
}
BlockState state = block.getState();
MaterialData data = state.getData();
if (data instanceof Directional) {
rotations++;
}
else if (!data.getClass().equals(MaterialData.class)) {
materialdata++;
}
else {
variety.add(id);
}
}
if (current[i] == null) {
current[i] = new short[4096];
}
current[i][j] = id;
if (result[i] == null && id != 0 || result[i] != null && result[i][j] != id) {
changes++;
}
}
height[collumn_index] = max;
collumn_index++;
// compare blocks
// calculate variety
}
} }
long verticies = 0;
for (int x = 1; x < 15; x++) {
for (int z = 1; z < 15; z++) {
for (int y = 1; y < 255; y++) {
short id = current[y >> 4][((y & 0xF) << 8) | (z << 4) | x];
if (id == 0) continue;
if (current[(y + 1) >> 4][(((y + 1) & 0xF) << 8) | (z << 4) | x] != 0) verticies--;
if (current[(y - 1) >> 4][(((y - 1) & 0xF) << 8) | (z << 4) | x] != 0) verticies--;
if (current[y >> 4][((y & 0xF) << 8) | ((z + 1) << 4) | x] != 0) verticies--;
if (current[y >> 4][((y & 0xF) << 8) | ((z - 1) << 4) | x] != 0) verticies--;
if (current[y >> 4][((y & 0xF) << 8) | (z << 4) | (x + 1)] != 0) verticies--;
if (current[y >> 4][((y & 0xF) << 8) | (z << 4) | (x - 1)] != 0) verticies--;
verticies += 6;
}
}
}
System.out.print("===============");
System.out.print(" - changes: " + changes);
System.out.print(" - rotations: " + rotations);
System.out.print(" - data: " + materialdata);
System.out.print(" - variety: " + variety.size());
System.out.print(" - sd: " + getSD(height));
System.out.print(" - verticies: " + verticies);
} }
} }
short[] [] result = gen.generateExtBlockSections(world, null, x, z, )
} }
public void checkModified(final Plot plot, final RunnableVal<Integer> whenDone) { public void checkModified(final Plot plot, final RunnableVal<Integer> whenDone) {

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
View File

@ -6,12 +6,14 @@ public class PlotAnalysis {
public final long verticies; public final long verticies;
public final long rotation; public final long rotation;
public final long height_sd; public final long height_sd;
public final long regularity;
public PlotAnalysis(int diff, int variety, int verticies, int rotation, int height_sd) { public PlotAnalysis(int diff, int variety, int verticies, int rotation, int height_sd, int regularity) {
this.diff = diff; this.diff = diff;
this.variety = variety; this.variety = variety;
this.verticies = verticies; this.verticies = verticies;
this.rotation = rotation; this.rotation = rotation;
this.height_sd = height_sd; this.height_sd = height_sd;
this.regularity = regularity;
} }
} }