Mercurial > repos > public > sbplib
diff +sbp/D2BlockNorm.m @ 261:6009f2712d13 operator_remake
Moved and renamned all implementations.
author | Martin Almquist <martin.almquist@it.uu.se> |
---|---|
date | Thu, 08 Sep 2016 15:35:45 +0200 |
parents | 07fa0d6a05bb |
children | 23051a86faa4 |
line wrap: on
line diff
--- a/+sbp/D2BlockNorm.m Thu Sep 08 14:36:06 2016 +0200 +++ b/+sbp/D2BlockNorm.m Thu Sep 08 15:35:45 2016 +0200 @@ -14,13 +14,17 @@ function obj = D2BlockNorm(m,h,order) if order == 4 - [H, HI, D1, D2, e_1, e_m, M,Q S_1, S_m] = sbp.blocknorm4(m,h); + [H, HI, D1, D2, e_1, e_m, M, Q, S_1, S_m] = ... + sbp.implementations.d2_blocknorm_4(m,h); elseif order == 6 - [H, HI, D1, D2, e_1, e_m, M,Q S_1, S_m] = sbp.blocknorm6(m,h); + [H, HI, D1, D2, e_1, e_m, M, Q, S_1, S_m] = ... + sbp.implementations.d2_blocknorm_6(m,h); elseif order == 8 - [H, HI, D1, D2, e_1, e_m, M,Q S_1, S_m] = sbp.blocknorm8(m,h); + [H, HI, D1, D2, e_1, e_m, M, Q, S_1, S_m] = ... + sbp.implementations.d2_blocknorm_8(m,h); elseif order == 10 - [H, HI, D1, D2, e_1, e_m, M,Q S_1, S_m] = sbp.blocknorm10(m,h); + [H, HI, D1, D2, e_1, e_m, M, Q, S_1, S_m] = ... + sbp.implementations.d2_blocknorm_10(m,h); else error('Invalid operator order %d.',order); end