nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-21 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
Douglas Gillespie 2022-09-23 11:46:53 +01:00 committed by GitHub
commit cf4c97a244
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/clickTrainDetector/dataselector/CTDataSelector.java
View File

@ -10,6 +10,7 @@ import clickTrainDetector.CTDataUnit;
import clickTrainDetector.CTDetectionGroupDataUnit; import clickTrainDetector.CTDetectionGroupDataUnit;
import clickTrainDetector.ClickTrainControl; import clickTrainDetector.ClickTrainControl;
import clickTrainDetector.ClickTrainDataBlock; import clickTrainDetector.ClickTrainDataBlock;
import clickTrainDetector.classification.CTClassification;
import clickTrainDetector.layout.dataselector.CTDataSelectPane; import clickTrainDetector.layout.dataselector.CTDataSelectPane;
import clickTrainDetector.layout.dataselector.CTDataSelectPanel; import clickTrainDetector.layout.dataselector.CTDataSelectPanel;
import pamViewFX.fxSettingsPanes.DynamicSettingsPane; import pamViewFX.fxSettingsPanes.DynamicSettingsPane;
@ -125,10 +126,6 @@ public class CTDataSelector extends DataSelector {
if (ctSelectParams.allowAnyClassification) return true; if (ctSelectParams.allowAnyClassification) return true;
if (this.getSelectorName().contains("Dolphin")) {
System.out.println("Dolphin classifier looking at " + ctDataUnit);
}
if (ctDataUnit instanceof CTDataUnit) { if (ctDataUnit instanceof CTDataUnit) {
CTDataUnit clickTrain = (CTDataUnit) ctDataUnit; CTDataUnit clickTrain = (CTDataUnit) ctDataUnit;
@ -137,13 +134,28 @@ public class CTDataSelector extends DataSelector {
int nClass = clickTrain.ctClassifications.size(); int nClass = clickTrain.ctClassifications.size();
if (ctSelectParams.allowMultipleChoices == false) { if (ctSelectParams.allowMultipleChoices == false) {
nClass = Math.min(nClass, 1); int clsInd = clickTrain.getClassificationIndex();
if (clsInd < 0) {
return false;
}
if (clsInd >= clickTrain.ctClassifications.size()) {
return false;
}
CTClassification singleClass = clickTrain.ctClassifications.get(clsInd);
for (int i = 0; i < ctSelectParams.classifier.length; i++) {
if (ctSelectParams.classifier[i] == singleClass.getSpeciesID()) {
return true;
}
}
return false;
} }
//iterate through all the classifiers and allowed classification types. else {
for (int i=0; i<ctSelectParams.classifier.length; i++) { //iterate through all the classifiers and allowed classification types.
for (int j=0; j<nClass; j++) { for (int i=0; i<ctSelectParams.classifier.length; i++) {
if (clickTrain.ctClassifications.get(j).getSpeciesID()==ctSelectParams.classifier[i]) { for (int j=0; j<nClass; j++) {
return true; if (clickTrain.ctClassifications.get(j).getSpeciesID()==ctSelectParams.classifier[i]) {
return true;
}
} }
} }
} }