Mercurial > repos > public > sbplib
changeset 1000:bd54cb25d96b feature/getBoundaryOp
Merge with default
| author | Martin Almquist <malmquist@stanford.edu> |
|---|---|
| date | Mon, 14 Jan 2019 11:12:42 -0800 |
| parents | 337c4d1dcef5 (current diff) a72038b1f709 (diff) |
| children | 514a98f9f90d e512714fb890 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
diff -r 337c4d1dcef5 -r bd54cb25d96b assertLength.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/assertLength.m Mon Jan 14 11:12:42 2019 -0800 @@ -0,0 +1,4 @@ +function assertLength(A,l) + assert(isvector(A), sprintf('Expected ''%s'' to be a vector, got matrix of size %s',inputname(1), toString(size(A)))); + assert(length(A) == l, sprintf('Expected ''%s'' to have length %d, got %d', inputname(1), l, length(A))); +end
diff -r 337c4d1dcef5 -r bd54cb25d96b assertSize.m --- a/assertSize.m Sat Jan 12 13:44:08 2019 -0800 +++ b/assertSize.m Mon Jan 14 11:12:42 2019 -0800 @@ -2,13 +2,13 @@ function assertSize(A,varargin) if length(varargin) == 1 s = varargin{1}; - errmsg = sprintf('Expected %s to have size %s, got: %s',inputname(1), toString(s), toString(size(A))); - assert(all(size(A) == s), errmsg); + assert(length(size(A)) == length(s), sprintf('Expected ''%s'' to have dimension %d, got %d', inputname(1), length(s), length(size(A)))); + assert(all(size(A) == s), sprintf('Expected ''%s'' to have size %s, got: %s',inputname(1), toString(s), toString(size(A)))); elseif length(varargin) == 2 dim = varargin{1}; s = varargin{2}; - errmsg = sprintf('Expected %s to have size %d along dimension %d, got: %d',inputname(1), s, dim, size(A,dim)); + errmsg = sprintf('Expected ''%s'' to have size %d along dimension %d, got: %d',inputname(1), s, dim, size(A,dim)); assert(size(A,dim) == s, errmsg); else error('Expected 2 or 3 arguments to assertSize()');