Merge pull request #25 from PAMGuard/main

Merge changes from main

src/PamController/PamguardVersionInfo.java

@@ -36,7 +36,7 @@ public class PamguardVersionInfo {
 	/**
 	 * Release date
 	 */
-	static public final String date = "29 September 2022";
+	static public final String date = "3 October 2022";
 	
 //	/**
 //	 * Release type - Beta or Core

src/PamController/command/CommandManager.java

@@ -35,6 +35,7 @@ public abstract class CommandManager extends PamControlledUnit {
 		commandsList.add(new SummaryPeekCommand());
 		commandsList.add(new TellModuleCommand());
 		commandsList.add(new ExitCommand());
+		commandsList.add(new ExitNoSaveCommand());
 		commandsList.add(new KillCommand());
 		commandsList.add(new HelpCommand(this));
 		commandsList.add(new GetXMLSettings());

src/PamController/command/ExitCommand.java

@@ -24,7 +24,7 @@ public class ExitCommand extends ExtCommand {
 
 	@Override
 	public String getHint() {
-		return "Exit PAMGuard, stopping detectors prior to exiting";
+		return "Exit PAMGuard, stopping detectors and saving configuration prior to exiting";
 	}
 
 

src/PamController/command/ExitNoSaveCommand.java

@@ -0,0 +1,24 @@
+package PamController.command;
+
+import PamController.PamController;
+
+public class ExitNoSaveCommand extends ExtCommand {
+
+	public ExitNoSaveCommand() {
+		super("ExitNoSave", false);
+	}
+
+	@Override
+	public String execute(String command) {
+		PamController.getInstance().pamStop();
+		System.exit(0);
+		return getName();
+	}
+
+	@Override
+	public String getHint() {
+		return "Exit PAMGuard, stopping detectors but not saving configuration";
+	}
+
+
+}

src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java

@@ -101,6 +101,7 @@ public class Chi2ThresholdClassifier implements CTClassifier {
 				count = count+1.; 
 			}
 		}
+		
 		if (count/clickTrain.getSubDetectionsCount()>=clssfrParams.minPercentage) {
 			return true;	
 		}

src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java

@@ -148,7 +148,7 @@ public class StandardClassifier implements CTClassifier {
 //					+ "  sub species: "+ classifiers.get(i).getParams().speciesFlag + " standard species: " +speciesID + " use? : " + standardClssfrParams.enable[i]); 
 
 			if (standardClssfrParams.enable[i]) {
-				if (ctClassification[i].getSpeciesID() < 0){
+				if (ctClassification[i].getSpeciesID() <= CTClassifier.NOSPECIES){
 					speciesID = CTClassifier.NOSPECIES;
 				}
 			}