diff assertSize.m @ 1197:433c89bf19e0 feature/rv

Merge with default
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Wed, 07 Aug 2019 15:23:42 +0200
parents a72038b1f709
children
line wrap: on
line diff
--- a/assertSize.m	Wed Aug 07 13:28:21 2019 +0200
+++ b/assertSize.m	Wed Aug 07 15:23:42 2019 +0200
@@ -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()');