summaryrefslogtreecommitdiffstats
path: root/scilab/modules/interpolation
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
commit10963c0a56109ddafb6f2f4a8dbdc925b00ac69c (patch)
tree9f8eefbac0a88917328855a3cf4c046f4e7ca719 /scilab/modules/interpolation
parentbc7b15143690a57f6ee6d6ec9401227e77b18db4 (diff)
parentc8b337d77b6d3f040afc6a76b9c607a838ae62dd (diff)
downloadscilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.zip
scilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
Diffstat (limited to 'scilab/modules/interpolation')
-rw-r--r--scilab/modules/interpolation/Makefile.in1
-rw-r--r--scilab/modules/interpolation/help/pt_BR/cshep2d.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/eval_cshep2d.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/interp.xml4
-rw-r--r--scilab/modules/interpolation/help/pt_BR/interp2d.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/linear_interpn.xml8
-rw-r--r--scilab/modules/interpolation/help/pt_BR/lsq_splin.xml2
-rw-r--r--scilab/modules/interpolation/help/pt_BR/splin.xml4
-rw-r--r--scilab/modules/interpolation/help/pt_BR/splin2d.xml6
-rw-r--r--scilab/modules/interpolation/help/pt_BR/splin3d.xml2
10 files changed, 17 insertions, 16 deletions
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 522b29b..f68c012 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -260,6 +260,7 @@ LD = @LD@
260LDFLAGS = @LDFLAGS@ 260LDFLAGS = @LDFLAGS@
261LIBICONV = @LIBICONV@ 261LIBICONV = @LIBICONV@
262LIBINTL = @LIBINTL@ 262LIBINTL = @LIBINTL@
263LIBM = @LIBM@
263LIBOBJS = @LIBOBJS@ 264LIBOBJS = @LIBOBJS@
264LIBS = @LIBS@ 265LIBS = @LIBS@
265LIBTOOL = @LIBTOOL@ 266LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/interpolation/help/pt_BR/cshep2d.xml b/scilab/modules/interpolation/help/pt_BR/cshep2d.xml
index c0b5145..12c3c2f 100644
--- a/scilab/modules/interpolation/help/pt_BR/cshep2d.xml
+++ b/scilab/modules/interpolation/help/pt_BR/cshep2d.xml
@@ -90,7 +90,7 @@ m = 30;
90xx = linspace(0,2*%pi,m); 90xx = linspace(0,2*%pi,m);
91[X,Y] = ndgrid(xx,xx); 91[X,Y] = ndgrid(xx,xx);
92Z = eval_cshep2d(X,Y, tl_coef); 92Z = eval_cshep2d(X,Y, tl_coef);
93xbasc() 93clf()
94plot3d(xx,xx,Z,flag=[2 6 4]) 94plot3d(xx,xx,Z,flag=[2 6 4])
95param3d1(xy(:,1),xy(:,2),list(z,-9), flag=[0 0]) 95param3d1(xy(:,1),xy(:,2),list(z,-9), flag=[0 0])
96xtitle("Interpolação cúbica de Shepard de cos(x)cos(y) com pontos de interpolação escolhidos aleatoriamente") 96xtitle("Interpolação cúbica de Shepard de cos(x)cos(y) com pontos de interpolação escolhidos aleatoriamente")
diff --git a/scilab/modules/interpolation/help/pt_BR/eval_cshep2d.xml b/scilab/modules/interpolation/help/pt_BR/eval_cshep2d.xml
index f29b4d4..bd25c81 100644
--- a/scilab/modules/interpolation/help/pt_BR/eval_cshep2d.xml
+++ b/scilab/modules/interpolation/help/pt_BR/eval_cshep2d.xml
@@ -129,7 +129,7 @@ color = 2*ones(1,size(zf,2));
129// índices correspondentes à faceta na região de interpolação 129// índices correspondentes à faceta na região de interpolação
130ind=find( mean(xf,"r")>0 & mean(xf,"r")<1 & mean(yf,"r")>0 & mean(yf,"r")<1 ); 130ind=find( mean(xf,"r")>0 & mean(xf,"r")<1 & mean(yf,"r")>0 & mean(yf,"r")<1 );
131color(ind)=3; 131color(ind)=3;
132xbasc(); 132clf();
133plot3d(xf,yf,list(zf,color), flag=[2 6 4]) 133plot3d(xf,yf,list(zf,color), flag=[2 6 4])
134legends(["região de extrapolação","região de interpolação"],[2 3],1) 134legends(["região de extrapolação","região de interpolação"],[2 3],1)
135xselect() 135xselect()
diff --git a/scilab/modules/interpolation/help/pt_BR/interp.xml b/scilab/modules/interpolation/help/pt_BR/interp.xml
index ca436ba..419fea9 100644
--- a/scilab/modules/interpolation/help/pt_BR/interp.xml
+++ b/scilab/modules/interpolation/help/pt_BR/interp.xml
@@ -177,7 +177,7 @@ df = splin(x,y, "fast");
177xx = linspace(a,b,800)'; 177xx = linspace(a,b,800)';
178[yyk, yy1k, yy2k] = interp(xx, x, y, dk); 178[yyk, yy1k, yy2k] = interp(xx, x, y, dk);
179[yyf, yy1f, yy2f] = interp(xx, x, y, df); 179[yyf, yy1f, yy2f] = interp(xx, x, y, df);
180xbasc() 180clf()
181subplot(3,1,1) 181subplot(3,1,1)
182plot2d(xx, [yyk yyf]) 182plot2d(xx, [yyk yyf])
183plot2d(x, y, style=-9) 183plot2d(x, y, style=-9)
@@ -202,7 +202,7 @@ yy0 = interp(xx,x,y,d,"C0");
202yy1 = interp(xx,x,y,d,"linear"); 202yy1 = interp(xx,x,y,d,"linear");
203yy2 = interp(xx,x,y,d,"natural"); 203yy2 = interp(xx,x,y,d,"natural");
204yy3 = interp(xx,x,y,d,"periodic"); 204yy3 = interp(xx,x,y,d,"periodic");
205xbasc() 205clf()
206plot2d(xx,[yy0 yy1 yy2 yy3],style=2:5,frameflag=2,leg="C0@linear@natural@periodic") 206plot2d(xx,[yy0 yy1 yy2 yy3],style=2:5,frameflag=2,leg="C0@linear@natural@periodic")
207xtitle(" Modos diferentes de avaliar um spline fora de seu domínio") 207xtitle(" Modos diferentes de avaliar um spline fora de seu domínio")
208 ]]></programlisting> 208 ]]></programlisting>
diff --git a/scilab/modules/interpolation/help/pt_BR/interp2d.xml b/scilab/modules/interpolation/help/pt_BR/interp2d.xml
index 1f09d3d..245beb2 100644
--- a/scilab/modules/interpolation/help/pt_BR/interp2d.xml
+++ b/scilab/modules/interpolation/help/pt_BR/interp2d.xml
@@ -178,7 +178,7 @@ zz1 = interp2d(XX,YY, x, y, C, "C0");
178zz2 = interp2d(XX,YY, x, y, C, "by_zero"); 178zz2 = interp2d(XX,YY, x, y, C, "by_zero");
179zz3 = interp2d(XX,YY, x, y, C, "periodic"); 179zz3 = interp2d(XX,YY, x, y, C, "periodic");
180zz4 = interp2d(XX,YY, x, y, C, "natural"); 180zz4 = interp2d(XX,YY, x, y, C, "natural");
181xbasc() 181clf()
182subplot(2,2,1) 182subplot(2,2,1)
183plot3d(xx, yy, zz1, flag=[2 6 4]) 183plot3d(xx, yy, zz1, flag=[2 6 4])
184xtitle("Extrapolação com o outmode C0") 184xtitle("Extrapolação com o outmode C0")
diff --git a/scilab/modules/interpolation/help/pt_BR/linear_interpn.xml b/scilab/modules/interpolation/help/pt_BR/linear_interpn.xml
index 6c6479e..184406d 100644
--- a/scilab/modules/interpolation/help/pt_BR/linear_interpn.xml
+++ b/scilab/modules/interpolation/help/pt_BR/linear_interpn.xml
@@ -164,7 +164,7 @@ x = linspace(0,2*%pi,11);
164y = sin(x); 164y = sin(x);
165xx = linspace(-2*%pi,4*%pi,400)'; 165xx = linspace(-2*%pi,4*%pi,400)';
166yy = linear_interpn(xx, x, y, "periodic"); 166yy = linear_interpn(xx, x, y, "periodic");
167xbasc() 167clf()
168plot2d(xx,yy,style=2) 168plot2d(xx,yy,style=2)
169plot2d(x,y,style=-9, strf="000") 169plot2d(x,y,style=-9, strf="000")
170xtitle("Interpolação linear de sin(x) com 11 pontos de interpolação") 170xtitle("Interpolação linear de sin(x) com 11 pontos de interpolação")
@@ -176,7 +176,7 @@ z = 2*sin(x')*sin(y);
176xx = linspace(0,2*%pi, 40); 176xx = linspace(0,2*%pi, 40);
177[xp,yp] = ndgrid(xx,xx); 177[xp,yp] = ndgrid(xx,xx);
178zp = linear_interpn(xp,yp, x, y, z); 178zp = linear_interpn(xp,yp, x, y, z);
179xbasc() 179clf()
180plot3d(xx, xx, zp, flag=[2 6 4]) 180plot3d(xx, xx, zp, flag=[2 6 4])
181[xg,yg] = ndgrid(x,x); 181[xg,yg] = ndgrid(x,x);
182param3d1(xg,yg, list(z,-9*ones(1,n)), flag=[0 0]) 182param3d1(xg,yg, list(z,-9*ones(1,n)), flag=[0 0])
@@ -200,7 +200,7 @@ zp2 = linear_interpn(XP, YP, x, y, z, "periodic");
200zp3 = linear_interpn(XP, YP, x, y, z, "C0"); 200zp3 = linear_interpn(XP, YP, x, y, z, "C0");
201zp4 = linear_interpn(XP, YP, x, y, z, "by_zero"); 201zp4 = linear_interpn(XP, YP, x, y, z, "by_zero");
202zp5 = linear_interpn(XP, YP, x, y, z, "by_nan"); 202zp5 = linear_interpn(XP, YP, x, y, z, "by_nan");
203xbasc() 203clf()
204subplot(2,3,1) 204subplot(2,3,1)
205 plot3d(x, y, z, leg="x@y@z", flag = [2 4 4]) 205 plot3d(x, y, z, leg="x@y@z", flag = [2 4 4])
206 xtitle("função inicial 0.4 cos(2 pi x) cos(pi y)") 206 xtitle("função inicial 0.4 cos(2 pi x) cos(pi y)")
@@ -251,7 +251,7 @@ nb_col = 128;
251vmin = min(VF); vmax = max(VF); 251vmin = min(VF); vmax = max(VF);
252color = dsearch(VF,linspace(vmin,vmax,nb_col+1)); 252color = dsearch(VF,linspace(vmin,vmax,nb_col+1));
253xset("colormap",jetcolormap(nb_col)); 253xset("colormap",jetcolormap(nb_col));
254xbasc() 254clf()
255xset("hidden3d",xget("background")) 255xset("hidden3d",xget("background"))
256colorbar(vmin,vmax) 256colorbar(vmin,vmax)
257plot3d(XF, YF, list(ZF,color), flag=[-1 6 4]) 257plot3d(XF, YF, list(ZF,color), flag=[-1 6 4])
diff --git a/scilab/modules/interpolation/help/pt_BR/lsq_splin.xml b/scilab/modules/interpolation/help/pt_BR/lsq_splin.xml
index 01c2409..dbc34e6 100644
--- a/scilab/modules/interpolation/help/pt_BR/lsq_splin.xml
+++ b/scilab/modules/interpolation/help/pt_BR/lsq_splin.xml
@@ -146,7 +146,7 @@ x = linspace(a,b,n)';
146// plotando 146// plotando
147ye = sin(xd); 147ye = sin(xd);
148ys = interp(xd, x, y, d); 148ys = interp(xd, x, y, d);
149xbasc() 149clf()
150plot2d(xd,[ye yd ys],style=[2 -2 3], ... 150plot2d(xd,[ye yd ys],style=[2 -2 3], ...
151 leg="função exata@medidas experimentais (perturbação gaussiana)@spline ajustado") 151 leg="função exata@medidas experimentais (perturbação gaussiana)@spline ajustado")
152xtitle("Um spline de mínimos quadrados") 152xtitle("Um spline de mínimos quadrados")
diff --git a/scilab/modules/interpolation/help/pt_BR/splin.xml b/scilab/modules/interpolation/help/pt_BR/splin.xml
index 505d2d9..bfbb73e 100644
--- a/scilab/modules/interpolation/help/pt_BR/splin.xml
+++ b/scilab/modules/interpolation/help/pt_BR/splin.xml
@@ -228,7 +228,7 @@ d = splin(x, y);
228xx = linspace(a, b, m)'; 228xx = linspace(a, b, m)';
229yyi = interp(xx, x, y, d); 229yyi = interp(xx, x, y, d);
230yye = runge(xx); 230yye = runge(xx);
231xbasc() 231clf()
232plot2d(xx, [yyi yye], style=[2 5], leg="interpolação por@função exata") 232plot2d(xx, [yyi yye], style=[2 5], leg="interpolação por@função exata")
233plot2d(x, y, -9) 233plot2d(x, y, -9)
234xtitle("Intepolação da função de Runge") 234xtitle("Intepolação da função de Runge")
@@ -243,7 +243,7 @@ xx = linspace(a,b,m)';
243yk = interp(xx, x, y, splin(x,y,"not_a_knot")); 243yk = interp(xx, x, y, splin(x,y,"not_a_knot"));
244yf = interp(xx, x, y, splin(x,y,"fast")); 244yf = interp(xx, x, y, splin(x,y,"fast"));
245ym = interp(xx, x, y, splin(x,y,"monotone")); 245ym = interp(xx, x, y, splin(x,y,"monotone"));
246xbasc() 246clf()
247plot2d(xx, [yf ym yk], style=[5 2 3], strf="121", ... 247plot2d(xx, [yf ym yk], style=[5 2 3], strf="121", ...
248 leg="fast@monotone@spline not a knot") 248 leg="fast@monotone@spline not a knot")
249plot2d(x,y,-9, strf="000") // para mostrar pontos de interpolação 249plot2d(x,y,-9, strf="000") // para mostrar pontos de interpolação
diff --git a/scilab/modules/interpolation/help/pt_BR/splin2d.xml b/scilab/modules/interpolation/help/pt_BR/splin2d.xml
index e16947e..c13e95d 100644
--- a/scilab/modules/interpolation/help/pt_BR/splin2d.xml
+++ b/scilab/modules/interpolation/help/pt_BR/splin2d.xml
@@ -164,7 +164,7 @@ xx = linspace(0,2*%pi,m); yy = xx;
164[XX,YY] = ndgrid(xx,yy); 164[XX,YY] = ndgrid(xx,yy);
165zz = interp2d(XX,YY, x, y, C); 165zz = interp2d(XX,YY, x, y, C);
166emax = max(abs(zz - cos(xx')*cos(yy))); 166emax = max(abs(zz - cos(xx')*cos(yy)));
167xbasc() 167clf()
168plot3d(xx, yy, zz, flag=[2 4 4]) 168plot3d(xx, yy, zz, flag=[2 4 4])
169[X,Y] = ndgrid(x,y); 169[X,Y] = ndgrid(x,y);
170param3d1(X,Y,list(z,-9*ones(1,n)), flag=[0 0]) 170param3d1(X,Y,list(z,-9*ones(1,n)), flag=[0 0])
@@ -183,7 +183,7 @@ ZP2 = linear_interpn(XP, YP, x, y, z);
183ZP3 = interp2d(XP, YP, x, y, splin2d(x, y, z, "natural")); 183ZP3 = interp2d(XP, YP, x, y, splin2d(x, y, z, "natural"));
184ZP4 = interp2d(XP, YP, x, y, splin2d(x, y, z, "monotone")); 184ZP4 = interp2d(XP, YP, x, y, splin2d(x, y, z, "monotone"));
185xset("colormap", jetcolormap(64)) 185xset("colormap", jetcolormap(64))
186xbasc() 186clf()
187subplot(2,2,1) 187subplot(2,2,1)
188plot3d1(xp, yp, ZP1, flag=[2 2 4]) 188plot3d1(xp, yp, ZP1, flag=[2 2 4])
189xtitle("not_a_knot") 189xtitle("not_a_knot")
@@ -213,7 +213,7 @@ xp = linspace(a,b, np);
213zp1 = interp2d(XP, YP, x, x, splin2d(x,x,z)); 213zp1 = interp2d(XP, YP, x, x, splin2d(x,x,z));
214zp2 = interp2d(XP, YP, x, x, splin2d(x,x,z,"monotone")); 214zp2 = interp2d(XP, YP, x, x, splin2d(x,x,z,"monotone"));
215// plot 215// plot
216xbasc() 216clf()
217xset("colormap",jetcolormap(128)) 217xset("colormap",jetcolormap(128))
218subplot(1,2,1) 218subplot(1,2,1)
219plot3d1(xp, xp, zp1, flag=[-2 6 4]) 219plot3d1(xp, xp, zp1, flag=[-2 6 4])
diff --git a/scilab/modules/interpolation/help/pt_BR/splin3d.xml b/scilab/modules/interpolation/help/pt_BR/splin3d.xml
index e147499..6d703ff2 100644
--- a/scilab/modules/interpolation/help/pt_BR/splin3d.xml
+++ b/scilab/modules/interpolation/help/pt_BR/splin3d.xml
@@ -150,7 +150,7 @@ nb_col = 128;
150vmin = min(VF); vmax = max(VF); 150vmin = min(VF); vmax = max(VF);
151color = dsearch(VF,linspace(vmin,vmax,nb_col+1)); 151color = dsearch(VF,linspace(vmin,vmax,nb_col+1));
152xset("colormap",jetcolormap(nb_col)); 152xset("colormap",jetcolormap(nb_col));
153xbasc(); xset("hidden3d",xget("background")); 153clf(); xset("hidden3d",xget("background"));
154colorbar(vmin,vmax) 154colorbar(vmin,vmax)
155plot3d(XF, YF, list(ZF,color), flag=[-1 6 4]) 155plot3d(XF, YF, list(ZF,color), flag=[-1 6 4])
156xtitle("interpolação por spline 3d da função "+func) 156xtitle("interpolação por spline 3d da função "+func)