Allow for full array arguments; update help

Author: andymilne

spCosSim.m

@@ -1,8 +1,8 @@
 function s = spCosSim(spA,spB)
 %SPCOSSIM Cosine similarity of two sparse array structures
 %   s = spCosSim(spA,spB):  Cosine similarity of two vectorized full arrays,
-%   represented by sparse array structures, with the same numbers of entries.
-%   The output is a scalar.
+%   each represented as a sparse array structure or as a full array. They must
+%   have the same numbers of entries (including zeros). The output is a scalar.
 %
 %   Version 1.0 by Andrew J. Milne, The MARCS Institute, Western Sydney
 %   University, 2018-01-09
@@ -11,12 +11,16 @@
 
 persistent innerAA innerBB spALast spBLast
 
-if ~isstruct(spA) || ~isstruct(spB)
-    error('Arguments must be (a cell array of) sparse array structures.')
+if nargin ~= 2
+    error('There must be exactly two arguments (arrays or sparse array structures).')
 end
 
-if nargin ~= 2
-    error('There must be exactly two sparse array structures.')
+% Convert full array arguments to sparse array structures
+if ~isstruct(spA)
+    spA = array2spArray(spA);
+end
+if ~isstruct(spB)
+    spB = array2spArray(spB);
 end
 
 spANew = ~isequal(spA,spALast);

spInner.m

@@ -15,13 +15,11 @@
     spA = varargin;
 elseif iscell(varargin{1})
     spA = varargin{:};
-else
-    error('Arguments must be (a cell array of) sparse array structures.')
 end
 nSpA = size(spA,2); % count the number of arrays
 
 if nSpA ~= 2
-    error('There must be exactly two sparse array structures.')
+    error('There must be two arguments (sparse array structures or full arrays).')
 end
 
 % Convert full array arguments to sparse array structures

spPDist.m

@@ -1,22 +1,33 @@
 function d = spPDist(spA,spB,p)
 %PDIST p-norm distance between two sparse array structures.
 %   d = spPDist(spA,spB,p): The p-norm distance between two vectorized full
-%   arrays, represented as sparse array structures, with same numbers of
-%   entries. When there are only two arguments, p = 2 is the default, which
-%   gives the Euclidean distance between the two vectors; when p = 1, this
-%   function gives the taxicab distance; when p = inf, it gives the maximum
-%   difference.
+%   arrays, each represented as a sparse array structure or as a full array.
+%   They must have the same numbers of entries (including zeros). When there
+%   are only two arguments, p = 2 is the default, which gives the Euclidean
+%   distance between the two vectors; when p = 1, this function gives the
+%   taxicab distance; when p = inf, it gives the maximum difference.
 %
 %   Version 1.0 by Andrew J. Milne, The MARCS Institute, Western Sydney
 %   University, 2018-01-09
 % 
 %   See also SPCOSSIM.
 
-if ~isstruct(spA) || ~isstruct(spB)
-    error('Arguments must be (a cell array of) sparse array structures.')
+if nargin < 3
+    p = 2;
+end
+if nargin < 2
+    error('There must be exactly two arguments (arrays or sparse array structures).')
+end
+
+% Convert full array arguments to sparse array structures
+if ~isstruct(spA)
+    spA = array2spArray(spA);
+end
+if ~isstruct(spB)
+    spB = array2spArray(spB);
 end
 
-spDiff = spSum(spA,spScale(-1,spB)); 
+spDiff = spPlus(spA,spTimes(-1,spB)); 
 diff = spDiff.Val;
 
 % Calculate their p-norm distance