mafoo.org.uk/wordsearch
1
0
Fork 0
mirror of https://github.com/fooflington/wordsearch.git synced 2025-04-19 07:19:17 +00:00
Code Issues Projects Releases Wiki Activity

Add extra starter method

Browse Source
This commit is contained in:
Matthew Slowe 2020-04-05 13:25:51 +01:00
parent ce1e7a2fe5
commit f92d4df210
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
uk/org/mafoo/wordsearch/GridFactory.java
View File

@ -37,7 +37,7 @@ public class GridFactory {
drng.addNumber(23, 0.0017d); // X drng.addNumber(23, 0.0017d); // X
drng.addNumber(24, 0.0211d); // Y drng.addNumber(24, 0.0211d); // Y
drng.addNumber(25, 0.0007d); // Z drng.addNumber(25, 0.0007d); // Z
} }
private static char[] chars = new char[] { private static char[] chars = new char[] {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
@ -77,10 +77,10 @@ public class GridFactory {
Bounds b = new Bounds(0, height, 0, width); Bounds b = new Bounds(0, height, 0, width);
length--; // arrays, duh length--; // arrays, duh
if( if(
direction == Direction.N || direction == Direction.N ||
direction == Direction.NE || direction == Direction.NE ||
direction == Direction.NW direction == Direction.NW
) { ) {
b.min_y = length; b.min_y = length;
@ -158,6 +158,10 @@ public class GridFactory {
return makeGrid(words, height, width, false, true); return makeGrid(words, height, width, false, true);
} }
public static char[][] makeGrid(List<String> words, int height, int width, boolean simple) {
return makeGrid(words, height, width, simple, true);
}
public static char[][] makeGrid(List<String> words, int height, int width, boolean simple, boolean fill) { public static char[][] makeGrid(List<String> words, int height, int width, boolean simple, boolean fill) {
char[][] grid = new char[height][width]; char[][] grid = new char[height][width];
@ -184,7 +188,7 @@ public class GridFactory {
if(fill) { if(fill) {
for (int y=0; y<height; y++) { for (int y=0; y<height; y++) {
for (int x=0; x<width; x++) { for (int x=0; x<width; x++) {
if (grid[y][x] == Character.UNASSIGNED) if (grid[y][x] == Character.UNASSIGNED)
// grid[y][x] = '_'; // grid[y][x] = '_';
grid[y][x] = getRandomChar(); grid[y][x] = getRandomChar();
} }
@ -198,7 +202,7 @@ public class GridFactory {
Direction direction = getDirection(simple); Direction direction = getDirection(simple);
Bounds b = getBounds(grid.length, grid[0].length, direction, word.length()); Bounds b = getBounds(grid.length, grid[0].length, direction, word.length());
// System.out.println("[" + word + "] bounds: " + b); // System.out.println("[" + word + "] bounds: " + b);
int x = rnd.nextInt(b.max_x - b.min_x) + b.min_x; int x = rnd.nextInt(b.max_x - b.min_x) + b.min_x;
int y = rnd.nextInt(b.max_y - b.min_y) + b.min_y; int y = rnd.nextInt(b.max_y - b.min_y) + b.min_y;
@ -216,7 +220,7 @@ public class GridFactory {
tempgrid[y][x] = c; tempgrid[y][x] = c;
x = move_x(x, direction); x = move_x(x, direction);
y = move_y(y, direction); y = move_y(y, direction);
} }
return tempgrid; return tempgrid;
} }