Doc: fix compilation warnings 33/12533/2
Paul BIGNIER [Fri, 13 Sep 2013 09:43:44 +0000 (11:43 +0200)]
Change-Id: I08eb942e0f3204328eba4e27ea6f425be173f90e

27 files changed:
scilab/modules/cacsd/help/ja_JP/plot_display/black.xml
scilab/modules/cacsd/help/pt_BR/plot_display/black.xml
scilab/modules/cacsd/macros/black.sci
scilab/modules/graphics/help/en_US/2d_plot/graypolarplot.xml
scilab/modules/graphics/help/en_US/2d_plot/plot2d1.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetDisplay.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetOrientation.xml
scilab/modules/graphics/help/en_US/datatips/datatipSetStyle.xml
scilab/modules/graphics/help/ja_JP/2d_plot/graypolarplot.xml
scilab/modules/graphics/help/ja_JP/2d_plot/plot2d1.xml
scilab/modules/graphics/help/ja_JP/Graphics.xml
scilab/modules/graphics/help/ja_JP/datatips/datatipSetDisplay.xml
scilab/modules/graphics/help/ja_JP/datatips/datatipSetOrientation.xml
scilab/modules/graphics/help/ja_JP/datatips/datatipSetStyle.xml
scilab/modules/graphics/help/pt_BR/2d_plot/graypolarplot.xml
scilab/modules/graphics/help/pt_BR/2d_plot/plot2d1.xml
scilab/modules/graphics/help/ru_RU/Graphics.xml
scilab/modules/optimization/help/en_US/fsolve.xml
scilab/modules/optimization/help/ja_JP/fsolve.xml
scilab/modules/signal_processing/macros/buttmag.sci
scilab/modules/signal_processing/macros/cheb1mag.sci
scilab/modules/xcos/help/en_US/solvers/6-IDA.xml
scilab/modules/xcos/help/en_US/solvers/7-DDaskr.xml
scilab/modules/xcos/help/en_US/solvers/9-Comparisons.xml
scilab/modules/xcos/help/fr_FR/solvers/6-IDA.xml
scilab/modules/xcos/help/fr_FR/solvers/7-DDaskr.xml
scilab/modules/xcos/help/fr_FR/solvers/9-Comparaisons.xml

index 0040890..be5f2ff 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -81,7 +81,7 @@
             多出力系の場合, 各出力は異なる記号でプロットされます.
         </para>
         <para>The frequencies are given by the bounds
-            範囲<literal>fmin</literal>,<literal>fmax</literal> (単位: Hz) 
+            範囲<literal>fmin</literal>,<literal>fmax</literal> (単位: Hz)
             または行ベクトル<literal>frq</literal>
             (多出力系の場合は行列)
             で指定された周波数.
         <programlisting role="exemple"><![CDATA[
     //Black diagram
     s=poly(0,'s');
-    sl=syslin('c',5*(1+s)/(.1*s^4+s^3+15*s^2+3*s+1))
+    sl=syslin('c',5*(1+s)/(.1*s.^4+s.^3+15*s.^2+3*s+1))
     clf();black(sl,0.01,10);
     ]]></programlisting>
         <para>
             <scilab:image localized="true">
                 s=poly(0,'s');
-                sl=syslin('c',5*(1+s)/(.1*s^4+s^3+15*s^2+3*s+1))
+                sl=syslin('c',5*(1+s)/(.1*s.^4+s.^3+15*s.^2+3*s+1))
                 clf();black(sl,0.01,10);
             </scilab:image>
         </para>
     Plant=syslin('c',16000/((s+1)*(s+10)*(s+100)));
     //two degree of freedom PID
     tau=0.2;xsi=1.2;
-    PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau^2*s^2));
+    PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau.^2*s.^2));
     clf();
     black([Plant;Plant*PID ],0.01,100,["Plant";"Plant and PID corrector"]);
     //move the caption in the lower rigth corner
                 s=poly(0,'s');
                 Plant=syslin('c',16000/((s+1)*(s+10)*(s+100)));
                 tau=0.2;xsi=1.2;
-                PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau^2*s^2));
+                PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau.^2*s.^2));
                 clf();
                 black([Plant;Plant*PID ],0.01,100,["Plant";"Plant and PID corrector"]);
                 ax=gca();Leg=ax.children(1);
index f9f0067..b820280 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
         <programlisting role="exemple"><![CDATA[
     //Black diagram
     s=poly(0,'s');
-    sl=syslin('c',5*(1+s)/(.1*s^4+s^3+15*s^2+3*s+1))
+    sl=syslin('c',5*(1+s)/(.1*s.^4+s.^3+15*s.^2+3*s+1))
     clf();black(sl,0.01,10);
     ]]></programlisting>
         <para>
             <scilab:image localized="true">
                 s=poly(0,'s');
