Skip to content

Commit

Permalink
Small correction in ZP's help / doc
Browse files Browse the repository at this point in the history
  • Loading branch information
lmendo committed Jul 31, 2020
1 parent 2659198 commit 8d50217
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 2 deletions.
Binary file modified funDef.mat
Binary file not shown.
2 changes: 1 addition & 1 deletion funDef.txt
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ ZO 1 3 1 2 1 6 1 true true true true [out{:}] = datevec(in{:}); date components
P 1 2 1 2 1 1 1 true true true true out{1} = flip(in{:}); flip the order of elements \matlab+flip+. \sa \matl+XP+
XP 1 1 1 1 1 1 true true true true out{1} = flipud(in{:}); flip array in up-down direction \matlab+flipud+. \sa \matl+P+
YP 0 0 0 1 1 1 true true true true out{1} = pi; pi \matlab+pi+
ZP 1 5 2 3 1 2 1 true true true true if numel(in)==1 && nout==1 pairwise distances between two sets of points / entries below diagonal (i) \matlab+pdist2+. Only predefined distance functions are allowed. This function allows flag strings in the third input to be replaced by numbers, as follows: 1: \matlab+'cityblock'+, 2: \matlab+'hamming'+, 3: \matlab+'chebychev'+, 4: \matlab+'correlation'+, 5: \matlab+'cosine'+, 6: \matlab+'seuclidean'+, 7: \matlab+'minkowski'+, 8: \matlab+'mahalanobis'+, 9: \matlab+'spearman'+, 10: \matlab+'jaccard'+, 11: \matlab+'euclidean'+. (ii) With $1$ input and $1$ output: row vector containing all entries below the main diagonal
ZP 1 5 2 3 1 2 1 true true true true if numel(in)==1 && nout==1 pairwise distances between two sets of points / entries below diagonal (i) \matlab+pdist2+. Only predefined distance functions are allowed. This function allows flag strings in the third input to be replaced by numbers, as follows: 1: \matlab+'cityblock'+, 2: \matlab+'hamming'+, 3: \matlab+'chebychev'+, 4: \matlab+'correlation'+, 5: \matlab+'cosine'+, 6: \matlab+'seuclidean'+, 7: \matlab+'minkowski'+, 8: \matlab+'mahalanobis'+, 9: \matlab+'spearman'+, 10: \matlab+'jaccard'+, 11: \matlab+'euclidean'+. (ii) With $1$ input and $1$ output: row vector containing all entries below the main diagonal of a matrix
y = in{1}(tril(true(size(in{1})),-1)); y = y(:).';
out{1} = y; clear y
else
Expand Down
Binary file modified help.mat
Binary file not shown.
Binary file modified spec/MATL_spec.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion spec/funDefTable/funDefTable.tex
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
\matl{P} & 1--2 (1 / 2) & 1 & \matlab+flip+. \sa \matl{XP} \\
\matl{XP} & 1 & 1 & \matlab+flipud+. \sa \matl{P} \\
\matl{YP} & 0 & 1 & \matlab+pi+ \\
\matl{ZP} & 1--5 (2 / 3) & 1--2 (1) & (i) \matlab+pdist2+. Only predefined distance functions are allowed. This function allows flag strings in the third input to be replaced by numbers, as follows: 1: \matlab+'cityblock'+, 2: \matlab+'hamming'+, 3: \matlab+'chebychev'+, 4: \matlab+'correlation'+, 5: \matlab+'cosine'+, 6: \matlab+'seuclidean'+, 7: \matlab+'minkowski'+, 8: \matlab+'mahalanobis'+, 9: \matlab+'spearman'+, 10: \matlab+'jaccard'+, 11: \matlab+'euclidean'+. (ii) With $1$ input and $1$ output: row vector containing all entries below the main diagonal \\
\matl{ZP} & 1--5 (2 / 3) & 1--2 (1) & (i) \matlab+pdist2+. Only predefined distance functions are allowed. This function allows flag strings in the third input to be replaced by numbers, as follows: 1: \matlab+'cityblock'+, 2: \matlab+'hamming'+, 3: \matlab+'chebychev'+, 4: \matlab+'correlation'+, 5: \matlab+'cosine'+, 6: \matlab+'seuclidean'+, 7: \matlab+'minkowski'+, 8: \matlab+'mahalanobis'+, 9: \matlab+'spearman'+, 10: \matlab+'jaccard'+, 11: \matlab+'euclidean'+. (ii) With $1$ input and $1$ output: row vector containing all entries below the main diagonal of a matrix \\
\matl{Q} & 1 & 1 & \matlab|(...)+1| \\
\matl{XQ} & 2--6 (3) & 1 & \matlab+accumarray+. If first input is \matlab+char+ it is converted to \matlab+double+. The third input may be omitted, and then it is interpreted as \matlab+[]+. Fourth/third argument specifies an anonymous function, as follows: 1: \matlab+'@sum'+, 2: \matlab+'@mean'+, 3: \matlab+'@(x){sort(x).'}'+, 4: \matlab+'@max'+, 5: \matlab+'@min'+, 6: \matlab+'@prod'+, 7: \matlab+'@(x){x.'}'+, 8: \matlab+'@(x){x}'+, 9: \matlab+'@(x){sort(x)}'+, 10: \matlab+'@(x)x(1)'+, 11: \matlab+'@(x)x(end)'+, 12: \matlab+'@(x){cumsum(x).'}'+, 13: \matlab+'@(x){cumprod(x)}'+, 14: \matlab+'@nansum'+, 15: \matlab+'@nanmean'+, 16: \matlab+'@nanmax'+, 17: \matlab+'@nanmin'+, 18: \matlab+'@(x){cummax(x).'}'+, 19: \matlab+'@(x){cummin(x)}'+, 20: \matlab+'@(x){cummax(x).'}'+, 21: \matlab+'@(x){cummin(x)}'+ \\
\matl{YQ} & 1--2 (1) & 1--2 (2) & \matlab+rat+ \\
Expand Down

0 comments on commit 8d50217

Please sign in to comment.