Mercurial > octave-nkf
comparison scripts/general/triplequad.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 |
comparison
equal
deleted
inserted
replaced
19866:a1acca0c2216 | 19867:9fc020886ae9 |
---|---|
63 if (ischar (f)) | 63 if (ischar (f)) |
64 f = @(x,y,z) feval (f, x, y, z, varargin{:}); | 64 f = @(x,y,z) feval (f, x, y, z, varargin{:}); |
65 varargin = {}; | 65 varargin = {}; |
66 endif | 66 endif |
67 | 67 |
68 q = dblquad (@(y, z) inner (y, z, f, xa, xb, tol, quadf, varargin{:}), ya, yb, za, zb, tol); | 68 q = dblquad (@(y, z) inner (y, z, f, xa, xb, tol, quadf, varargin{:}), ... |
69 ya, yb, za, zb, tol); | |
69 | 70 |
70 endfunction | 71 endfunction |
71 | 72 |
72 function q = __triplequad_inner__ (y, z, f, xa, xb, tol, quadf, varargin) | 73 function q = __triplequad_inner__ (y, z, f, xa, xb, tol, quadf, varargin) |
73 q = zeros (size (y)); | 74 q = zeros (size (y)); |
77 endfunction | 78 endfunction |
78 | 79 |
79 | 80 |
80 %!assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadcc), pi^(3/2) * erf (1).^3, 1e-6) | 81 %!assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadcc), pi^(3/2) * erf (1).^3, 1e-6) |
81 | 82 |
82 %% These tests are too expensive to run normally (~30 sec each). Disable them | 83 ## These tests are too expensive to run normally (~30 sec each). Disable them |
83 #%!assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadgk), pi^(3/2) * erf (1).^3, 1e-6) | 84 #%!assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadgk), pi^(3/2) * erf (1).^3, 1e-6) |
84 #%!#assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadl), pi^(3/2) * erf (1).^3, 1e-6) | 85 #%!#assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadl), pi^(3/2) * erf (1).^3, 1e-6) |
85 #%!#assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadv), pi^(3/2) * erf (1).^3, 1e-6) | 86 #%!#assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadv), pi^(3/2) * erf (1).^3, 1e-6) |
86 | 87 |