-                sl=syslin('c',5*(1+s)/(.1*s^4+s^3+15*s^2+3*s+1))
+                sl=syslin('c',5*(1+s)/(.1*s.^4+s.^3+15*s.^2+3*s+1))
                 black(sl,0.01,10);
             </scilab:image>
         </para>
     Plant=syslin('c',16000/((s+1)*(s+10)*(s+100)));
     //two degree of freedom PID
     tau=0.2;xsi=1.2;
-    PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau^2*s^2));
+    PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau.^2*s.^2));
     clf();
     black([Plant;Plant*PID ],0.01,100,["Plant";"Plant and PID corrector"]);
     //move the caption in the lower rigth corner
                 s=poly(0,'s');
                 Plant=syslin('c',16000/((s+1)*(s+10)*(s+100)));
                 tau=0.2;xsi=1.2;
-                PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau^2*s^2));
+                PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau.^2*s.^2));
                 black([Plant;Plant*PID ],0.01,100,["Plant";"Plant and PID corrector"]);
                 ax=gca();Leg=ax.children(1);
                 Leg.legend_location="in_lower_right";
index 1422155..1730846 100644 (file)
@@ -127,11 +127,11 @@ function black(varargin)
     kk=1;p0=[phi(:,kk) d(:,kk)];ks=1;Dst=0;
     dx=max(%eps,xmx-xmn);
     dy=max(%eps,ymx-ymn);
-    dx2=dx^2;dy2=dy^2
+    dx2=dx.^2;dy2=dy.^2
 
     while kk<n
         kk=kk+1
-        Dst=Dst+min(sqrt(((phi(:,kk-1)-phi(:,kk))^2)/dx2+((d(:,kk-1)-d(:,kk))^2)/dy2))
+        Dst=Dst+min(sqrt(((phi(:,kk-1)-phi(:,kk)).^2)/dx2+((d(:,kk-1)-d(:,kk)).^2)/dy2))
         if Dst>0.2 then
             if min(abs(frq(:,ks(prod(size(ks))))-frq(:,kk))./frq(:,kk))>0.2 then
                 ks=[ks kk]
index 4ece683..66e02b6 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 rho=1:0.1:4;theta=(0:0.02:1)*2*%pi;
-z=30+round(theta'*(1+rho^2));
+z=30+round(theta'*(1+rho.^2));
 f=gcf();
 f.color_map= hotcolormap(128);
 clf();graypolarplot(theta,rho,z)
  ]]></programlisting>
         <scilab:image>rho=1:0.1:4;theta=(0:0.02:1)*2*%pi;
-            z=30+round(theta'*(1+rho^2));
+            z=30+round(theta'*(1+rho.^2));
             f=gcf();
             f.color_map= hotcolormap(128);
             graypolarplot(theta,rho,z)
index d059f08..a365646 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
@@ -57,7 +57,7 @@
                                             <para>means "one". If there are many curves, they all
                                                 have the same x-values: <literal>x</literal> is a column
                                                 vector of size nl and <literal>y</literal> is a matrix of size
-                                                (nl,nc). For example : 
+                                                (nl,nc). For example :
                                                 <literal>x=[0:0.1:2*%pi]';plot2d1("onn",x,[sin(x) cos(x)])</literal>.
                                             </para>
                                         </listitem>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // multiple plot without giving x
 x=[0:0.1:2*%pi]';
 plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
@@ -150,7 +150,7 @@ plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
             x=[0:0.1:2*%pi]';
             plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
         </scilab:image>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // multiple plot using only one x
 clf()
 x=[0:0.1:2*%pi]';
@@ -160,15 +160,15 @@ plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
             x=[0:0.1:2*%pi]';
             plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
         </scilab:image>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // logarithmic plot
 x=[0.1:0.1:3]';
 clf();
-plot2d1("oll",x,[exp(x) exp(x^2) exp(x^3)])
+plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
  ]]></programlisting>
         <scilab:image>
             x=[0.1:0.1:3]';
-            plot2d1("oll",x,[exp(x) exp(x^2) exp(x^3)])
+            plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
         </scilab:image>
     </refsection>
     <refsection role="see also">
index ea0d522..531d650 100644 (file)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en_US" xml:id="datatipSetDisplay">
@@ -27,7 +27,7 @@
                 <term>tip_handle</term>
                 <listitem>
                     <para>
-                        A handle on a datatip. 
+                        A handle on a datatip.
                     </para>
                 </listitem>
             </varlistentry>
@@ -64,7 +64,7 @@
         <title>Examples</title><programlisting role="example"><![CDATA[
     x=linspace(-1,1,1000);
     clf()
-    plot(x,sinc(20*x),x,1-x^2);
+    plot(x,sinc(20*x),x,1-x.^2);
     e=gce();e=e.children;
     d21=datatipCreate(e(2),600);
     d22=datatipCreate(e(2),200);
     function str=mydisplay(curve,pt,index)
        str=msprintf('sinc(%-0.2g)=%-0.2g', 20*pt(1),pt(2))
     endfunction
-    datatipSetDisplay(e(2),mydisplay) 
+    datatipSetDisplay(e(2),mydisplay)
     ]]></programlisting>
         <scilab:image>
             x=linspace(-1,1,1000);
             clf()
