Remove the verbose display of bvode when generating the image 28/11028/1
Sylvestre Ledru [Wed, 27 Mar 2013 08:09:52 +0000 (09:09 +0100)]
Change-Id: I337907b02b8f987bc1a1dabf4c110691564403c2

scilab/modules/differential_equations/help/en_US/bvode.xml
scilab/modules/differential_equations/help/ru_RU/bvode.xml

index d9b5d35..c0aa944 100644 (file)
                                     <varlistentry>
                                         <term>= 0</term>
                                         <listitem>
-                                            <para>causes <literal>bvode</literal> to generate a uniform initial
+                                            <para>
+                                                causes <literal>bvode</literal> to generate a uniform initial
                                                 mesh.
                                             </para>
                                         </listitem>
                                                 <varlistentry>
                                                     <term>= 1</term>
                                                     <listitem>
-                                                        <para>if the initial mesh is provided by the user it is defined in <literal>fspace</literal> as follows: the mesh 
+                                                        <para>
+                                                            if the initial mesh is provided by the user it is defined in <literal>fspace</literal> as follows: the mesh 
                                                             will occupy <literal>fspace(1), ..., fspace(n+1)</literal>. The user needs to supply only
                                                             the interior mesh points <literal>fspace(j) = x(j),j = 2, ..., n</literal>.
                                                         </para>
                                     </mml:math>
                                 </imagedata>
                             </imageobject>
-                        </inlinemediaobject>.
+                        </inlinemediaobject>
+                        .
                         It is also required that:
                     </para>
                     <para>
@@ -2367,9 +2370,9 @@ xtitle(' ','x',' ')
                     
                     for M=[1 4]
                     if M==1
-                    z=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol);
+                    z=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol,iprint=1);
                     else
-                    z1=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol);
+                    z1=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol,iprint=1);
                     end
                     end
                     
@@ -2391,9 +2394,6 @@ xtitle(' ','x',' ')
                     y=log((1-tanh((2*x-1)/4/c1).^2)/2/c1/c1)
                     endfunction
                     
-                    disp(norm(z(1,:)-yex(x)),'norm(yex(x)-z(1,:))= ')
-                    disp(norm(z1(1,:)-yex1(x)),'norm(yex1(x)-z1(1,:))= ')
-                    clf();
                     subplot(2,1,1)
                     plot2d(x,z(1,:),style=[5])
                     xtitle('Two different solutions','x',' ')
index 1322544..1b3f0d1 100644 (file)
                                     </mml:math>
                                 </imagedata>
                             </imageobject>
-                        </inlinemediaobject>.
+                        </inlinemediaobject>
+                        .
                         Также требуется, чтобы:
                     </para>
                     <para>
                                     </mml:math>
                                 </imagedata>
                             </imageobject>
-                        </inlinemediaobject>.
-                         Таким образом код пытается удовлетворить
+                        </inlinemediaobject>
+                        .
+                        Таким образом код пытается удовлетворить
                         <inlinemediaobject>
                             <imageobject>
                                 <imagedata>
@@ -2217,37 +2219,37 @@ plot(x,[z(1,:)' z(2,:)'])
 xtitle(['Начальное значение =  '+string(la0);'Собственное значение = '+string(z(3,1))],'x',' ')
 legend(['y(x)';'y''(x)']);
  ]]></programlisting>
-                 <scilab:image localized="true">
-                     function rhs=fsub(x,z)
-                     rhs=[-z(3)*z(1);0]
-                     endfunction
-                     
-                     function g=gsub(i,z)
-                     g=[z(1)-z(2) z(1)-1 z(1)]
-                     g=g(i)
-                     endfunction
-                     
-                     function [z,lhs]=ystart(x,z,la0)
-                     z=[1;0;la0]
-                     lhs=[0;0]
-                     endfunction
-                     
-                     a=0;b=1;
-                     m=[2;1];
-                     n=2;
-                     zeta=[a a b];
-                     N=101;
-                     x=linspace(a,b,N)';
-                     
-                     la0=10;
-                     la0=(%pi/2+la0*%pi)^2;
-                     
-                     z=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,la0),iprint=1);
-                     
-                     plot(x,[z(1,:)' z(2,:)']);
-                     xtitle(['Начальное значение =  '+string(la0);'Собственное значение = '+string(z(3,1))],'x',' ');
-                     legend(['y(x)';'y''(x)']);
-                 </scilab:image>
+                <scilab:image localized="true">
+                    function rhs=fsub(x,z)
+                    rhs=[-z(3)*z(1);0]
+                    endfunction
+                    
+                    function g=gsub(i,z)
+                    g=[z(1)-z(2) z(1)-1 z(1)]
+                    g=g(i)
+                    endfunction
+                    
+                    function [z,lhs]=ystart(x,z,la0)
+                    z=[1;0;la0]
+                    lhs=[0;0]
+                    endfunction
+                    
+                    a=0;b=1;
+                    m=[2;1];
+                    n=2;
+                    zeta=[a a b];
+                    N=101;
+                    x=linspace(a,b,N)';
+                    
+                    la0=10;
+                    la0=(%pi/2+la0*%pi)^2;
+                    
+                    z=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,la0),iprint=1);
+                    
+                    plot(x,[z(1,:)' z(2,:)']);
+                    xtitle(['Начальное значение =  '+string(la0);'Собственное значение = '+string(z(3,1))],'x',' ');
+                    legend(['y(x)';'y''(x)']);
+                </scilab:image>
             </listitem>
             <listitem>
                 <para>
@@ -2341,7 +2343,7 @@ xtitle(' ','x',' ')
                     g=g(i)
                     endfunction
                     
-                    function [z,lhs]=ystart(x,z,M) 
+                    function [z,lhs]=ystart(x,z,M)
                     //z=[4*x*(1-x)*M ; 4*(1-2*x)*M]
                     z=[M;0]
                     //lhs=[-exp(4*x*(1-x)*M)]
@@ -2350,9 +2352,9 @@ xtitle(' ','x',' ')
                     
                     for M=[1 4]
                     if M==1
-                    z=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol);
+                    z=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol,iprint=1);
                     else
-                    z1=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol);
+                    z1=bvodeS(x,m,n,a,b,fsub,gsub,zeta,ystart=list(ystart,M),tol=tol,iprint=1);
                     end
                     end
                     
@@ -2368,7 +2370,7 @@ xtitle(' ','x',' ')
                     endfunction
                     
                     function y=f1(c1)
-                        y=2*c1^2+tanh(1/4/c1)^2-1
+                    y=2*c1^2+tanh(1/4/c1)^2-1
                     endfunction
                     c1=fsolve(0.1,f1);
                     
@@ -2376,9 +2378,6 @@ xtitle(' ','x',' ')
                     y=log((1-tanh((2*x-1)/4/c1).^2)/2/c1/c1)
                     endfunction
                     
-                    disp(norm(z(1,:)-yex(x)),'norm(yex(x)-z(1,:))= ')
-                    disp(norm(z1(1,:)-yex1(x)),'norm(yex1(x)-z1(1,:))= ')
-                    clf();
                     subplot(2,1,1)
                     plot2d(x,z(1,:),style=[5])
                     xtitle('Два различных решения','x',' ')