Improved support for continued sampling, various cleanup

If using 'continue' CMD line option, ParalllelLDA will now try to load a stored sampler matching the
given configuration and continue sampling from it (with all the same settings)

Author: lejon

pom.xml

@@ -99,7 +99,8 @@
 	<!-- v8.2.1: Added 'continue sampling' and 'init from' functionality -->
 	<!-- v8.2.2: Support 'raw' mode when reading corpus from string -->
 	<!-- v8.3.0: Support saving sampler from main Java application -->
-	<version>8.3.0</version>
+	<!-- v8.4.0: Added support for continued sampling in main, controlled by 'continue' CMD line option -->
+	<version>8.4.0</version>
 
 	<name>Partially Collapsed Parallel LDA</name>
 

src/main/java/cc/mallet/configuration/LDACommandLineParser.java

@@ -44,7 +44,8 @@ protected CommandLine parseCommandLine(String [] args) throws ParseException {
 	@SuppressWarnings("static-access")
 	protected void addOptions() {
 		options.addOption( "dbg", "debug", true, "use debugging " );
-		options.addOption( "cm", "comment", true, "a comment ot be added to the logfile " );
+		options.addOption( "c", "continue", false, "continue sampling from a saved state (give in config file by option 'saved_sampler_dir') " );
+		options.addOption( "cm", "comment", true, "a comment to be added to the logfile " );
 		options.addOption( "ds", "dataset", true, "filename of dataset file" );
 		options.addOption( "ts", "topics", true, "number of topics" );
 		options.addOption( "a", "alpha", true, "uniform alpha prior" );
@@ -66,7 +67,11 @@ protected void addOptions() {
 	public boolean hasOption(String key) {
 		return options.hasOption(key);
 	}
-	
+
+	public boolean isOptionSet(String key) {
+		return parsedCommandLine.hasOption(key);
+	}
+
 	public String getOption(String key) {
 		return parsedCommandLine.getOptionValue(key);
 	}