-            plot(x,sinc(20*x),x,1-x^2);
+            plot(x,sinc(20*x),x,1-x.^2);
             e=gce();e=e.children;
             d21=datatipCreate(e(2),600);
             d22=datatipCreate(e(2),200);
             function str=mydisplay(curve,pt,index)
             str=msprintf('sinc(%-0.2g)=%-0.2g', 20*pt(1),pt(2))
             endfunction
-            datatipSetDisplay(e(2),mydisplay) 
+            datatipSetDisplay(e(2),mydisplay)
         </scilab:image>
         The display function can also be used to place tip text in different locations:
         <programlisting role="example"><![CDATA[
     function str=infodisplay(curve,pt,index)
-       xinfo(msprintf('x=%0.2g,\t 1-x^2=%0.2g', pt(1),pt(2)))
+       xinfo(msprintf('x=%0.2g,\t 1-x.^2=%0.2g', pt(1),pt(2)))
        str=''
     endfunction
     datatipSetDisplay(e(1),infodisplay) //tip text displayed in the info bar
index f6494de..0bae5c9 100644 (file)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en_US" xml:id="datatipSetOrientation">
@@ -26,7 +26,7 @@
                 <term>tip_handle</term>
                 <listitem>
                     <para>
-                        A handle on a datatip. 
+                        A handle on a datatip.
                     </para>
                 </listitem>
             </varlistentry>
@@ -65,7 +65,7 @@
         <programlisting role="example"><![CDATA[
     x=linspace(-20,20,1000);
     clf()
-    plot(x,sinc(x),x,sinc(x^2));
+    plot(x,sinc(x),x,sinc(x.^2));
     e=gce();e=e.children;
     d1=datatipCreate(e(1),500);
     d2=datatipCreate(e(2),60);
@@ -73,7 +73,7 @@
     ]]></programlisting>
         <scilab:image>
             x=linspace(-20,20,1000);
-            plot(x,sinc(x),x,sinc(x^2));
+            plot(x,sinc(x),x,sinc(x.^2));
             e=gce();e=e.children;
             d1=datatipCreate(e(1),500);
             d2=datatipCreate(e(2),60);
index 8b08fed..1162612 100644 (file)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en_US" xml:id="datatipSetStyle">
@@ -27,7 +27,7 @@
                 <term>curve_handle</term>
                 <listitem>
                     <para>
-                        A handle on a polyline. 
+                        A handle on a polyline.
                     </para>
                 </listitem>
             </varlistentry>
@@ -63,7 +63,7 @@
             There are two different styles for the datatip polyline marker:
         </para>
         <para>
-            - Square mark, centered on the tip point. 
+            - Square mark, centered on the tip point.
         </para>
         <para>
             - Directional arrows drawn along the tangeant at the tip point. The arrowhead is on the  tip point.
@@ -76,7 +76,7 @@
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
     x=linspace(-20,20,1000);
-    clf();plot(x,sinc(x),x,sinc(x^2));
+    clf();plot(x,sinc(x),x,sinc(x.^2));
     e=gce();e=e.children;
     function str=mydisplay(curve,pt,index),str=msprintf('%0.2g', pt(1)),endfunction
     datatipSetDisplay(e(1),mydisplay)
@@ -89,7 +89,7 @@
     ]]></programlisting>
         <scilab:image>
             x=linspace(-20,20,1000);
-            clf();plot(x,sinc(x),x,sinc(x^2));
+            clf();plot(x,sinc(x),x,sinc(x.^2));
             e=gce();e=e.children;
             function str=mydisplay(curve,pt,index),str=msprintf('%0.2g', pt(1)),endfunction
             datatipSetDisplay(e(1),mydisplay)
index 1ad9641..ad6d9bd 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
     <refsection>
         <title>例</title>
         <scilab:image>rho=1:0.1:4;theta=(0:0.02:1)*2*%pi;
