Update string2indicator.m

densityUtility3/Support_functions/string2indicator.m

@@ -7,21 +7,33 @@
 % Examples:
 %[indic,nms] = string2indicator(CL{1}(1).valence);
 %[indic,nms] = string2indicator(CL{1}(1).valence,{'neg' 'pos'});
+%
+% Note: This function changed 11/1/2023 to return names in stable order
+% (the order which they appear in the original str input).
+% Also, previously, the function would accept a non-cell string matrix but
+% return potentially incorrect output; now enforces cell array
+
+
+if ~iscell(str) 
+    str = cellstr(str);
+end
 
-if length(varargin) > 0
+if ~isempty(varargin)
     nms = varargin{1};
 else
-    nms = unique(str);
+    nms = unique(str, 'stable');  % tor edited 11/1/2023, 'rows' would fix edge case with non-cell string matrix, but now enforce cell anyway 
 end
 
-if ~iscell(nms), for i = 1:length(nms), nms2{i} = nms(i);,end, nms = nms2;,end
-
-nms(strcmp(nms,'NaN')) = [];
+if ~iscell(nms) %, for i = 1:length(nms), nms2{i} = nms(i); end, nms = nms2; end  % this was returning only the first character of a string matrix
+    nms = cellstr(nms);
+end
+
+nms(strcmp(nms, 'NaN')) = [];
 
-indic = zeros(length(str),1);
+indic = zeros(length(str), 1);
 
 for k = 1:length(nms)
-    indic(:,k) = strcmp(str,nms{k});
+    indic(:,k) = strcmp(str, nms{k});
 end
 
 if size(nms,1) > size(nms,2)
@@ -33,4 +45,4 @@
 	condf = indic2condf(indic);
 end
 
-return
+end