@@ -1244,7 +1244,7 @@ private static int mappedExitCode(Throwable t, IExitCodeExceptionMapper mapper,
}
/** Returns the color scheme to use when printing help.
- * The default value is the {@linkplain acrostics.CommandLine.Help#defaultColorScheme(CommandLine.Help.Ansi) default color scheme} with {@link Help.Ansi#AUTO Ansi.AUTO}.
+ * The default value is the {@linkplain acrosticsleuth.CommandLine.Help#defaultColorScheme(CommandLine.Help.Ansi) default color scheme} with {@link Help.Ansi#AUTO Ansi.AUTO}.
* @see #execute(String...)
* @see #usage(PrintStream)
* @see #usage(PrintWriter)
@@ -4015,7 +4015,7 @@ public enum ScopeType {
*
*
* @return a class whose instances can iterate over the completion candidates for this option
- * @see acrostics.CommandLine.IFactory
+ * @see acrosticsleuth.CommandLine.IFactory
* @since 3.2 */
Class> completionCandidates() default NoCompletionCandidates.class;
@@ -4312,7 +4312,7 @@ public enum ScopeType {
*
*
* @return a class whose instances can iterate over the completion candidates for this positional parameter
- * @see acrostics.CommandLine.IFactory
+ * @see acrosticsleuth.CommandLine.IFactory
* @since 3.2 */
Class> completionCandidates() default NoCompletionCandidates.class;
@@ -4827,28 +4827,28 @@ enum Target {
* @since 4.0 */
boolean usageHelpAutoWidth() default false;
- /** Exit code for successful termination. {@value acrostics.CommandLine.ExitCode#OK} by default.
+ /** Exit code for successful termination. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default.
* @see #execute(String...)
* @since 4.0 */
int exitCodeOnSuccess() default ExitCode.OK;
- /** Exit code for successful termination after printing usage help on user request. {@value acrostics.CommandLine.ExitCode#OK} by default.
+ /** Exit code for successful termination after printing usage help on user request. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default.
* @see #execute(String...)
* @since 4.0 */
int exitCodeOnUsageHelp() default ExitCode.OK;
- /** Exit code for successful termination after printing version help on user request. {@value acrostics.CommandLine.ExitCode#OK} by default.
+ /** Exit code for successful termination after printing version help on user request. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default.
* @see #execute(String...)
* @since 4.0 */
int exitCodeOnVersionHelp() default ExitCode.OK;
- /** Exit code for command line usage error. {@value acrostics.CommandLine.ExitCode#USAGE} by default.
+ /** Exit code for command line usage error. {@value acrosticsleuth.CommandLine.ExitCode#USAGE} by default.
* @see #execute(String...)
* @since 4.0 */
int exitCodeOnInvalidInput() default ExitCode.USAGE;
/** Exit code signifying that an exception occurred when invoking the Runnable, Callable or Method user object of a command.
- * {@value acrostics.CommandLine.ExitCode#SOFTWARE} by default.
+ * {@value acrosticsleuth.CommandLine.ExitCode#SOFTWARE} by default.
* @see #execute(String...)
* @since 4.0 */
int exitCodeOnExecutionException() default ExitCode.SOFTWARE;
@@ -5328,7 +5328,7 @@ public interface INegatableOptionTransformer {
* "Boolean options are turned on with {@code -XX:+}".
* These are the negative forms {@linkplain #createDefault() supported by default} by this class.
*
- * See the {@link acrostics.CommandLine.RegexTransformer.Builder} for an example of customizing this to create negative forms for short options.
+ * See the {@link acrosticsleuth.CommandLine.RegexTransformer.Builder} for an example of customizing this to create negative forms for short options.
*
* @since 4.0
*/
@@ -5579,7 +5579,7 @@ public Help create(CommandSpec commandSpec, Help.ColorScheme colorScheme) {
* System.exit(exitCode);
* }
*
- * @see acrostics.CommandLine#CommandLine(Object, IFactory)
+ * @see acrosticsleuth.CommandLine#CommandLine(Object, IFactory)
* @see #call(Class, IFactory, PrintStream, PrintStream, Help.Ansi, String...)
* @see #run(Class, IFactory, PrintStream, PrintStream, Help.Ansi, String...)
* @see #defaultFactory()
@@ -7217,24 +7217,24 @@ public String[] version() {
* @see Command#helpCommand() */
public boolean helpCommand() { return (isHelpCommand == null) ? DEFAULT_IS_HELP_COMMAND : isHelpCommand; }
- /** Returns exit code for successful termination. {@value acrostics.CommandLine.ExitCode#OK} by default, may be set programmatically or via the {@link Command#exitCodeOnSuccess() exitCodeOnSuccess} annotation.
+ /** Returns exit code for successful termination. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default, may be set programmatically or via the {@link Command#exitCodeOnSuccess() exitCodeOnSuccess} annotation.
* @see #execute(String...)
* @since 4.0 */
public int exitCodeOnSuccess() { return exitCodeOnSuccess == null ? ExitCode.OK : exitCodeOnSuccess; }
- /** Returns exit code for successful termination after printing usage help on user request. {@value acrostics.CommandLine.ExitCode#OK} by default, may be set programmatically or via the {@link Command#exitCodeOnVersionHelp() exitCodeOnVersionHelp} annotation.
+ /** Returns exit code for successful termination after printing usage help on user request. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default, may be set programmatically or via the {@link Command#exitCodeOnVersionHelp() exitCodeOnVersionHelp} annotation.
* @see #execute(String...)
* @since 4.0 */
public int exitCodeOnUsageHelp() { return exitCodeOnUsageHelp == null ? ExitCode.OK : exitCodeOnUsageHelp; }
- /** Returns exit code for successful termination after printing version help on user request. {@value acrostics.CommandLine.ExitCode#OK} by default, may be set programmatically or via the {@link Command#exitCodeOnUsageHelp() exitCodeOnUsageHelp} annotation.
+ /** Returns exit code for successful termination after printing version help on user request. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default, may be set programmatically or via the {@link Command#exitCodeOnUsageHelp() exitCodeOnUsageHelp} annotation.
* @see #execute(String...)
* @since 4.0 */
public int exitCodeOnVersionHelp() { return exitCodeOnVersionHelp == null ? ExitCode.OK : exitCodeOnVersionHelp; }
- /** Returns exit code for command line usage error. {@value acrostics.CommandLine.ExitCode#USAGE} by default, may be set programmatically or via the {@link Command#exitCodeOnInvalidInput() exitCodeOnInvalidInput} annotation.
+ /** Returns exit code for command line usage error. {@value acrosticsleuth.CommandLine.ExitCode#USAGE} by default, may be set programmatically or via the {@link Command#exitCodeOnInvalidInput() exitCodeOnInvalidInput} annotation.
* @see #execute(String...)
* @since 4.0 */
public int exitCodeOnInvalidInput() { return exitCodeOnInvalidInput == null ? ExitCode.USAGE : exitCodeOnInvalidInput; }
/** Returns exit code signifying that an exception occurred when invoking the Runnable, Callable or Method user object of a command.
- * {@value acrostics.CommandLine.ExitCode#SOFTWARE} by default, may be set programmatically or via the {@link Command#exitCodeOnExecutionException() exitCodeOnExecutionException} annotation.
+ * {@value acrosticsleuth.CommandLine.ExitCode#SOFTWARE} by default, may be set programmatically or via the {@link Command#exitCodeOnExecutionException() exitCodeOnExecutionException} annotation.
* @see #execute(String...)
* @since 4.0 */
public int exitCodeOnExecutionException() { return exitCodeOnExecutionException == null ? ExitCode.SOFTWARE : exitCodeOnExecutionException; }
@@ -7307,24 +7307,24 @@ public CommandSpec aliases(String... aliases) {
* @see Command#helpCommand() */
public CommandSpec helpCommand(boolean newValue) {isHelpCommand = newValue; return this;}
- /** Sets exit code for successful termination. {@value acrostics.CommandLine.ExitCode#OK} by default.
+ /** Sets exit code for successful termination. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default.
* @see #execute(String...)
* @since 4.0 */
public CommandSpec exitCodeOnSuccess(int newValue) { exitCodeOnSuccess = newValue; return this; }
- /** Sets exit code for successful termination after printing usage help on user request. {@value acrostics.CommandLine.ExitCode#OK} by default.
+ /** Sets exit code for successful termination after printing usage help on user request. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default.
* @see #execute(String...)
* @since 4.0 */
public CommandSpec exitCodeOnUsageHelp(int newValue) { exitCodeOnUsageHelp = newValue; return this; }
- /** Sets exit code for successful termination after printing version help on user request. {@value acrostics.CommandLine.ExitCode#OK} by default.
+ /** Sets exit code for successful termination after printing version help on user request. {@value acrosticsleuth.CommandLine.ExitCode#OK} by default.
* @see #execute(String...)
* @since 4.0 */
public CommandSpec exitCodeOnVersionHelp(int newValue) { exitCodeOnVersionHelp = newValue; return this; }
- /** Sets exit code for command line usage error. {@value acrostics.CommandLine.ExitCode#USAGE} by default.
+ /** Sets exit code for command line usage error. {@value acrosticsleuth.CommandLine.ExitCode#USAGE} by default.
* @see #execute(String...)
* @since 4.0 */
public CommandSpec exitCodeOnInvalidInput(int newValue) { exitCodeOnInvalidInput = newValue; return this; }
/** Sets exit code signifying that an exception occurred when invoking the Runnable, Callable or Method user object of a command.
- * {@value acrostics.CommandLine.ExitCode#SOFTWARE} by default.
+ * {@value acrosticsleuth.CommandLine.ExitCode#SOFTWARE} by default.
* @see #execute(String...)
* @since 4.0 */
public CommandSpec exitCodeOnExecutionException(int newValue) { exitCodeOnExecutionException = newValue; return this; }
@@ -15410,7 +15410,7 @@ public void init(CommandLine helpCommandLine, Help.ColorScheme colorScheme, Prin
/** Help commands that provide usage help for other commands can implement this interface to be initialized with the information they need.
* The {@link #printHelpIfRequested(List, PrintStream, PrintStream, Help.Ansi) CommandLine::printHelpIfRequested} method calls the
- * {@link #init(CommandLine, acrostics.CommandLine.Help.Ansi, PrintStream, PrintStream) init} method on commands marked as {@link Command#helpCommand() helpCommand}
+ * {@link #init(CommandLine, acrosticsleuth.CommandLine.Help.Ansi, PrintStream, PrintStream) init} method on commands marked as {@link Command#helpCommand() helpCommand}
* before the help command's {@code run} or {@code call} method is called.
* Implementation note:
* If an error occurs in the {@code run} or {@code call} method while processing the help request, it is recommended custom Help
@@ -15432,7 +15432,7 @@ public void init(CommandLine helpCommandLine, Help.ColorScheme colorScheme, Prin
/** Help commands that provide usage help for other commands can implement this interface to be initialized with the information they need.
*
The {@link #executeHelpRequest(List) CommandLine::printHelpIfRequested} method calls the
- * {@link #init(CommandLine, acrostics.CommandLine.Help.ColorScheme, PrintWriter, PrintWriter) init} method on commands marked as {@link Command#helpCommand() helpCommand}
+ * {@link #init(CommandLine, acrosticsleuth.CommandLine.Help.ColorScheme, PrintWriter, PrintWriter) init} method on commands marked as {@link Command#helpCommand() helpCommand}
* before the help command's {@code run} or {@code call} method is called.
* Implementation note:
* If an error occurs in the {@code run} or {@code call} method while processing the help request, it is recommended custom Help
@@ -15559,7 +15559,7 @@ public Help(Object command, Ansi ansi) {
* on the specified class and superclasses.
* @param command the annotated object to create usage help for
* @param colorScheme the color scheme to use
- * @deprecated use {@link acrostics.CommandLine.Help#Help(acrostics.CommandLine.Model.CommandSpec, acrostics.CommandLine.Help.ColorScheme)} */
+ * @deprecated use {@link acrosticsleuth.CommandLine.Help#Help(acrosticsleuth.CommandLine.Model.CommandSpec, acrosticsleuth.CommandLine.Help.ColorScheme)} */
@Deprecated public Help(Object command, ColorScheme colorScheme) {
this(CommandSpec.forAnnotatedObject(command, new DefaultFactory()), colorScheme);
}
@@ -17225,7 +17225,7 @@ public static TextTable forColumnWidths(ColorScheme colorScheme, int... columnWi
* @param columns columns to construct this TextTable with
* @since 4.2 */
public static TextTable forColumns(ColorScheme colorScheme, Column... columns) { return new TextTable(colorScheme, columns); }
- /** @deprecated use {@link acrostics.CommandLine.Help.TextTable#TextTable(acrostics.CommandLine.Help.ColorScheme, acrostics.CommandLine.Help.Column[])} instead */
+ /** @deprecated use {@link acrosticsleuth.CommandLine.Help.TextTable#TextTable(acrosticsleuth.CommandLine.Help.ColorScheme, acrosticsleuth.CommandLine.Help.Column[])} instead */
@Deprecated protected TextTable(Ansi ansi, Column[] columns) { this(Help.defaultColorScheme(ansi), columns); }
protected TextTable(ColorScheme colorScheme, Column[] columns) {
this.colorScheme = Assert.notNull(colorScheme, "ansi");
diff --git a/src/acrostics/LanguageModel.java b/src/acrosticsleuth/LanguageModel.java
similarity index 58%
rename from src/acrostics/LanguageModel.java
rename to src/acrosticsleuth/LanguageModel.java
index fb34743..1c87539 100644
--- a/src/acrostics/LanguageModel.java
+++ b/src/acrosticsleuth/LanguageModel.java
@@ -1,34 +1,33 @@
-package acrostics;
+package acrosticsleuth;
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.Scanner;
+
import static java.lang.System.exit;
public class LanguageModel {
- private static final String FILE_POSTFIX = ".vocab";
+ public static final String FILE_POSTFIX = ".vocab";
public final static String[] TOKENS_TO_IGNORE = {"", "", " "};
public final static char SPECIAL = '_'; // special character to indicate space
public final HashMap tokenFrequencies = new HashMap<>();
public final int longestToken;
- public LanguageModel(String filename) {
- filename = filename + FILE_POSTFIX;
- try {
- Scanner sc = new Scanner(Paths.get(filename), "UTF-8");
- while (sc.hasNextLine()) {
- String[] line = sc.nextLine().split("\t");
- if ((line.length == 0) || Arrays.stream(TOKENS_TO_IGNORE).anyMatch(token -> token.equals(line[0]))) {
+ public LanguageModel(InputStream inputStream) {
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ String[] lineSplit = line.split("\t");
+ if ((lineSplit.length == 0) || Arrays.stream(TOKENS_TO_IGNORE).anyMatch(token -> token.equals(lineSplit[0]))) {
continue;
}
- tokenFrequencies.put(line[0], Math.pow(Math.E, Double.parseDouble(line[1]))); // TODO: Use logs
+ tokenFrequencies.put(lineSplit[0], Math.pow(Math.E, Double.parseDouble(lineSplit[1])));
}
} catch (Exception e) {
- System.err.println("Failed to read file: " + filename);
+ System.err.println("Failed to read language model");
exit(1);
}
longestToken = getLongest();
diff --git a/src/acrostics/Main.java b/src/acrosticsleuth/Main.java
similarity index 71%
rename from src/acrostics/Main.java
rename to src/acrosticsleuth/Main.java
index bcc1b59..0c1a174 100644
--- a/src/acrostics/Main.java
+++ b/src/acrosticsleuth/Main.java
@@ -1,10 +1,6 @@
-package acrostics;
+package acrosticsleuth;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
import java.io.PrintStream;
-import java.nio.charset.Charset;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
@@ -19,35 +15,16 @@ public static void main(String[] args) {
if (exitCode != 0 || clo.texts == null || clo.texts.length == 0) {
System.exit(exitCode);
}
- find(clo, System.out, null);
+ find(clo, System.out);
}
- public static void find(CLO clo, PrintStream printStream, LanguageModel lm) {
- CharModel cm = new CharModel();
+ public static void find(CLO clo, PrintStream printStream) {
Text[] texts = new Text[clo.texts.length];
for (int i = 0; i < clo.texts.length; i++) {
texts[i] = new Text(clo.texts[i].getPath(), clo);
}
- if (clo.models == null
- || !new File(clo.models + CharModel.FILE_POSTFIX).exists()) {
- System.err.println("Building language models...");
- for (int i = 0; i < texts.length; i++) {
- System.err.print(i + " out of " +clo.texts.length + "\r");
- texts[i].load(cm,false, false);
- if (texts[i].isEmpty()) {
- System.err.println(texts[i].location + " is empty");
- }
- }
- if (clo.models != null) {
- System.err.println("Saving language models...");
- cm.save(clo.models);
- }
- } else {
- System.err.println("Loading language models...");
- cm.load(clo.models);
- }
- lm = new LanguageModel(clo.models);
+ System.err.println("Loading language models...");
System.err.println("Enumerating possible acrostics...");
BoundedPriorityBlockingQueue acrostics =
@@ -59,7 +36,7 @@ public static void find(CLO clo, PrintStream printStream, LanguageModel lm) {
for (Text text : texts) {
taskCount++;
AcrosticGenerator acrosticGenerator = new AcrosticGenerator(
- acrostics, text, clo, cm, lm);
+ acrostics, text, clo, clo.charModel, clo.languageModel);
executor.execute(acrosticGenerator);
}
executor.shutdown();
diff --git a/src/acrostics/Text.java b/src/acrosticsleuth/Text.java
similarity index 99%
rename from src/acrostics/Text.java
rename to src/acrosticsleuth/Text.java
index 2736df7..59fe1d8 100644
--- a/src/acrostics/Text.java
+++ b/src/acrosticsleuth/Text.java
@@ -1,4 +1,4 @@
-package acrostics;
+package acrosticsleuth;
import java.io.BufferedReader;
import java.io.FileInputStream;