-            z=30+round(theta'*(1+rho^2));
+            z=30+round(theta'*(1+rho.^2));
             f=gcf();
             f.color_map= hotcolormap(128);
             graypolarplot(theta,rho,z)
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 rho=1:0.1:4;theta=(0:0.02:1)*2*%pi;
-z=30+round(theta'*(1+rho^2));
+z=30+round(theta'*(1+rho.^2));
 f=gcf();
 f.color_map= hotcolormap(128);
 clf();graypolarplot(theta,rho,z)
index 5d01322..d3a25ed 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -57,7 +57,7 @@
                                             <para>means "one". If there are many curves, they all
                                                 have the same x-values: <literal>x</literal> is a column
                                                 vector of size nl and <literal>y</literal> is a matrix of size
-                                                (nl,nc). For example : 
+                                                (nl,nc). For example :
                                                 <literal>x=[0:0.1:2*%pi]';plot2d1("onn",x,[sin(x) cos(x)])</literal>.
                                             </para>
                                         </listitem>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // multiple plot without giving x
 x=[0:0.1:2*%pi]';
 plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
@@ -150,7 +150,7 @@ clf()
 plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
 // logarithmic plot
 x=[0.1:0.1:3]'; clf()
-plot2d1("oll",x,[exp(x) exp(x^2) exp(x^3)])
+plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
  ]]></programlisting>
     </refsection>
     <refsection>
index b8ad6af..da0b073 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="chart">chart</link>
+                    <link linkend="chart">nicholschart</link>
                 </term>
                 <listitem>
                     <para>ニコルス線図</para>
                         <emphasis role="bold">例:</emphasis>
                     </para>
                     <para>
-                        <scilab:image localized="true">chart();</scilab:image>
+                        <scilab:image localized="true">nicholschart();</scilab:image>
                     </para>
                 </listitem>
             </varlistentry>
index 0b55f04..079d52c 100644 (file)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="datatipSetDisplay">
@@ -26,7 +26,7 @@
                 <term>tip_handle</term>
                 <listitem>
                     <para>
-                        datatipのハンドル. 
+                        datatipのハンドル.
                     </para>
                 </listitem>
             </varlistentry>
@@ -64,7 +64,7 @@
         <programlisting role="example"><![CDATA[
     x=linspace(-1,1,1000);
     clf()
-    plot(x,sinc(20*x),x,1-x^2);
+    plot(x,sinc(20*x),x,1-x.^2);
     e=gce();e=e.children;
     d21=datatipCreate(e(2),600);
     d22=datatipCreate(e(2),200);
@@ -73,7 +73,7 @@
     function str=mydisplay(curve,pt,index)
        str=msprintf('sinc(%-0.2g)=%-0.2g', 20*pt(1),pt(2))
     endfunction
-    datatipSetDisplay(e(2),mydisplay) 
+    datatipSetDisplay(e(2),mydisplay)
     ]]></programlisting>
     </refsection>
     <refsection role="see also">
index a9045c3..4563499 100644 (file)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="datatipSetOrientation">
@@ -26,7 +26,7 @@
                 <term>tip_handle</term>
                 <listitem>
                     <para>
-                        datatipのハンドル. 
+                        datatipのハンドル.
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
+
     x=linspace(-20,20,1000);
+
     clf()
-    plot(x,sinc(x),x,sinc(x^2));
+    plot(x,sinc(x),x,sinc(x.^2));
     e=gce();e=e.children
     d1=datatipCreate(e(1),500);
     d2=datatipCreate(e(2),200);
-    datatipSetOrientation(d2,"lower left") 
+    datatipSetOrientation(d2,"lower left")
     ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 9e60718..23010ab 100644 (file)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja_JP" xml:id="datatipSetStyle">
@@ -27,7 +27,7 @@
                 <term>curve_handle</term>
                 <listitem>
                     <para>
-                        ポリラインのハンドル. 
+                        ポリラインのハンドル.
                     </para>
                 </listitem>
             </varlistentry>
@@ -64,7 +64,7 @@
             データティップのポリライン用のマーカは以下の2種類です:
         </para>
         <para>
-            - 四角, ティップポイントを中心とする. 
+            - 四角, ティップポイントを中心とする.
         </para>
         <para>
             - ティップ点の接線に沿って描画された矢印.
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
+
     x=linspace(-20,20,1000);
-    clf();plot(x,sinc(x),x,sinc(x^2));
+    clf();plot(x,sinc(x),x,sinc(x.^2));
     e=gce();e=e.children;
     function str=mydisplay(curve,pt,index),str=msprintf('%0.2g', pt(1)),endfunction
-    datatipSetDisplay(e(1),mydisplay) 
-    datatipSetStyle(e(1),2,%f) 
+    datatipSetDisplay(e(1),mydisplay)
+    datatipSetStyle(e(1),2,%f)
     d1=datatipCreate(e(1),540);
-    
-    datatipSetStyle(e(2),1,%t) 
+
+    datatipSetStyle(e(2),1,%t)
     d2=datatipCreate(e(2),200);
-    
+
     ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 5a8235e..e179638 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -42,7 +42,7 @@
                 <listitem>
                     <para>
                         matriz de reais de tamanho (n1,n2). <literal>z(i,j)</literal>
-                        é o valor da superfície no ponto (theta(i),rho(j)). 
+                        é o valor da superfície no ponto (theta(i),rho(j)).
                     </para>
                 </listitem>
             </varlistentry>
                                         <listitem>
                                             <para>
                                                 como <literal>y=1</literal> mas produz escala de
-                                                isovisualização. 
+                                                isovisualização.
                                             </para>
                                         </listitem>
                                     </varlistentry>
                                         <listitem>
                                             <para>
                                                 como <literal>y=2</literal> mas produz escala de
-                                                isovisualização. 
+                                                isovisualização.
                                             </para>
                                         </listitem>
                                     </varlistentry>
                                                 <literal>plot2d</literal> pode mudar as fronteiras do
                                                 esboço e os tiques dos eixos para se obter boas
                                                 graduações. Quando o botão de zoom é ativado, este modo
-                                                é usado. 
+                                                é usado.
                                             </para>
                                         </listitem>
                                     </varlistentry>
                                                 <literal>plot2d</literal> pode mudar as fronteiras do
                                                 esboço e os tiques dos eixos para se obter boas
                                                 graduações. Quando o botão de zoom é ativado, este modo
-                                                é usado. 
+                                                é usado.
                                             </para>
                                         </listitem>
                                     </varlistentry>
                                         <listitem>
                                             <para>
                                                 como <literal>y=5</literal> mas a escala do novo
-                                                esboço é misturada à escala corrente. 
+                                                esboço é misturada à escala corrente.
                                             </para>
                                         </listitem>
                                     </varlistentry>
                         <literal>strf</literal> é 1. <literal>leg</literal> possui a forma
                         <literal>"leg1@leg2@...."</literal> onde <literal>leg1</literal>,
                         <literal>leg2</literal>, etc. são respectivamente as legendas das
-                        primeira, segunda, etc. curvas. O padrão é " ". 
+                        primeira, segunda, etc. curvas. O padrão é " ".
                     </para>
                 </listitem>
             </varlistentry>
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 rho=1:0.1:4;theta=(0:0.02:1)*2*%pi;
-z=30+round(theta'*(1+rho^2));
+z=30+round(theta'*(1+rho.^2));
 f=gcf();
 f.color_map= hotcolormap(128);
 clf();graypolarplot(theta,rho,z)
index 81cdfd5..bfbf42b 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // esboços múltiplos sem fornecer x
 x=[0:0.1:2*%pi]';
 plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
@@ -156,7 +156,7 @@ clf()
 plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
 // esboço logarítmico
 x=[0.1:0.1:3]'; clf()
-plot2d1("oll",x,[exp(x) exp(x^2) exp(x^3)])
+plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 5cb2b2d..1b70647 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="chart">chart</link>
+                    <link linkend="chart">nicholschart</link>
                 </term>
                 <listitem>
                     <para>Диаграмма Никольса</para>
                         <emphasis role="bold">Пример:</emphasis>
                     </para>
                     <para>
-                        <scilab:image localized="true">chart();</scilab:image>
+                        <scilab:image localized="true">nicholschart();</scilab:image>
                     </para>
                 </listitem>
             </varlistentry>
index a958aea..f5a083a 100644 (file)
@@ -3,11 +3,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * Copyright (C) 2011 - DIGITEO - Michael Baudin
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
         <para>find a zero of a system of n nonlinear functions in n variables by a
             modification of the powell hybrid method. Jacobian may be provided.
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 0 = fct(x) w.r.t x.
  ]]></programlisting>
         <para>
         <para>
             The simplest calling sequence for <literal>fct</literal> is:
         </para>
-        <programlisting role=""><![CDATA[  
+        <programlisting role=""><![CDATA[
 [v]=fct(x).
  ]]></programlisting>
         <para>
             Fortran routine which must be linked to Scilab. Fortran calling sequence
             must be
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 fct(n,x,v,iflag)
 integer n,iflag
 double precision x(n),v(n)
  ]]></programlisting>
         <para>and C Calling sequence must be</para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 fct(int *n, double x[],double v[],int *iflag)
  ]]></programlisting>
         <para>
