From: treecity <treecity@26120e32-c555-405d-b3e1-1f783fb42516>
Date: Thu, 14 Apr 2011 10:07:51 +0000 (+0000)
Subject: [src] weitere Versuche die A Matrix aufzubauen...
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=f6f05e0114680616782561d82ef2d99b65b43ec8;p=bacc.git

[src] weitere Versuche die A Matrix aufzubauen...

git-svn-id: https://drops.fb12.tu-berlin.de/svn/bacc/trunk@9 26120e32-c555-405d-b3e1-1f783fb42516
---

diff --git a/src/F_par.m b/src/F_par.m
index a1794aa..95b7842 100644
--- a/src/F_par.m
+++ b/src/F_par.m
@@ -3,8 +3,8 @@ function sol = F_par(x1,x2,y1,y2,d1,d2,d3)
 %     xyd=x-y-delta(1:2);
     
     sol = (x1-y1-d1)*(x2-y2-d2)*G00(-0.5,x1,x2,y1+d1,y2+d2,d3)...
-        -(x1-y1-d1)*g0(0.5,x1,x1+d1,sqrt((x2-y2-d2)^2+d3^2))...
-        -(x2-y2-d2)*g0(0.5,x2,x2+d2,sqrt((x1-y1-d1)^2+d3^2))...
+        -(x1-y1-d1)*g0(0.5,x1,y1+d1,sqrt((x2-y2-d2)^2+d3^2))...
+        -(x2-y2-d2)*g0(0.5,x2,y2+d2,sqrt((x1-y1-d1)^2+d3^2))...
         +1/3*((x1-y1-d1)^2+(x2-y2-d2)^2+d3^2)^(1.5);
 
 %     sol = xyd(1)*xyd(2)*G00(-0.5,x,y+delta(1:2),delta(3))...
diff --git a/src/test_solve.m b/src/test_solve.m
index 4aa6aed..5f2e0e3 100644
--- a/src/test_solve.m
+++ b/src/test_solve.m
@@ -4,29 +4,29 @@ N = size(elements);
 A = zeros(N);
 
 
-
-% intF = @(f,k1,k2,l1,l2) ...
-%     f(k1,k2,l1,l2)-f(k1,k2,l1,0)-f(k1,k2,0,l2)+f(k1,k2,0,0)...
-%     -f(k1,0,l1,l2)+f(k1,0,l1,0)+f(k1,0,0,l2)-f(k1,0,0,0)...
-%     -f(0,k2,l1,l2)+f(0,k2,l1,0)+f(0,k2,0,l2)-f(0,l2,0,0)...
-%     +f(0,0,l1,l2)-f(0,0,l1,0)-f(0,0,0,l2)+f(0,0,0,0);
-% 
-% intF(@(x1,x2,y1,y2) F_par(x1,x2,y1,y2,d(1),d(2),d(3)),x(1),x(2),y(1),y(2));
+% untere schranke s t obere schranke k l
+intF = @(f,s1,s2,k1,k2,t1,t2,l1,l2) ...
+    f(k1,k2,l1,l2)-f(k1,k2,l1,t2)-f(k1,k2,t1,l2)+f(k1,k2,t1,t2)...
+    -f(k1,s2,l1,l2)+f(k1,s2,l1,t2)+f(k1,s2,t1,l2)-f(k1,s2,t1,t2)...
+    -f(s1,k2,l1,l2)+f(s1,k2,l1,t2)+f(s1,k2,t1,l2)-f(s1,l2,t1,t2)...
+    +f(s1,s2,l1,l2)-f(s1,0,l1,t2)-f(s1,s2,t1,l2)+f(s1,s2,t1,t2);
+
+% intF(@(s1,s2,k1,k2,t1,t2,l1,l2) F_par(s1,s2,k1,k2,t1,t2,l1,l2,d(1),d(2),d(3))...
+%     ,s1,s2,k1,k2,t1,t2,l1,l2);
 for j = 1:N
     
     
-    for k = j+1:N
+    for k = 1:N
         
         
         ej = coordinates(elements(j,:)',:);
         ek = coordinates(elements(k,:)',:);
         d = ek(1,:) - ej(1,:)
-        
-        x = [sum(ej(2,:)-ej(1,:)) sum(ej(3,:)-ej(1,:))]
-        y = [sum(ek(2,:)-ek(1,:)) sum(ek(3,:)-ek(1,:))]
-        
-        A(j,k) = 1/ (4*pi) *... intF(@(x1,x2,y1,y2) F_par(x1,x2,y1,y2,d(1),d(2),d(3)),x(1),x(2),y(1),y(2));
-        F_par(x(1),x(2),y(1),y(2),d(1),d(2),d(3));
+             
+        A(j,k) = 1/ (4*pi) *...
+          intF(@(x1,x2,y1,y2) F_par(x1,x2,y1,y2,d(1),d(2),d(3))...
+            ,ej(1,1),ej(1,2),ej(2,1), ej(3,2),ek(1,1), ek(1,2),ek(2,1), ek(3,2));
+
     end
 end