Mercurial > octave
changeset 30662:44beb0345b93
maint: Merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 23 Jan 2022 12:09:07 +0100 |
| parents | dfd2f1db0291 (current diff) 27566803b3b1 (diff) |
| children | 9b8c74d85fa7 |
| files | |
| diffstat | 2 files changed, 33 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/contributors.in Wed Jan 19 15:10:29 2022 -0300 +++ b/doc/interpreter/contributors.in Sun Jan 23 12:09:07 2022 +0100 @@ -183,6 +183,7 @@ Lute Kamstra Fotios Kasolis Thomas Kasper +Christof Kaufmann Joel Keay Mumit Khan Paul Kienzle
--- a/scripts/general/interp2.m Wed Jan 19 15:10:29 2022 -0300 +++ b/scripts/general/interp2.m Sun Jan 23 12:09:07 2022 +0100 @@ -254,9 +254,21 @@ ## first order derivatives DX = __pchip_deriv__ (X, Z, 2); DY = __pchip_deriv__ (Y, Z, 1); - ## Compute mixed derivatives row-wise and column-wise, use the average. + ## Compute mixed derivatives row-wise and column-wise. Use the average. DXY = (__pchip_deriv__ (X, DY, 2) + __pchip_deriv__ (Y, DX, 1))/2; + if (iscomplex (Z)) + ## __pchip_deriv__ works only on real part. Do it again for imag part. + ## FIXME: Adapt __pchip_deriv__ to correctly handle complex input. + + ## first order derivatives + DX += 1i * __pchip_deriv__ (X, imag (Z), 2); + DY += 1i * __pchip_deriv__ (Y, imag (Z), 1); + ## Compute mixed derivatives row-wise and column-wise. Use the average. + DXY += 1i * (__pchip_deriv__ (X, imag (DY), 2) + + __pchip_deriv__ (Y, imag (DX), 1))/2; + endif + ## do the bicubic interpolation hx = diff (X); hx = hx(xidx); hy = diff (Y); hy = hy(yidx); @@ -327,7 +339,11 @@ ## extrapolation 'extrap' if (isempty (extrap)) - extrap = NA; + if (iscomplex (Z)) + extrap = complex (NA, NA); + else + extrap = NA; + endif endif if (X(1) < X(end)) @@ -480,6 +496,20 @@ %! %! assert (result, expected, 1000*eps); +## Test that interpolating a complex matrix is equivalent to interpolating its +## real and imaginary parts separately. +%!test <61863> +%! xi = [2.5, 3.5]; +%! yi = [0.5, 1.5]'; +%! orig = rand (2, 3) + 1i * rand (2, 3); +%! for method = {"nearest", "linear", "pchip", "spline"} +%! interp_complex = interp2 (orig, xi, yi, method{1}); +%! interp_real = interp2 (real (orig), xi, yi, method{1}); +%! interp_imag = interp2 (imag (orig), xi, yi, method{1}); +%! assert (real (interp_complex), interp_real) +%! assert (imag (interp_complex), interp_imag) +%! endfor + %!test # 2^n refinement form %! x = [1,2,3]; %! y = [4,5,6,7];