@@ -151,7 +151,7 @@ fct(int *n, double x[],double v[],int *iflag)
         <para>
             The simplest calling sequence for <literal>jac</literal> is:
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 [v]=jac(x).
  ]]></programlisting>
         <para>
@@ -162,8 +162,8 @@ fct(int *n, double x[],double v[],int *iflag)
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-// A simple example with fsolve 
+        <programlisting role="example"><![CDATA[
+// A simple example with fsolve
 a=[1,7;2,8];
 b=[10;11];
 
@@ -184,14 +184,14 @@ a*xres+b
 [xres]=fsolve([100;100],'fsol1','fsolj1',1.e-7);
 a*xres+b
  ]]></programlisting>
-        <para>For some starting points and some equations system, the fsolve method can fail. The fsolve method is a local search method. 
+        <para>For some starting points and some equations system, the fsolve method can fail. The fsolve method is a local search method.
             So, to have a good chance to find a solution to your equations system, you must ship, a good starting point to fsolve.
         </para>
         <para> Here is an example on which fsolve can fail:</para>
-        <programlisting role="example"><![CDATA[ 
-// Another example with fsolve 
+        <programlisting role="example"><![CDATA[
+// Another example with fsolve
 function F=feuler(x,r)
-  F=x-r-dt*(x^2-x^3);
+  F=x-r-dt*(x.^2-x.^3);
 endfunction
 function J=dFdx(x)  //definition de la derivee de F
    J=1-dt*(2*x-3*x^2);
@@ -216,7 +216,7 @@ a.grid=[5 5];
  ]]></programlisting>
         <scilab:image>
             function F=feuler(x,r)
-            F=x-r-dt*(x^2-x^3);
+            F=x-r-dt*(x.^2-x.^3);
             endfunction
             function J=dFdx(x)
             J=1-dt*(2*x-3*x^2);
index 5e4666d..ae22151 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -43,7 +43,7 @@
             <varlistentry>
                 <term>tol</term>
                 <listitem>
-                    <para>実数スカラー. 許容誤差: 
+                    <para>実数スカラー. 許容誤差:
                         x と解の相対誤差がtol以下となったとアルゴリズムが推定した時点で
                         終了します.
                         (<literal>tol=1.d-10</literal> がデフォルト値です).
             修正パウエル混合法により求めます.
             ヤコビアンを指定することができます.
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 0 = fct(x) w.r.t x.
  ]]></programlisting>
         <para>
         <para>
             <literal>fct</literal>に関する最も簡単な呼び出し手順は以下のようになります:
         </para>
