Mercurial > repos > public > sbplib
comparison +parametrization/Ti.m @ 632:d98d9c79573f bugfix/TiVectorInputs
Switch to elementwise multiplication where it was not used
author | Jonatan Werpers <jonatan@werpers.com> |
---|---|
date | Mon, 23 Oct 2017 15:46:25 +0200 |
parents | 433ccb5d2f0f |
children | 6f4eb3da8978 |
comparison
equal
deleted
inserted
replaced
631:77ad5de4432e | 632:d98d9c79573f |
---|---|
24 x1 = g1(u); | 24 x1 = g1(u); |
25 x2 = g2(v); | 25 x2 = g2(v); |
26 x3 = g3(1-u); | 26 x3 = g3(1-u); |
27 x4 = g4(1-v); | 27 x4 = g4(1-v); |
28 o1 = (1-v).*x1(1,:) + u.*x2(1,:) + v.*x3(1,:) + (1-u).*x4(1,:) ... | 28 o1 = (1-v).*x1(1,:) + u.*x2(1,:) + v.*x3(1,:) + (1-u).*x4(1,:) ... |
29 -((1-u)*(1-v).*A(1,:) + u*(1-v).*B(1,:) + u*v.*C(1,:) + (1-u)*v.*D(1,:)); | 29 -((1-u).*(1-v).*A(1,:) + u.*(1-v).*B(1,:) + u.*v.*C(1,:) + (1-u).*v.*D(1,:)); |
30 o2 = (1-v).*x1(2,:) + u.*x2(2,:) + v.*x3(2,:) + (1-u).*x4(2,:) ... | 30 o2 = (1-v).*x1(2,:) + u.*x2(2,:) + v.*x3(2,:) + (1-u).*x4(2,:) ... |
31 -((1-u)*(1-v).*A(2,:) + u*(1-v).*B(2,:) + u*v.*C(2,:) + (1-u)*v.*D(2,:)); | 31 -((1-u).*(1-v).*A(2,:) + u.*(1-v).*B(2,:) + u.*v.*C(2,:) + (1-u).*v.*D(2,:)); |
32 | 32 |
33 o = [o1;o2]; | 33 o = [o1;o2]; |
34 end | 34 end |
35 | 35 |
36 obj.S = @S_fun; | 36 obj.S = @S_fun; |