More support for reduced feature set

benfulcher · Jul 22, 2020 · cf7fe06 · cf7fe06
1 parent eb65d0d
commit cf7fe06
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/PeripheryFunctions/GiveMeDefaultClassificationParams.m b/PeripheryFunctions/GiveMeDefaultClassificationParams.m
@@ -88,6 +88,6 @@
 % Restrict to a reduced set of features?
 % '' (all), 'catch22', 'catchaMouse16', 'noLengthLocationSpread'
 % (cf. GiveMeFeatureSet)
-params.reducedFeatureSet = 'catch22';
+params.reducedFeatureSet = 'noLengthLocationSpread';
 
 end
diff --git a/PlottingAnalysis/TS_Plot2d.m b/PlottingAnalysis/TS_Plot2d.m
@@ -252,7 +252,7 @@
             legendText{i} = sprintf('Group %u (%u)',i,sum(groupLabels==classLabels{i}));
         end
     end
-    legend([handles{:}],legendText,'interpreter','none');
+    legend([handles{:}],legendText,'interpreter','none','Location','best');
 end
 
 %-------------------------------------------------------------------------------

diff --git a/PlottingAnalysis/TS_PlotLowDim.m b/PlottingAnalysis/TS_PlotLowDim.m
@@ -79,6 +79,9 @@
 % Give basic info about the represented classes:
 TellMeAboutLabeling(TimeSeries);
 
+% Filter down a reduced feature set if required:
+[TS_DataMat,Operations] = FilterFeatures(TS_DataMat,Operations,cfnParams);
+
 % ------------------------------------------------------------------------------
 %% Do the dimensionality reduction using Matlab's built-in PCA algorithm
 % ------------------------------------------------------------------------------
@@ -128,7 +131,7 @@
     else
         fprintf(1,['Computing a two-dimensional t-SNE embedding (using barnes-hut',...
                         ' approximation) of the %u x %u data matrix...\n'], ...
-                            numPCAComponents,size(TS_DataMat,1),size(TS_DataMat,2));
+                            size(TS_DataMat,1),size(TS_DataMat,2));
         Y = tsne(BF_NormalizeMatrix(TS_DataMat,'zscore'),'Algorithm','barneshut',...
                         'Distance','euclidean','NumDimensions',2);
     end