-        <programlisting role=""><![CDATA[  
+        <programlisting role=""><![CDATA[
 [v]=fct(x).
  ]]></programlisting>
         <para>
             CまたはFortranルーチンを指します.
             Fortranの呼び出し手順は以下のようにします
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 fct(n,x,v,iflag)
 integer n,iflag
 double precision x(n),v(n)
  ]]></programlisting>
         <para>そしてCの呼び出し手順は以下のようにします</para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 fct(int *n, double x[],double v[],int *iflag)
  ]]></programlisting>
         <para>
@@ -152,7 +152,7 @@ fct(int *n, double x[],double v[],int *iflag)
         <para>
             <literal>jac</literal>に関する最も簡単な呼び出し手順は以下のようになります:
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 [v]=jac(x).
  ]]></programlisting>
         <para>
@@ -165,7 +165,7 @@ fct(int *n, double x[],double v[],int *iflag)
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // fsolve に関する簡単な例
 a=[1,7;2,8];b=[10;11];
 
@@ -188,10 +188,10 @@ a*xres+b
             fsolveに良い初期値を与える必要があります.
         </para>
         <para> 以下に fsolve が失敗する例を示します:</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // fsolve に関する別の例
 function F=feuler(x,r)
-  F=x-r-dt*(x^2-x^3);
+  F=x-r-dt*(x.^2-x.^3);
 endfunction
 function J=dFdx(x)  // Fの微分を定義
    J=1-dt*(2*x-3*x^2);
index d4fa6b0..0d83af2 100644 (file)
@@ -27,5 +27,5 @@ function [h]=buttmag(order,omegac,sample_vector)
 
     [n1,n2]=size(sample_vector);
     un=ones(n1,n2);
-    h=un./(un+(sample_vector/omegac)**(2*order));
+    h=un./(un+(sample_vector/omegac).^(2*order));
 endfunction
index 564df9b..ea2b312 100644 (file)
@@ -6,7 +6,7 @@
 // you should have received as part of this distribution.  The terms
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-function [h2]=cheb1mag(n,omegac,epsilon,sample)
+function [h2]=cheb1mag(n,omegac,epsilon,sampleFreq)
     //<h2>=cheb1mag(n,omegac,epsilon,sample)
     //Square magnitude response of a type 1 Chebyshev filter
     //omegac=passband edge
@@ -22,9 +22,9 @@ function [h2]=cheb1mag(n,omegac,epsilon,sample)
     //!
 
 
-    [n1,n2]=size(sample);
+    [n1,n2]=size(sampleFreq);
     un=ones(n1,n2);
     Tn=chepol(n,"x");  //n-th Chebyshev polynomial
-    fr=freq(Tn,1,sample/omegac);   //fr=Tn(sample/omegac)
+    fr=freq(Tn,1,sampleFreq/omegac);   //fr=Tn(sample/omegac)
     h2=un./(un+epsilon*epsilon*fr.*fr)   //magnitude
 endfunction
index a9894da..792d007 100644 (file)
         </para>
         <para>
         </para>
-        Before solving the problem, <emphasis>IDA</emphasis> runs an internal routine to find consistent values for 
+        Before solving the problem, <emphasis>IDA</emphasis> runs an internal routine to find consistent values for
         <emphasis>
             y<subscript>0</subscript>
         </emphasis>
-        and 
+        and
         <emphasis>
             yPrime<subscript>0</subscript>
         </emphasis>
         .
         <para>
