diff --git a/src/bearinglocaliser/toad/TOADBearingAlgorithm.java b/src/bearinglocaliser/toad/TOADBearingAlgorithm.java index efb6f1f3..631f05da 100644 --- a/src/bearinglocaliser/toad/TOADBearingAlgorithm.java +++ b/src/bearinglocaliser/toad/TOADBearingAlgorithm.java @@ -231,9 +231,9 @@ public class TOADBearingAlgorithm extends BaseFFTBearingAlgorithm { */ // locBearings[0][0] = Math.PI/2-locBearings[0][0]; - if (arrayShape == ArrayManager.ARRAY_TYPE_PLANE) { - locBearings[0][0] = Math.PI/2-locBearings[0][0]; - } +// if (arrayShape == ArrayManager.ARRAY_TYPE_PLANE) { +// locBearings[0][0] = Math.PI/2-locBearings[0][0]; +// } PamVector[] arrayAxis = bearingLocaliser.getArrayAxis(); double[] arrayAngles = PamVector.getMinimalHeadingPitchRoll(arrayAxis); diff --git a/src/clickTrainDetector/classification/CTClassifierParams.java b/src/clickTrainDetector/classification/CTClassifierParams.java index a7a861d4..9768c61f 100644 --- a/src/clickTrainDetector/classification/CTClassifierParams.java +++ b/src/clickTrainDetector/classification/CTClassifierParams.java @@ -49,6 +49,13 @@ public class CTClassifierParams implements Cloneable, Serializable, ManagedParam */ public CTClassifierType type; + /** + * Create a new unique string identifier - USE WITH CAUTION as the unique ID is used to identify data selectors. + */ + public void newUniqueID() { + this.uniqueID = UUID.randomUUID().toString(); + }; + public CTClassifierParams clone() { try { CTClassifierParams clonedParams =(CTClassifierParams) super.clone(); diff --git a/src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java b/src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java index 4d066c81..8cca8403 100644 --- a/src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java +++ b/src/clickTrainDetector/classification/simplechi2classifier/Chi2ThresholdClassifier.java @@ -118,6 +118,8 @@ public class Chi2ThresholdClassifier implements CTClassifier { */ public void createDataSelector(PamDataBlock source) { //System.out.println("Create data selector " +" " + clssfrParams.classifierName + " " + clssfrParams.speciesFlag + " " + clssfrParams.uniqueID ); + + if (clssfrParams.uniqueID==null) clssfrParams.newUniqueID(); if (dataSelector==null || dataSelector.getPamDataBlock()!=source) { //create the data selector diff --git a/src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java b/src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java index e3a9cf40..db3c7ef2 100644 --- a/src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java +++ b/src/clickTrainDetector/classification/standardClassifier/StandardClassifier.java @@ -148,13 +148,13 @@ 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() != SUB_CLASSIFIER_SPECIESID){ + if (ctClassification[i].getSpeciesID() < 0){ speciesID = CTClassifier.NOSPECIES; } } } - //System.out.println("SPECIES ID: " + speciesID); + //System.out.println("SPECIES ID: " + speciesID + " clickTrain: " + clickTrain.getUID()); //create the classification. StandardClassification classification = new StandardClassification(ctClassification, speciesID);