mafoo.org.uk/wordsearch
1
0
Fork 0
mirror of https://github.com/fooflington/wordsearch.git synced 2025-01-22 01:09:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:fooflington/wordsearch

Browse Source
This commit is contained in:
Matthew Slowe 2017-10-15 16:23:58 +01:00
commit f9bd2d44ba
No known key found for this signature in database
GPG Key ID: DE311E1AC27AC583
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -16,7 +16,7 @@ OBJS = ${SRCS:.java=.class}
all: build wordsearch.jar
run: all
$(JAVA) uk.org.mafoo.wordsearch.GridFactory 10 10
$(JAVA) uk.org.mafoo.wordsearch.GridFactory 30 30
.java.class:
$(JAVAC) $(JFLAGS) $<

7
README.md
View File

@ -17,5 +17,10 @@ Once built, you need to make a "war" file to deploy to your J2EE container (test
```
$ cd war && jar cfv ../wordsearch.war .
```
Then deploy your war file :-)
Alternatively you can test-run the engine...
```
$ make run <wordlist.txt
```

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

@ -56,7 +56,7 @@ public class GridFactory {
while ((s = in.readLine()) != null && s.length() != 0) {
words.add(s);
}
char[][] g = makeGrid(words, Integer.parseInt(args[0]), Integer.parseInt(args[1]));
char[][] g = makeGrid(words, Integer.parseInt(args[0]), Integer.parseInt(args[1]), false, false);
dump2d(g);
}
@ -155,10 +155,10 @@ public class GridFactory {
}
public static char[][] makeGrid(List<String> words, int height, int width) {
return makeGrid(words, height, width, false);
return makeGrid(words, height, width, false, true);
}
public static char[][] makeGrid(List<String> words, int height, int width, boolean simple) {
public static char[][] makeGrid(List<String> words, int height, int width, boolean simple, boolean fill) {
char[][] grid = new char[height][width];
// Place words at random?
@ -181,11 +181,13 @@ public class GridFactory {
}
// Fill rest of grid
for (int y=0; y<height; y++) {
for (int x=0; x<width; x++) {
if (grid[y][x] == Character.UNASSIGNED)
// grid[y][x] = '_';
grid[y][x] = getRandomChar();
if(fill) {
for (int y=0; y<height; y++) {
for (int x=0; x<width; x++) {
if (grid[y][x] == Character.UNASSIGNED)
// grid[y][x] = '_';
grid[y][x] = getRandomChar();
}
}
}
@ -240,4 +242,4 @@ public class GridFactory {
System.out.println("");
}
}
}
}