Merge branch 'Tethys' of https://github.com/douggillespie/PAMGuard into Tethys

This commit is contained in:
Douglas Gillespie 2023-12-30 17:26:43 +00:00
commit 716eb1faa7

View File

@ -44,6 +44,9 @@ public class EffortFunctions {
private DeploymentOverview createOverview(RecordingList tempPeriods) { private DeploymentOverview createOverview(RecordingList tempPeriods) {
DutyCycleInfo dutyCycleinfo = assessDutyCycle(tempPeriods); DutyCycleInfo dutyCycleinfo = assessDutyCycle(tempPeriods);
if (dutyCycleinfo == null) {
return null;
}
// if it's duty cycles, then we only want a single entry. // if it's duty cycles, then we only want a single entry.
RecordingList deploymentPeriods; RecordingList deploymentPeriods;
@ -274,6 +277,9 @@ public class EffortFunctions {
* @return * @return
*/ */
private DutyCycleInfo assessDutyCycle(RecordingList tempPeriods) { private DutyCycleInfo assessDutyCycle(RecordingList tempPeriods) {
if (tempPeriods == null) {
return null;
}
int n = tempPeriods.size(); int n = tempPeriods.size();
if (n < 2) { if (n < 2) {
return new DutyCycleInfo(false, 0,0,n); return new DutyCycleInfo(false, 0,0,n);