-            Starting then with those 
+            Starting then with those
             <emphasis>
                 y<subscript>0</subscript>
             </emphasis>
-            and 
+            and
             <emphasis>
                 yPrime<subscript>0</subscript>
             </emphasis>
-            , <emphasis>IDA</emphasis> approximates 
+            , <emphasis>IDA</emphasis> approximates
             <emphasis>
                 y<subscript>n+1</subscript>
             </emphasis>
                 \end{eqnarray}
             </latex>
             <para>
-                &#160; with, like in <link linkend="CVode">CVode</link>, 
+                &#160; with, like in <link linkend="CVode">CVode</link>,
                 <emphasis>
                     y<subscript>n</subscript>
                 </emphasis>
-                the approximation of 
+                the approximation of
                 <emphasis>
                     y(t<subscript>n</subscript>)
                 </emphasis>
             An implemented direct dense solver is used and we go on to the next step.
         </para>
         <para>
-            <emphasis>IDA</emphasis> uses the history array to control the local error 
+            <emphasis>IDA</emphasis> uses the history array to control the local error
             <emphasis>
                 y<subscript>n(m)</subscript> - y<subscript>n(0)</subscript>
             </emphasis>
-            and recomputes 
+            and recomputes
             <emphasis>
                 h<subscript>n</subscript>
             </emphasis>
@@ -149,8 +149,8 @@ loadScicos();
 loadXcosLibs();
 importXcosDiagram(SCI + "/modules/xcos/examples/solvers/DAE_Example.zcos");
 // Redefining messagebox() to avoid popup
-function messagebox(msg, title)
- disp(title);
+function messagebox(msg, Title)
+ disp(Title);
  disp(msg);
 endfunction
 try xcos_simulate(scs_m, 4); catch disp(lasterror()); end
index 43884ce..2e62302 100644 (file)
         </para>
         <para>
         </para>
-        Before solving the problem, <emphasis>DDaskr</emphasis> runs an implemented routine to find consistent values for 
+        Before solving the problem, <emphasis>DDaskr</emphasis> runs an implemented routine to find consistent values for
         <emphasis>
             y<subscript>0</subscript>
         </emphasis>
-        and 
+        and
         <emphasis>
             yPrime<subscript>0</subscript>
         </emphasis>
         .
         <para>
-            Starting then with those 
+            Starting then with those
             <emphasis>
                 y<subscript>0</subscript>
             </emphasis>
-            and 
+            and
             <emphasis>
                 yPrime<subscript>0</subscript>
             </emphasis>
                 \end{eqnarray}
             </latex>
             <para>
-                &#160; with, like in <link linkend="CVode">CVode</link>, 
+                &#160; with, like in <link linkend="CVode">CVode</link>,
                 <emphasis>
                     y<subscript>n</subscript>
                 </emphasis>
-                the approximation of 
+                the approximation of
                 <emphasis>
                     y(t<subscript>n</subscript>)
                 </emphasis>
             <emphasis>
                 y<subscript>n(m)</subscript> - y<subscript>n(0)</subscript>
             </emphasis>
-            and recomputes 
+            and recomputes
             <emphasis>
                 h<subscript>n</subscript>
             </emphasis>
@@ -170,8 +170,8 @@ loadScicos();
 loadXcosLibs();
 importXcosDiagram(SCI + "/modules/xcos/examples/solvers/DAE_Example.zcos");
 // Redefining messagebox() to avoid popup
-function messagebox(msg, title)
- disp(title);
+function messagebox(msg, Title)
+ disp(Title);
  disp(msg);
 endfunction
 scs_m.props.tol(6) = 101;
index 5effe71..483a3c2 100644 (file)
@@ -656,8 +656,8 @@ loadScicos();
 loadXcosLibs();
 importXcosDiagram(SCI + "/modules/xcos/demos/ModelicaBlocks/BouncingBall_Modelica.zcos");
 // Redefining messagebox() to avoid popup
-function messagebox(msg, title)
- disp(title);
+function messagebox(msg, Title)
+ disp(Title);
  disp(msg);
 endfunction
 scs_m.props.tol(6) = 100;
@@ -731,8 +731,8 @@ loadScicos();
 loadXcosLibs();
 importXcosDiagram(SCI + "/modules/xcos/demos/ModelicaBlocks/Hydraulics.zcos");
 // Redefining messagebox() to avoid popup
-function messagebox(msg, title)
- disp(title);
+function messagebox(msg, Title)
+ disp(Title);
  disp(msg);
 endfunction
 scs_m.props.tol(6) = 100;
index a8fd23a..73836b3 100644 (file)
         </para>
         <para>
         </para>
-        Avant de résoudre le problème, <emphasis>IDA</emphasis> lance une routine interne pour trouver des valeurs consistantes à 
+        Avant de résoudre le problème, <emphasis>IDA</emphasis> lance une routine interne pour trouver des valeurs consistantes à
         <emphasis>
             y<subscript>0</subscript>
         </emphasis>
