Mercurial > octave-nkf
diff scripts/general/divergence.m @ 19867:9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Try to trim long lines to < 80 chars.
Use '##' for single line comments.
Use '(...)' around tests for if/elseif/switch/while.
Abut cell indexing operator '{' next to variable.
Abut array indexing operator '(' next to variable.
Use space between negation operator '!' and following expression.
Use two newlines between endfunction and start of %!test or %!demo code.
Remove unnecessary parens grouping between short-circuit operators.
Remove stray extra spaces (typos) between variables and assignment operators.
Remove stray extra spaces from ends of lines.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 23 Feb 2015 14:54:39 -0800 |
| parents | 4197fc428c7d |
| children | 7503499a252b |
line wrap: on
line diff
--- a/scripts/general/divergence.m Mon Feb 23 16:42:25 2015 +0000 +++ b/scripts/general/divergence.m Mon Feb 23 14:54:39 2015 -0800 @@ -72,20 +72,21 @@ print_usage (); endif - if ((nargin == 4) || (nargin == 2)) - if (!size_equal (varargin{fidx},varargin{fidx + 1})) + if (nargin == 4 || nargin == 2) + if (! size_equal (varargin{fidx},varargin{fidx + 1})) error ("divergence: size of X and Y must match"); elseif (ndims (varargin{fidx}) != 2) error ("divergence: expected two-dimensional matrices X and Y"); - elseif ((length (dx) != columns (varargin{fidx})) || (length (dy) != rows (varargin{fidx}))) + elseif (length (dx) != columns (varargin{fidx}) + || length (dy) != rows (varargin{fidx})) error ("divergence: size of dx and dy must match the respective dimension of X and Y"); endif retval = gradient (varargin{fidx}, dx, dy); retval += gradient (varargin{fidx + 1}.', dy, dx).'; - elseif ((nargin == 6) || (nargin == 3)) - if (!size_equal (varargin{fidx},varargin{fidx + 1},varargin{fidx + 2})) + elseif (nargin == 6 || nargin == 3) + if (! size_equal (varargin{fidx},varargin{fidx + 1},varargin{fidx + 2})) error ("divergence: size of X, Y, and Z must match"); elseif (ndims (varargin{fidx}) != 3) error ("divergence: expected two-dimensional matrices X, Y, and Z");