From 5f2d160a7006480496abdf0aef23c911b089c13a Mon Sep 17 00:00:00 2001 From: Austin Moran Date: Mon, 13 Apr 2015 11:58:11 -0400 Subject: [PATCH 1/3] start implementation --- .gitignore | 3 + build.gradle | 13 +- gradlew | 164 ++++++++++++++++++ gradlew.bat | 90 ++++++++++ .../java/com/hangman/players/YourPlayer.java | 42 ++++- .../com/hangman/players/YourPlayerTest.java | 35 +++- 6 files changed, 335 insertions(+), 12 deletions(-) create mode 100755 gradlew create mode 100644 gradlew.bat diff --git a/.gitignore b/.gitignore index ec80fd0..b67a9f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ .idea *.iml +*.ipr +*.iws target .DS_Store .gradle/ +gradle/ build/ diff --git a/build.gradle b/build.gradle index 5f89eca..1647a29 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,21 @@ apply plugin: 'java' apply plugin: 'application' +apply plugin: 'idea' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 mainClassName = 'com.hangman.HangmanRunner' repositories { - mavenCentral() + mavenCentral() } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' + compile 'com.google.guava:guava:18.0' + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +task wrapper(type: Wrapper) { + gradleVersion = '2.3' } diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/com/hangman/players/YourPlayer.java b/src/main/java/com/hangman/players/YourPlayer.java index ddcfbd3..e8082f0 100644 --- a/src/main/java/com/hangman/players/YourPlayer.java +++ b/src/main/java/com/hangman/players/YourPlayer.java @@ -1,13 +1,43 @@ package com.hangman.players; + import com.hangman.Player; -import java.util.Arrays; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; public class YourPlayer implements Player { - @Override - public char GetGuess(List currentClue) { - return 'a'; - } + + private static final char[] LETTERS = { + 'e', 't', 'a', 'o', 'i', 'n', + 's', 'h', 'r', 'd', 'l', 'c', + 'u', 'm', 'y', 'f', 'g', 'y', + 'p', 'b', 'v', 'k', 'j', 'x', + 'q', 'z' + }; + + List incorrectGuesses = new ArrayList<>(); + + @Override + public char GetGuess(List currentClue) { + return guessNextLetter(); + } + + private char guessNextLetter() { + return saveAndGuess(LETTERS[incorrectGuesses.size()]); + } + + private int getRemainingBlanks(List currentClue) { + int blanks = 0; + for (Character c : currentClue) { + if (c.equals('_')) { + ++blanks; + } + } + return blanks; + } + + private char saveAndGuess(char c) { + incorrectGuesses.add(c); + return c; + } } diff --git a/src/test/java/com/hangman/players/YourPlayerTest.java b/src/test/java/com/hangman/players/YourPlayerTest.java index d613f6b..b3f4452 100644 --- a/src/test/java/com/hangman/players/YourPlayerTest.java +++ b/src/test/java/com/hangman/players/YourPlayerTest.java @@ -1,8 +1,15 @@ package com.hangman.players; import org.junit.Test; + +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class YourPlayerTest { @Test @@ -11,7 +18,7 @@ public void GuessesAWhenThereAreNoSuccessfulCharactersGuessedYet() { char guess = player.GetGuess(Arrays.asList('_', '_', '_')); - assertEquals('a', guess); + assertEquals('e', guess); } @Test @@ -20,7 +27,7 @@ public void GuessesAWhenThereAreSuccessfulCharactersGuessedThatAreNotA() { char guess = player.GetGuess(Arrays.asList('m', '_', 'n')); - assertEquals('a', guess); + assertEquals('e', guess); } @Test @@ -29,6 +36,26 @@ public void GuessesAWhenAIsThereAreAsInTheClueAsWell() { char guess = player.GetGuess(Arrays.asList('_', 'a', '_')); - assertEquals('a', guess); + assertEquals('e', guess); + } + + @Test + public void GuessesADifferentLetterWhenPreviousGuessIsIncorrect() { + YourPlayer player = new YourPlayer(); + for (int i = 0; i < 26; ++i) { + player.GetGuess(Collections.singletonList('_')); + } + assertFalse(listHasDuplicates(player.incorrectGuesses)); + } + + private boolean listHasDuplicates(List candidate) { + List seenBefore = new ArrayList<>(); + for (Character c : candidate) { + if (seenBefore.contains(c)) { + return false; + } + seenBefore.add(c); + } + return true; } -} + } From d20eb109d8998f499d5e50a939857c6bed6bd17d Mon Sep 17 00:00:00 2001 From: Austin Moran Date: Mon, 13 Apr 2015 12:50:30 -0400 Subject: [PATCH 2/3] (Austin Moran) slightly better --- .../java/com/hangman/players/YourPlayer.java | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hangman/players/YourPlayer.java b/src/main/java/com/hangman/players/YourPlayer.java index e8082f0..f9ba4e3 100644 --- a/src/main/java/com/hangman/players/YourPlayer.java +++ b/src/main/java/com/hangman/players/YourPlayer.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.Set; +import java.util.TreeSet; public class YourPlayer implements Player { @@ -16,17 +18,22 @@ public class YourPlayer implements Player { }; List incorrectGuesses = new ArrayList<>(); + Set correctGuesses = new TreeSet<>(); + Integer remainingBlanks; @Override public char GetGuess(List currentClue) { - return guessNextLetter(); + return guessNextLetter(currentClue); } - private char guessNextLetter() { + private char guessNextLetter(List currentClue) { + if (lastGuessWasCorrect(currentClue)) { + return saveAndGuess(LETTERS[correctGuesses.size() - 1]); + } return saveAndGuess(LETTERS[incorrectGuesses.size()]); } - private int getRemainingBlanks(List currentClue) { + private Integer getRemainingBlanks(List currentClue) { int blanks = 0; for (Character c : currentClue) { if (c.equals('_')) { @@ -36,6 +43,25 @@ private int getRemainingBlanks(List currentClue) { return blanks; } + private boolean lastGuessWasCorrect(List clue) { + Integer blanks = getRemainingBlanks(clue); + if (remainingBlanks != null && !blanks.equals(remainingBlanks)) { + remainingBlanks = blanks; + addCorrectGuess(); + return true; + } + return false; + } + + private void addCorrectGuess() { + int index = incorrectGuesses.size(); + if (index > 0) { + --index; + } + char lastGuess = incorrectGuesses.remove(index); + correctGuesses.add(lastGuess); + } + private char saveAndGuess(char c) { incorrectGuesses.add(c); return c; From 8d18a22c5bb1cca8307676c92acea431c12e51f3 Mon Sep 17 00:00:00 2001 From: Austin Moran Date: Mon, 13 Apr 2015 14:06:45 -0400 Subject: [PATCH 3/3] replace correct guesses with single char --- .../java/com/hangman/players/YourPlayer.java | 55 ++++++++++--------- .../com/hangman/players/YourPlayerTest.java | 2 +- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/hangman/players/YourPlayer.java b/src/main/java/com/hangman/players/YourPlayer.java index f9ba4e3..f51239b 100644 --- a/src/main/java/com/hangman/players/YourPlayer.java +++ b/src/main/java/com/hangman/players/YourPlayer.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; -import java.util.TreeSet; public class YourPlayer implements Player { @@ -17,53 +15,60 @@ public class YourPlayer implements Player { 'q', 'z' }; - List incorrectGuesses = new ArrayList<>(); - Set correctGuesses = new TreeSet<>(); +// private static List COMMON_REPEATS = +// Arrays.asList('e', 't', 'o', 'n', 's', 'r', 'd', 'l', 'c', 'm', 'f', 'g', 'p'); + + List exhaustedGuesses = new ArrayList<>(); Integer remainingBlanks; + Character lastGuess; @Override public char GetGuess(List currentClue) { + if (isFirstGuess()) { + remainingBlanks = getRemainingBlanks(currentClue); + return saveAndGuess(LETTERS[0]); + } return guessNextLetter(currentClue); } private char guessNextLetter(List currentClue) { if (lastGuessWasCorrect(currentClue)) { - return saveAndGuess(LETTERS[correctGuesses.size() - 1]); + // TODO: don't repeat guess letters that don't repeat in English +// if (COMMON_REPEATS.contains(lastGuess)) { + return saveAndGuess(lastGuess); +// } } - return saveAndGuess(LETTERS[incorrectGuesses.size()]); - } - - private Integer getRemainingBlanks(List currentClue) { - int blanks = 0; - for (Character c : currentClue) { - if (c.equals('_')) { - ++blanks; - } - } - return blanks; + exhaustedGuesses.add(lastGuess); + return saveAndGuess(LETTERS[exhaustedGuesses.size()]); } private boolean lastGuessWasCorrect(List clue) { Integer blanks = getRemainingBlanks(clue); - if (remainingBlanks != null && !blanks.equals(remainingBlanks)) { + if (blanks < remainingBlanks) { remainingBlanks = blanks; - addCorrectGuess(); return true; } return false; } - private void addCorrectGuess() { - int index = incorrectGuesses.size(); - if (index > 0) { - --index; + private boolean isFirstGuess() { + return exhaustedGuesses.size() == 0 && + lastGuess == null && + remainingBlanks == null; + } + + private Integer getRemainingBlanks(List currentClue) { + int blanks = 0; + for (Character c : currentClue) { + if (c.equals('_')) { + ++blanks; + } } - char lastGuess = incorrectGuesses.remove(index); - correctGuesses.add(lastGuess); + return blanks; } private char saveAndGuess(char c) { - incorrectGuesses.add(c); + lastGuess = c; return c; } } diff --git a/src/test/java/com/hangman/players/YourPlayerTest.java b/src/test/java/com/hangman/players/YourPlayerTest.java index b3f4452..cce15bf 100644 --- a/src/test/java/com/hangman/players/YourPlayerTest.java +++ b/src/test/java/com/hangman/players/YourPlayerTest.java @@ -45,7 +45,7 @@ public void GuessesADifferentLetterWhenPreviousGuessIsIncorrect() { for (int i = 0; i < 26; ++i) { player.GetGuess(Collections.singletonList('_')); } - assertFalse(listHasDuplicates(player.incorrectGuesses)); + assertFalse(listHasDuplicates(player.exhaustedGuesses)); } private boolean listHasDuplicates(List candidate) {