-        et 
+        et
         <emphasis>
             yPrime<subscript>0</subscript>
         </emphasis>
         .
         <para>
-            Partant alors de ces 
+            Partant alors de ces
             <emphasis>
                 y<subscript>0</subscript>
             </emphasis>
-            et 
+            et
             <emphasis>
                 yPrime<subscript>0</subscript>
             </emphasis>
-            , <emphasis>IDA</emphasis> approxime 
+            , <emphasis>IDA</emphasis> approxime
             <emphasis>
                 y<subscript>n+1</subscript>
             </emphasis>
                 \end{eqnarray}
             </latex>
             <para>
-                &#160; avec, comme dans <link linkend="CVode">CVode</link>, 
+                &#160; avec, comme dans <link linkend="CVode">CVode</link>,
                 <emphasis>
                     y<subscript>n</subscript>
                 </emphasis>
-                l'approximation de 
+                l'approximation de
                 <emphasis>
                     y(t<subscript>n</subscript>)
                 </emphasis>
             Un solveur direct dense est alors utilisé et on poursuit sur le prochain pas de temps.
         </para>
         <para>
-            <emphasis>IDA</emphasis> se sert des valeurs passées pour contrôler l'erreur locale 
+            <emphasis>IDA</emphasis> se sert des valeurs passées pour contrôler l'erreur locale
             <emphasis>
                 y<subscript>n(m)</subscript> - y<subscript>n(0)</subscript>
             </emphasis>
-            et recalcule 
+            et recalcule
             <emphasis>
                 h<subscript>n</subscript>
             </emphasis>
@@ -149,8 +149,8 @@ loadScicos();
 loadXcosLibs();
 importXcosDiagram(SCI + "/modules/xcos/examples/solvers/DAE_Example.zcos");
 // Redéfinition de messagebox() pour éviter le popup
-function messagebox(msg, title)
- disp(title);
+function messagebox(msg, Title)
+ disp(Title);
  disp(msg);
 endfunction
 try xcos_simulate(scs_m, 4); catch disp(lasterror()); end
index 97ce6a7..4fff755 100644 (file)
         </para>
         <para>
         </para>
-        Avant de résoudre le problème, <emphasis>DDaskr</emphasis> lance une routine interne pour trouver des valeurs consistantes à 
+        Avant de résoudre le problème, <emphasis>DDaskr</emphasis> lance une routine interne pour trouver des valeurs consistantes à
         <emphasis>
             y<subscript>0</subscript>
         </emphasis>
-        et 
+        et
         <emphasis>
             yPrime<subscript>0</subscript>
         </emphasis>
         .
         <para>
-            Partant alors de ces 
+            Partant alors de ces
             <emphasis>
                 y<subscript>0</subscript>
             </emphasis>
-            et 
+            et
             <emphasis>
                 yPrime<subscript>0</subscript>
             </emphasis>
                 \end{eqnarray}
             </latex>
             <para>
-                &#160; avec, comme dans <link linkend="CVode">CVode</link>, 
+                &#160; avec, comme dans <link linkend="CVode">CVode</link>,
                 <emphasis>
                     y<subscript>n</subscript>
                 </emphasis>
-                l'approximation de 
+                l'approximation de
                 <emphasis>
                     y(t<subscript>n</subscript>)
                 </emphasis>
             </listitem>
         </itemizedlist>
         <para>
-            <emphasis>DDaskr</emphasis> se sert des valeurs passées pour contrôler l'erreur locale 
+            <emphasis>DDaskr</emphasis> se sert des valeurs passées pour contrôler l'erreur locale
             <emphasis>
                 y<subscript>n(m)</subscript> - y<subscript>n(0)</subscript>
             </emphasis>
-            et recalcule 
+            et recalcule
             <emphasis>
                 h<subscript>n</subscript>
             </emphasis>
@@ -170,8 +170,8 @@ loadScicos();
 loadXcosLibs();
 importXcosDiagram(SCI + "/modules/xcos/examples/solvers/DAE_Example.zcos");
 // Redéfinition de messagebox() pour éviter le popup
-function messagebox(msg, title)
- disp(title);
+function messagebox(msg, Title)
+ disp(Title);
  disp(msg);
 endfunction
 scs_m.props.tol(6) = 101;
index e6431e1..9bea6ed 100644 (file)
@@ -726,8 +726,8 @@ loadScicos();
 loadXcosLibs();
 importXcosDiagram(SCI + "/modules/xcos/demos/ModelicaBlocks/Hydraulics.zcos");
 // Redefining messagebox() to avoid popup
-function messagebox(msg, title)
- disp(title);
+function messagebox(msg, Title)
+ disp(Title);
  disp(msg);
 endfunction
 scs_m.props.tol(6) = 100;