diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java index 2e7b0198..3dba8808 100644 --- a/src/PamController/PamguardVersionInfo.java +++ b/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 diff --git a/src/PamController/command/CommandManager.java b/src/PamController/command/CommandManager.java index e734abec..01533e28 100644 --- a/src/PamController/command/CommandManager.java +++ b/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()); diff --git a/src/PamController/command/ExitCommand.java b/src/PamController/command/ExitCommand.java index 76c8fcee..a44c91ce 100644 --- a/src/PamController/command/ExitCommand.java +++ b/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"; } diff --git a/src/PamController/command/ExitNoSaveCommand.java b/src/PamController/command/ExitNoSaveCommand.java new file mode 100644 index 00000000..4c12c58a --- /dev/null +++ b/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"; + } + + +} diff --git a/src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java b/src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java index e7b78e7d..ed502829 100644 --- a/src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java +++ b/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; } diff --git a/src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java b/src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java index db3c7ef2..c86c2ae4 100644 --- a/src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java +++ b/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; } }