From d3a057a538552a0696b419786163704aa52598c7 Mon Sep 17 00:00:00 2001 From: treecity Date: Mon, 11 Apr 2011 12:01:06 +0000 Subject: [PATCH] [src] test_solve angefangen git-svn-id: https://drops.fb12.tu-berlin.de/svn/bacc/trunk@7 26120e32-c555-405d-b3e1-1f783fb42516 --- src/F_par.m | 6 +++--- src/G00.m | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/F_par.m b/src/F_par.m index c214e4d..cb7d43b 100644 --- a/src/F_par.m +++ b/src/F_par.m @@ -2,9 +2,9 @@ function sol = F_par(x, y, delta) xyd=x-y-delta(1:2); - sol = xyd(1)*xyd(2)*G(-0.5,x,y+delta(1:2),delta(3)... - -xyd(1)*g(0.5,x(1),y(1)+delta(1),norm([xyd(2) delta(3)]))... - -xyd(2)*g(0.5,x(2),y(2)+delta(2),norm([xyd(1) delta(3)]))... + sol = xyd(1)*xyd(2)*G00(-0.5,x,y+delta(1:2),delta(3)... + -xyd(1)*g0(0.5,x(1),y(1)+delta(1),norm([xyd(2) delta(3)]))... + -xyd(2)*g0(0.5,x(2),y(2)+delta(2),norm([xyd(1) delta(3)]))... +1/3*(xyd(1)^2+xyd(2)^2+delta(3)^2)^(1.5)); end diff --git a/src/G00.m b/src/G00.m index 777e6f5..dd0f40d 100644 --- a/src/G00.m +++ b/src/G00.m @@ -10,9 +10,9 @@ function sol = G00(p,y,x,lambda) acos(-2*prod(yx)^2/prod((yx).^2+lambda^2)+1); end elseif(p==-0.5) - sol = (2*p*lambda^2*G(p-1,y,x,lambda)... - + sum( yx(1).*g(p,y(2),x(2),norm([xy(1) lambda])))... - + sum( yx(2).*g(p,y(1),x(1),norm([xy(2) lambda]))))/(2*p+2); + sol = (2*p*lambda^2*G00(p-1,y,x,lambda)... + + sum( yx(1).*g0(p,y(2),x(2),norm([yx(1) lambda])))... + + sum( yx(2).*g0(p,y(1),x(1),norm([yx(2) lambda]))))/(2*p+2); end end -- 2.47.3