Merge pull request #559 from AAVSO/558-wwz-statistic-goes-to-zero-in-the-presence-of-gaps

558 wwz statistic goes to zero in the presence of gaps

Author: dbenn

src/org/aavso/tools/vstar/plugin/period/impl/WeightedWaveletZTransformPluginBase.java

@@ -23,6 +23,7 @@
 import org.aavso.tools.vstar.plugin.period.PeriodAnalysisPluginBase;
 import org.aavso.tools.vstar.ui.dialog.ITextComponent;
 import org.aavso.tools.vstar.ui.dialog.DoubleField;
+import org.aavso.tools.vstar.ui.dialog.IntegerField;
 import org.aavso.tools.vstar.ui.mediator.Mediator;
 import org.aavso.tools.vstar.util.locale.LocaleProps;
 import org.aavso.tools.vstar.util.period.wwz.WeightedWaveletZTransform;
@@ -37,9 +38,11 @@ abstract public class WeightedWaveletZTransformPluginBase extends
 
 	protected Double currDecay;
 	protected Double currTimeDivisions;
+	protected Integer currThreadCount;
 
 	protected DoubleField decayField;
 	protected DoubleField timeDivisionsField;
+	protected IntegerField threadCountField;
 
 	/**
 	 * Constructor
@@ -67,6 +70,14 @@ protected List<ITextComponent<?>> createNumberFields(DoubleField... moreFields)
 				currTimeDivisions);
 		fields.add(timeDivisionsField);
 
+		int recommendedThreads = WeightedWaveletZTransform.getRecommendedThreadCount();
+		if (currThreadCount == null || currThreadCount > recommendedThreads) {
+			currThreadCount = recommendedThreads;
+		}
+		threadCountField = new IntegerField(LocaleProps.get("WWZ_PARAMETERS_THREADS"),
+				1, recommendedThreads, currThreadCount);
+		fields.add(threadCountField);
+
 		return fields;
 	}
 
@@ -85,13 +96,16 @@ public String getGroup() {
 	public void reset() {
 		currDecay = 0.001;
 		currTimeDivisions = 50.0;
+		currThreadCount = WeightedWaveletZTransform.getRecommendedThreadCount();
 	}
 
 	/**
 	 * @see org.aavso.tools.vstar.plugin.period.PeriodAnalysisPluginBase#interrupt()
 	 */
 	@Override
 	public void interrupt() {
-		wwt.interrupt();
+		if (wwt != null) {
+			wwt.interrupt();
+		}
 	}
 }

src/org/aavso/tools/vstar/plugin/period/impl/WeightedWaveletZTransformWithFrequencyRangePlugin.java

@@ -81,19 +81,30 @@ public void executeAlgorithm(List<ValidObservation> obs)
 
 		if (!paramDialog.isCancelled()) {
 			double minFreq, maxFreq, deltaFreq, decay, timeDivisions;
+			int threadCount;
 
 			currMinFreq = minFreq = minFreqField.getValue();
 			currMaxFreq = maxFreq = maxFreqField.getValue();
 			currDeltaFreq = deltaFreq = deltaFreqField.getValue();
 			currDecay = decay = decayField.getValue();
 			currTimeDivisions = timeDivisions = timeDivisionsField.getValue();
+			Integer threadCountValue = threadCountField.getValue();
+			if (threadCountValue == null) {
+				threadCountValue = WeightedWaveletZTransform.getRecommendedThreadCount();
+			}
+			currThreadCount = threadCount = threadCountValue;
 
 			// TODO: ask about number of frequencies > 1000 via dialog?
 
 			wwt = new WeightedWaveletZTransform(obs, decay, timeDivisions);
+			wwt.setThreadCount(threadCount);
 			wwt.make_freqs_from_freq_range(Math.min(minFreq, maxFreq), Math
 					.max(minFreq, maxFreq), deltaFreq);
 			wwt.execute();
+			if (wwt.isCancelled()) {
+				throw new CancellationException("WWZ "
+						+ LocaleProps.get("CANCELLED"));
+			}
 		} else {
 			throw new CancellationException("WWZ "
 					+ LocaleProps.get("CANCELLED"));

src/org/aavso/tools/vstar/plugin/period/impl/WeightedWaveletZTransformWithPeriodRangePlugin.java

@@ -78,19 +78,30 @@ public void executeAlgorithm(List<ValidObservation> obs)
 
 		if (!paramDialog.isCancelled()) {
 			double minPeriod, maxPeriod, deltaPeriod, decay, timeDivisions;
+			int threadCount;
 
 			currMinPeriod = minPeriod = minPeriodField.getValue();
 			currMaxPeriod = maxPeriod = maxPeriodField.getValue();
 			currDeltaPeriod = deltaPeriod = deltaPeriodField.getValue();
 			currDecay = decay = decayField.getValue();
 			currTimeDivisions = timeDivisions = timeDivisionsField.getValue();
+			Integer threadCountValue = threadCountField.getValue();
+			if (threadCountValue == null) {
+				threadCountValue = WeightedWaveletZTransform.getRecommendedThreadCount();
+			}
+			currThreadCount = threadCount = threadCountValue;
 
 			// TODO: ask about number of periods > 1000 via dialog?
 
 			wwt = new WeightedWaveletZTransform(obs, decay, timeDivisions);
+			wwt.setThreadCount(threadCount);
 			wwt.make_freqs_from_period_range(Math.min(minPeriod, maxPeriod),
 					Math.max(minPeriod, maxPeriod), deltaPeriod);
 			wwt.execute();
+			if (wwt.isCancelled()) {
+				throw new CancellationException("WWZ "
+						+ LocaleProps.get("CANCELLED"));
+			}
 		} else {
 			throw new CancellationException("WWZ "
 					+ LocaleProps.get("CANCELLED"));

src/org/aavso/tools/vstar/ui/resources/locale/strings.properties

@@ -183,6 +183,7 @@ WWZ_PARAMETERS_FREQUENCY_STEP=Frequency Step
 WWZ_PARAMETERS_PERIOD_STEP=Period Step
 WWZ_PARAMETERS_DECAY=Decay
 WWZ_PARAMETERS_TIME_DIVISIONS=Time Divisions
+WWZ_PARAMETERS_THREADS=Threads
 
 // WWZ result dialog
 WWZ_RESULTS=WWZ Results

src/org/aavso/tools/vstar/ui/resources/locale/strings_es.properties

@@ -294,3 +294,4 @@ EPOCH=\u00E9poca
 VERSUS=vs
 MAXIMAL=maximal
 CONTOUR=contorno
+WWZ_PARAMETERS_THREADS=Hilos

src/org/aavso/tools/vstar/ui/resources/locale/strings_fr.properties

@@ -294,4 +294,5 @@ PERIOD=p\u00E9riode
 EPOCH=\u00E9poque
 VERSUS=vs
 MAXIMAL=maximal
-CONTOUR=courbe
+CONTOUR=courbe
+WWZ_PARAMETERS_THREADS=threads