xgiovio/unisa_analisi_numerica_2014_2015
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aggiunto minlen all'integratore adattivo locale

Browse Source
This commit is contained in:
Giovanni Di Grezia
2014-12-07 20:00:25 +01:00
parent d65fd0e0a9
commit 8968dbd158
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
functions/integratore_adattivo_locale.m
View File

@@ -12,28 +12,33 @@ function [ area, err, ier ] = integratore_adattivo_locale( f, m, toll , maxite )
% area = area finale % area = area finale
% err = errore assoluto % err = errore assoluto
% ier = indice di errore % ier = indice di errore
minlen_factor=1e-6;
[x,~] = size(m); [x,~] = size(m);
i=1; i=1;
k=i+1; k=i+1;
j=x; j=x;
minlen=(m(j,1) - m(i,1)) * minlen_factor ;
ite = 0; ite = 0;
area=0; area=0;
err = 0; err = 0;
ier = 0; ier = 0;
while (i <= j - 1) && (ite < maxite) while (i <= j - 1) && (ite < maxite) &&( (m(j,1) - m(i,1)) > minlen )
ltoll = (toll * (m(k,1) - m(i,1))) / (m(j,1) - m(i,1)); ltoll = (toll * (m(k,1) - m(i,1))) / (m(j,1) - m(i,1));
[~,larea,lerr,m1] = static_quadratic(f,m(i:k,:)); [~,larea,lerr,m1] = static_quadratic(f,m(i:k,:));
m=[m(1:i-1,:);m1;m(k+1:j,:)]; m=[m(1:i-1,:);m1;m(k+1:j,:)];
ite = ite + 1; ite = ite + 1;
j= j + 1; j= j + 1;
while (lerr > ltoll) && (ite < maxite) while (lerr > ltoll) && (ite < maxite) &&( (m(j,1) - m(i,1)) > minlen )
ltoll = (toll * (m(k,1) - m(i,1))) / (m(j,1) - m(i,1)); ltoll = (toll * (m(k,1) - m(i,1))) / (m(j,1) - m(i,1));
[~,larea,lerr,m1] = static_quadratic(f,m(i:k,:)); [~,larea,lerr,m1] = static_quadratic(f,m(i:k,:));
m=[m(1:i-1,:);m1;m(k+1:j,:)]; m=[m(1:i-1,:);m1;m(k+1:j,:)];
ite = ite + 1; ite = ite + 1;
j= j + 1; j= j + 1;
end end
if (m(j,1) - m(i,1)) <= minlen
disp('Warning: Minlen raggiunto')
end
area = area + larea; area = area + larea;
err = err + lerr; err = err + lerr;