Bugfixes, due to new soundspeed selection method.

VERSION

-284
+285
\ No newline at end of file

lib/+artoa/+controller/+track/+parameter/createCombinationsTable.m

@@ -9,9 +9,6 @@ variableNames = { ...
     'soundsources', ...
     'referencePosition', ...
     'referencePositionEnd', ...
-    'soundspeed1', ...
-    'soundspeed2', ...
-    'soundspeed3', ...
     'trackingMethod', ...
     'backwardTracking' ...
 };

lib/+artoa/+controller/+track/+parameter/getDefaultCombinationCell.m

@@ -20,9 +20,6 @@ emptyCell = { ...
     '', ...
     referencePosition, ...
     '', ...
-    1464, ...
-    1464, ...
-    1464, ...
     '', ...
     false ...
 };

lib/+artoa/+controller/+track/+parameter/validateCombinationsInput.m

@@ -16,7 +16,9 @@ if any(isnan(pCombinationsTable.combinationEnd))
     return;
 end
 
-if any(strcmp(pCombinationsTable.soundsources, ''))
+unfilledSoundsources = strcmp(pCombinationsTable.soundsources, '');
+isInterpolationMethod = artoa.trajectory.isInterpolationMethod(pCombinationsTable.trackingMethod);
+if any(unfilledSoundsources & ~isInterpolationMethod)
     message = 'The "Sound Sources" column contains an invalid value!';
     return;
 end

lib/+artoa/+trajectory/calculateCombinationSegment.m

@@ -57,6 +57,28 @@ trackingMethod = pCombinationDetails.trackingMethod{:};
 segmentStart = pCombinationDetails{1, 1};
 segmentEnd = pCombinationDetails{1, 2};
 
+%% If it is interpolation method, call method directly
+if artoa.trajectory.isInterpolationMethod(trackingMethod)
+    pStartEndPosition = [ ...
+        str2double(strsplit(pCombinationDetails.referencePosition{1}, ' ')); ...
+        str2double(strsplit(pCombinationDetails.referencePositionEnd{1}, ' ')) ...
+        ];
+    pluginTables = struct( ...
+        'combinationBegin', pCombinationDetails.combinationBegin, ...
+        'combinationEnd', pCombinationDetails.combinationEnd ...
+        );
+    [segmentPositions, segmentClockError] = artoa.plugins.tracking.callTrackingMethod( ...
+        trackingMethod, ...
+        pluginTables, ...
+        NaN, ...
+        NaN, ...
+        pStartEndPosition ...
+        );
+    segmentDates = [pCombinationDetails.combinationBegin:1:pCombinationDetails.combinationEnd]';
+    segmentResiduals = struct();
+    return;
+end
+
 %% Filter toa data
 intersectedToaDates = pCorrectedData.(soundsourceNames{1}).toaDate;
 soundsourcePositions = [pCorrectedData.(soundsourceNames{1}).position];
@@ -137,16 +159,6 @@ if pBackwardTracking
     pCombinationDetails.referencePosition{1} = pCombinationDetails.referencePositionEnd{1};
 end
 
-if artoa.trajectory.isInterpolationMethod(pCombinationDetails.trackingMethod{1})
-    pStartEndPosition = [ ...
-        str2double(strsplit(pCombinationDetails.referencePosition{1}, ' ')); ...
-        str2double(strsplit(pCombinationDetails.referencePositionEnd{1}, ' ')) ...
-        ];
-    pluginTables = struct( ...
-        'combinationBegin', pCombinationDetails.combinationBegin, ...
-        'combinationEnd', pCombinationDetails.combinationEnd ...
-        );
-end
 
 %% Call the corresponding tracking method from the plugin folder
 [segmentPositions, segmentClockError] = artoa.plugins.tracking.callTrackingMethod( ...
@@ -166,24 +178,13 @@ if pBackwardTracking
 end
 
 %% Store toa dates
-if artoa.trajectory.isInterpolationMethod(pCombinationDetails.trackingMethod{1})
-    segmentDates = [pCombinationDetails.combinationBegin:1:pCombinationDetails.combinationEnd]';
-else
-    segmentDates = intersectedToaDates;
-end
+segmentDates = intersectedToaDates;
 
 %% Calculate residuals
 
 % initalize variables
 segmentResiduals = struct();
 
-if artoa.trajectory.isInterpolationMethod(pCombinationDetails.trackingMethod{1})
-    for i = 1:length(soundsourceNames)
-        segmentResiduals.(soundsourceNames{i}) = NaN(length(segmentDates), 1);
-    end
-    return;
-end
-
 for i = 1:length(soundsourceNames)
     segmentResiduals.(soundsourceNames{i}) = [];
 end