* Bug #15334 fixed - ode "roots" renamed to "root" 64/19564/7
Paul Bignier [Fri, 1 Dec 2017 15:44:11 +0000 (16:44 +0100)]
Change-Id: I7a6b8e9d7d7e788815d190e674202fef1a84d141

31 files changed:
scilab/CHANGES.md
scilab/modules/differential_equations/help/en_US/ode.xml
scilab/modules/differential_equations/help/en_US/ode_root.xml [moved from scilab/modules/differential_equations/help/en_US/ode_roots.xml with 95% similarity]
scilab/modules/differential_equations/help/fr_FR/ode.xml
scilab/modules/differential_equations/help/ja_JP/ode.xml
scilab/modules/differential_equations/help/ja_JP/ode_root.xml [moved from scilab/modules/differential_equations/help/ja_JP/ode_roots.xml with 96% similarity]
scilab/modules/differential_equations/help/pt_BR/ode.xml
scilab/modules/differential_equations/help/pt_BR/ode_root.xml [moved from scilab/modules/differential_equations/help/pt_BR/ode_roots.xml with 95% similarity]
scilab/modules/differential_equations/help/ru_RU/ode.xml
scilab/modules/differential_equations/help/ru_RU/ode_root.xml [moved from scilab/modules/differential_equations/help/ru_RU/ode_roots.xml with 92% similarity]
scilab/modules/differential_equations/sci_gateway/cpp/sci_ode.cpp
scilab/modules/xcos/help/en_US/solvers/0-LSodar.xml
scilab/modules/xcos/help/en_US/solvers/1-CVode.xml
scilab/modules/xcos/help/en_US/solvers/2-Runge-Kutta.xml
scilab/modules/xcos/help/en_US/solvers/3-Dormand-Prince.xml
scilab/modules/xcos/help/en_US/solvers/4-ImplicitRK.xml
scilab/modules/xcos/help/en_US/solvers/5-CrankNicolson.xml
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/8-Rootfinding.xml
scilab/modules/xcos/help/en_US/solvers/9-Comparisons.xml
scilab/modules/xcos/help/fr_FR/solvers/0-LSodar.xml
scilab/modules/xcos/help/fr_FR/solvers/1-CVode.xml
scilab/modules/xcos/help/fr_FR/solvers/2-Runge-Kutta.xml
scilab/modules/xcos/help/fr_FR/solvers/3-Dormand-Prince.xml
scilab/modules/xcos/help/fr_FR/solvers/4-ImplicitRK.xml
scilab/modules/xcos/help/fr_FR/solvers/5-CrankNicolson.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/8-Rootfinding.xml
scilab/modules/xcos/help/fr_FR/solvers/9-Comparisons.xml

index fe7e7ec..8e25b9a 100644 (file)
@@ -238,7 +238,7 @@ Help pages:
 
 * Support to `id`, `width`, `height`, `align` and `style` attributes added for the `<imagedata>` tag.
 * Support to `id` attribute added for the `<tr>` tag.
-* fixed / improved:  `members`, `part`, `ode`, `ode_optional_output`, `ode_roots`, `plot2d`, `roots`,
+* fixed / improved:  `members`, `part`, `ode`, `ode_optional_output`, `ode_root`, `plot2d`, `roots`,
   `printf`, `sprintf`, `iconvert`, `stdev`, `xlabel`, `and_op`, `or_op`, `permute`, `tree2code`, `%helps`,
   `scilab|scilex`, `flipdim`, `Matplot_properties`, `meshgrid`, `ismatrix`, `xget`, `xset`, `ieee`, `evstr`,
   `uigetfont`, `uigetdir`, `uigetfile`, `uiputfile`, `cat`, `makecell`, `xstring`, `norm`, `barhomogenize`,
index 1f2ceac..258838e 100644 (file)
@@ -25,7 +25,7 @@
         <synopsis>
             y = ode(y0, t0, t, f)
             [y, w, iw] = ode([type,] y0, t0, t [,rtol [,atol]], f [,jac] [,w, iw])
-            [y, rd, w, iw] = ode("roots", y0, t0, t [,rtol [,atol]], f [,jac],ng, g [,w,iw])
+            [y, rd, w, iw] = ode("root", y0, t0, t [,rtol [,atol]], f [,jac],ng, g [,w,iw])
             y = ode("discrete", y0, k0, kvect, f)
         </synopsis>
     </refsynopsisdiv>
@@ -36,7 +36,8 @@
                 <term>y0</term>
                 <listitem>
                     <para>a real vector or matrix: initial state,
-                        at <varname>t0</varname>.</para>
+                        at <varname>t0</varname>.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -72,7 +73,7 @@
                         <literal>"adams"</literal>,
                         <literal>"stiff"</literal>, <literal>"rk"</literal>,
                         <literal>"rkf"</literal>, <literal>"fix"</literal>,
-                        <literal>"discrete"</literal>, <literal>"roots"</literal>.
+                        <literal>"discrete"</literal>, <literal>"root"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>w, iw</term>
                 <listitem>
-                    <para>real vectors. (INPUT/OUTPUT). See <link linkend="ode_optional_output">ode() optional output</link></para>
+                    <para>
+                        real vectors. (INPUT/OUTPUT). See <link linkend="ode_optional_output">ode() optional output</link>
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -402,13 +405,13 @@ void fex(int *n,double *t,double *y,int *ml,int *mu,double *J,int *nrpd,)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"roots":</term>
+                <term>"root":</term>
                 <listitem>
                     <para>
                         ODE solver with rootfinding capabilities. The
                         <literal>lsodar</literal> solver of package ODEPACK is used. It is a
                         variant of the <literal>lsoda</literal> solver where it finds the
-                        roots of a given vector function. See help on <link linkend="ode_roots">ode_roots</link> for more
+                        roots of a given vector function. See help on <link linkend="ode_root">ode_root</link> for more
                         details.
                     </para>
                 </listitem>
@@ -567,7 +570,7 @@ y = ode(y0,t0,t,'myode');
                 <link linkend="ode_optional_output">ode_optional_output</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="ode_discrete">ode_discrete</link>
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_roots" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_root" xml:lang="en">
     <refnamediv>
-        <refname>ode_roots</refname>
+        <refname>ode_root</refname>
         <refpurpose>ordinary differential equation solver with roots
             finding
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[y, rd, w, iw] = ode("roots", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [,w,iw])</synopsis>
+        <synopsis>[y, rd, w, iw] = ode("root", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [,w,iw])</synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
         <title>Arguments</title>
     <refsection role="description">
         <title>Description</title>
         <para>
-            With this syntax (first argument equal to <literal>"roots"</literal>)
+            With this syntax (first argument equal to <literal>"root"</literal>)
             <literal>ode</literal> computes the solution of the differential equation
             <literal>dy/dt=f(t,y)</literal> until the state <literal>y(t)</literal>
             crosses the surface <literal>g(t,y)=0</literal>.
@@ -154,10 +154,10 @@ z = g(t,y)
 deff("[ydot]=f(t,y)","ydot=y")
 deff("[z]=g(t,y)","z=y-2")
 y0=1;ng=1;
-[y,rd]=ode("roots",y0,0,2,f,ng,g)
+[y,rd]=ode("root",y0,0,2,f,ng,g)
 
 deff("[z]=g(t,y)","z=y-[2;2;33]")
-[y,rd]=ode("roots",1,0,2,f,3,g)
+[y,rd]=ode("root",1,0,2,f,3,g)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index b86a0f6..01449a0 100644 (file)
@@ -8,7 +8,7 @@
         <title>Syntaxe</title>
         <synopsis>y=ode(y0,t0,t,f)
             [y,w,iw]=ode([type],y0,t0,t [,rtol [,atol]],f [,jac] [,w,iw])
-            [y,rd,w,iw]=ode("roots",y0,t0,t [,rtol [,atol]],f [,jac],ng,g [,w,iw])
+            [y,rd,w,iw]=ode("root",y0,t0,t [,rtol [,atol]],f [,jac],ng,g [,w,iw])
             y=ode("discrete",y0,k0,kvect,f)
         </synopsis>
     </refsynopsisdiv>
@@ -48,7 +48,7 @@
                         une des chaînes de caractères : <literal>"adams"</literal>,
                         <literal>"stiff"</literal>, <literal>"rk"</literal>,
                         <literal>"rkf"</literal>, <literal>"fix"</literal>,
-                        <literal>"discrete"</literal>, <literal>"roots"</literal>
+                        <literal>"discrete"</literal>, <literal>"root"</literal>
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>w, iw</term>
                 <listitem>
-                    <para>vecteurs de réels. Voir les <link linkend="ode_optional_output">options de sortie</link> de ode().</para>
+                    <para>
+                        vecteurs de réels. Voir les <link linkend="ode_optional_output">options de sortie</link> de ode().
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"roots":</term>
+                <term>"root":</term>
                 <listitem>
                     <para>Solveur d'EDO avec recherche de racines. Le solveur
                         <literal>lsodar</literal> du package ODEPACK est utilisé. C'est une
                         variante de <literal>lsoda</literal> permettant la recherche d'une
-                        racine d'une fonction vectorielle donnée. Voir <link linkend="ode_roots">ode_roots</link> pour plus de
+                        racine d'une fonction vectorielle donnée. Voir <link linkend="ode_root">ode_root</link> pour plus de
                         détails.
                     </para>
                 </listitem>
@@ -439,7 +441,7 @@ ode("stiff",[0;1],0,1,f,Jacobian)
                 <link linkend="ode_optional_output">ode_optional_output</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="ode_discrete">ode_discrete</link>
index de014be..f3b966f 100644 (file)
@@ -9,7 +9,7 @@
         <synopsis>
             y = ode(y0, t0, t, f)
             [y, w, iw] = ode([type,] y0, t0, t [,rtol [,atol]], f [,jac] [,w, iw])
-            [y, rd, w, iw] = ode("roots", y0, t0, t [,rtol [,atol]], f [,jac],ng, g [,w,iw])
+            [y, rd, w, iw] = ode("root", y0, t0, t [,rtol [,atol]], f [,jac],ng, g [,w,iw])
             y = ode("discrete", y0, k0, kvect, f)
         </synopsis>
     </refsynopsisdiv>
@@ -48,7 +48,7 @@
                         <literal>"adams"</literal>,
                         <literal>"stiff"</literal>, <literal>"rk"</literal>,
                         <literal>"rkf"</literal>, <literal>"fix"</literal>,
-                        <literal>"discrete"</literal>, <literal>"roots"</literal>.
+                        <literal>"discrete"</literal>, <literal>"root"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>w, iw</term>
                 <listitem>
                     <para>実数ベクトル. (入力/出力)
-                    See <link linkend="ode_optional_output">ode() optional output</link>
+                        See <link linkend="ode_optional_output">ode() optional output</link>
                     </para>
                 </listitem>
             </varlistentry>
@@ -396,14 +396,14 @@ void fex(int *n,double *t,double *y,int *ml,int *mu,double *J,int *nrpd,)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"roots":</term>
+                <term>"root":</term>
                 <listitem>
                     <para>
                         解を得る機能を有するODE ソルバ. ODEPACKパッケージの
                         <literal>lsodar</literal> ソルバが使用されます.
                         使用されているのは<literal>lsoda</literal> ソルバを改変したもので,
                         指定したベクトル関数の根を見つけることができます.
-                        詳細は <link linkend="ode_roots">ode_roots</link> のヘルプを参照してください.
+                        詳細は <link linkend="ode_root">ode_root</link> のヘルプを参照してください.
                     </para>
                 </listitem>
             </varlistentry>
@@ -563,7 +563,7 @@ y = ode(y0,t0,t,'myode');
                 <link linkend="ode_optional_output">ode_optional_output</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="ode_discrete">ode_discrete</link>
@@ -607,4 +607,4 @@ y = ode(y0,t0,t,'myode');
             lsode.f lsoda.f lsodar.f
         </para>
     </refsection>
-</refentry>
\ No newline at end of file
+</refentry>
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_roots" xml:lang="ja">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_root" xml:lang="ja">
     <refnamediv>
-        <refname>ode_roots</refname>
+        <refname>ode_root</refname>
         <refpurpose>求解付きの常微分方程式ソルバ</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
         <synopsis>
-            [y, rd, w, iw] = ode("roots", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [,w,iw])
+            [y, rd, w, iw] = ode("root", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [,w,iw])
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
     <refsection role="description">
         <title>説明</title>
         <para>
-            この構文により (最初の引数が<literal>"roots"</literal>)
+            この構文により (最初の引数が<literal>"root"</literal>)
             <literal>ode</literal> は, 状態量<literal>y(t)</literal>が
             面<literal>g(t,y)=0</literal>と交差するまで
             微分方程式<literal>dy/dt=f(t,y)</literal>
@@ -158,9 +158,9 @@ deff("[ydot]=f(t,y)","ydot=y")
 deff("[z]=g(t,y)","z=y-2")
 y0=1;
 ng=1;
-[y,rd]=ode("roots",y0,0,2,f,ng,g)
+[y,rd]=ode("root",y0,0,2,f,ng,g)
 deff("[z]=g(t,y)","z=y-[2;2;33]")
-[y,rd]=ode("roots",1,0,2,f,3,g)
+[y,rd]=ode("root",1,0,2,f,3,g)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 8392491..3f7a2e6 100644 (file)
@@ -23,7 +23,7 @@
         <title>Seqüência de Chamamento</title>
         <synopsis>y = ode(y0,t0,t,f)
             [y,w,iw] = ode([type],y0,t0,t [,rtol [,atol]],f [,jac] [,w,iw])
-            [y,rd,w,iw] = ode("roots",y0,t0,t [,rtol [,atol]],f [,jac],ng,g [,w,iw])
+            [y,rd,w,iw] = ode("root",y0,t0,t [,rtol [,atol]],f [,jac],ng,g [,w,iw])
             y = ode("discrete",y0,k0,kvect,f)
         </synopsis>
     </refsynopsisdiv>
@@ -63,7 +63,7 @@
                         um dos strings seguintes: <literal>"adams"</literal>,
                         <literal>"stiff"</literal>, <literal>"rk"</literal>,
                         <literal>"rkf"</literal>, <literal>"fix"</literal>,
-                        <literal>"discrete"</literal>, <literal>"roots"</literal>.
+                        <literal>"discrete"</literal>, <literal>"root"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>w, iw</term>
                 <listitem>
                     <para>vetores de reais.
-                    Ver <link linkend="ode_optional_output">ode() optional output</link>
+                        Ver <link linkend="ode_optional_output">ode() optional output</link>
                     </para>
                 </listitem>
             </varlistentry>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"roots":</term>
+                <term>"root":</term>
                 <listitem>
                     <para>Solucionador de EDOs com capacidade de encontrar raízes. O
                         solucionador <literal>lsodar</literal> do pacote ODEPACK é
                         utilizado. É uma variante do solucionador <literal>lsoda</literal>
                         onde se acha raízes de uma dada função vetorial. Ver ajuda em
-                        <link linkend="ode_roots">ode_roots</link> para mais detalhes.
+                        <link linkend="ode_root">ode_root</link> para mais detalhes.
                     </para>
                 </listitem>
             </varlistentry>
@@ -448,7 +448,7 @@ ode("stiff",[0;1],0,1,f,Jacobian)
                 <link linkend="ode_optional_output">ode_optional_output</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="ode_discrete">ode_discrete</link>
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_roots" xml:lang="pt">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_root" xml:lang="pt">
     <refnamediv>
-        <refname>ode_roots</refname>
+        <refname>ode_root</refname>
         <refpurpose>solucionador de EDOs com busca de raízes</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>[y,rd,w,iw]=ode("roots",y0,t0,t [,rtol [,atol]],f [,jac],ng,g [,w,iw])</synopsis>
+        <synopsis>[y,rd,w,iw]=ode("root",y0,t0,t [,rtol [,atol]],f [,jac],ng,g [,w,iw])</synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
         <title>Parâmemtros</title>
     <refsection role="description">
         <title>Descrição</title>
         <para>Com esta sintaxe (primeiro argumento igual a
-            <literal>"roots"</literal>) <literal>ode</literal> computa a solução da EDO
+            <literal>"root"</literal>) <literal>ode</literal> computa a solução da EDO
             <literal>dy/dt=f(t,y)</literal> até que o estado <literal>y(t)</literal>
             cruze a superfície <literal>g(t,y)=0</literal>.
         </para>
@@ -151,10 +151,10 @@ z=g(t,y)
 deff("[ydot]=f(t,y)","ydot=y")
 deff("[z]=g(t,y)","z=y-2")
 y0=1;ng=1;
-[y,rd]=ode("roots",y0,0,2,f,ng,g)
+[y,rd]=ode("root",y0,0,2,f,ng,g)
 
 deff("[z]=g(t,y)","z=y-[2;2;33]")
-[y,rd]=ode("roots",1,0,2,f,3,g)
+[y,rd]=ode("root",1,0,2,f,3,g)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 399f2d7..5d0b5b4 100644 (file)
@@ -27,7 +27,7 @@
         <synopsis>
             y = ode(y0, t0, t, f)
             [y, w, iw] = ode([type,]y0, t0, t [,rtol [,atol]],f [,jac] [,w, iw])
-            [y, rd, w, iw] = ode("roots", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [, w, iw])
+            [y, rd, w, iw] = ode("root", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [, w, iw])
             y = ode("discrete", y0, k0, kvect, f)
         </synopsis>
     </refsynopsisdiv>
@@ -75,7 +75,7 @@
                         программ решения:   <literal>"adams"</literal>,
                         <literal>"stiff"</literal>, <literal>"rk"</literal>,
                         <literal>"rkf"</literal>, <literal>"fix"</literal>,
-                        <literal>"discrete"</literal>, <literal>"roots"</literal>.
+                        <literal>"discrete"</literal>, <literal>"root"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
@@ -412,14 +412,14 @@ void fex(int *n,double *t,double *y,int *ml,int *mu,double *J,int *nrpd,)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>"roots":</term>
+                <term>"root":</term>
                 <listitem>
                     <para>
                         Программа решения ОДУ с возможностью нахождения корней.
                         Используется программа решения <literal>lsodar</literal> из пакета
                         ODEPACK. Она является вариантом программы
                         решения <literal>lsoda</literal>, где она ищет корни заданной
-                        векторной функции. См. справку по <link linkend="ode_roots">ode_roots</link>.
+                        векторной функции. См. справку по <link linkend="ode_root">ode_root</link>.
                     </para>
                 </listitem>
             </varlistentry>
@@ -566,7 +566,7 @@ y = ode(y0,t0,t,'myode');
                 <link linkend="ode_optional_output">ode_optional_output</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="ode_discrete">ode_discrete</link>
  * along with this program.
 *
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_roots" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ode_root" xml:lang="ru">
     <refnamediv>
-        <refname>ode_roots</refname>
+        <refname>ode_root</refname>
         <refpurpose>
             программа решения обыкновенных дифференциальных уравнений с поиском корней
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>[y, rd, w, iw] = ode("roots", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [,w, iw])</synopsis>
+        <synopsis>[y, rd, w, iw] = ode("root", y0, t0, t [,rtol [,atol]], f [,jac], ng, g [,w, iw])</synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
         <title>Аргументы</title>
     <refsection role="description">
         <title>Описание</title>
         <para>
-            С таким синтаксисом (первый аргумент равен <literal>"roots"</literal>) <literal>ode</literal> вычисляет решение дифференциального уравнения  <literal>dy/dt=f(t,y)</literal> до тех пор, пока состояние <literal>y(t)</literal> не пересечёт поверхность <literal>g(t,y)=0</literal>.
+            С таким синтаксисом (первый аргумент равен <literal>"root"</literal>) <literal>ode</literal> вычисляет решение дифференциального уравнения  <literal>dy/dt=f(t,y)</literal> до тех пор, пока состояние <literal>y(t)</literal> не пересечёт поверхность <literal>g(t,y)=0</literal>.
         </para>
         <para>
             <literal>g</literal> должно задавать уравнение поверхности. Это внешняя функция, то есть функция с определённым синтаксисом или имя процедуры Fortran или функции C (символьная строка) с определённой последовательностью вызова или список.
     deff("[ydot]=f(t,y)","ydot=y")
     deff("[z]=g(t,y)","z=y-2")
     y0=1;ng=1;
-    [y,rd]=ode("roots",y0,0,2,f,ng,g)
+    [y,rd]=ode("root",y0,0,2,f,ng,g)
 
     deff("[z]=g(t,y)","z=y-[2;2;33]")
-    [y,rd]=ode("roots",1,0,2,f,3,g)
+    [y,rd]=ode("root",1,0,2,f,3,g)
     ]]></programlisting>
     </refsection>
     <refsection role="see also">
index f29f511..18d27ec 100644 (file)
@@ -35,6 +35,7 @@ extern "C"
 #include "sciprint.h"
 #include "common_structure.h"
 #include "sci_malloc.h"
+#include "sciprint.h"
 }
 /*--------------------------------------------------------------------------*/
 
@@ -117,8 +118,14 @@ types::Function::ReturnValue sci_ode(types::typed_list &in, int _iRetCount, type
         {
             meth = 2;
         }
+        else if (wcscmp(wcsType, L"root") == 0)
+        {
+            meth = 3;
+        }
         else if (wcscmp(wcsType, L"roots") == 0)
         {
+            sciprint(_("%s: Feature %s is obsolete.\n"), _("Warning"), "roots");
+            sciprint(_("%s: Please use %s instead.\n"), _("Warning"), "root");
             meth = 3;
         }
         else if (wcscmp(wcsType, L"discrete") == 0)
@@ -139,7 +146,7 @@ types::Function::ReturnValue sci_ode(types::typed_list &in, int _iRetCount, type
         }
         else
         {
-            Scierror(999, _("%s: Wrong value for input argument #%d: It must be one of the following strings: adams, stiff, rk, rkf, fix, roots or discrete.\n"), "ode", 1);
+            Scierror(999, _("%s: Wrong value for input argument #%d: It must be one of the following strings: adams, stiff, rk, rkf, fix, root or discrete.\n"), "ode", 1);
             return types::Function::Error;
         }
     }
index 6440f71..d062ac2 100644 (file)
@@ -192,7 +192,7 @@ Time for Adams / Functional:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 313c012..2d34d92 100644 (file)
@@ -286,7 +286,7 @@ Time for Adams / Functional:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index a848c91..1f89985 100644 (file)
@@ -249,7 +249,7 @@ Time for Runge-Kutta:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index e2f3729..fd9a3bd 100644 (file)
@@ -233,7 +233,7 @@ Time for Dormand-Prince:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 34be836..c2d85d8 100644 (file)
@@ -290,7 +290,7 @@ Time for implicit Runge-Kutta:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 9c0755e..a5e02ed 100644 (file)
@@ -304,7 +304,7 @@ Time for Crank-Nicolson:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index b44d229..60ba627 100644 (file)
@@ -194,7 +194,7 @@ try xcos_simulate(scs_m, 4); catch disp(lasterror()); end
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 7915180..290ba14 100644 (file)
@@ -219,7 +219,7 @@ try xcos_simulate(scs_m, 4); catch disp(lasterror()); end
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index f546f5a..3a8e72f 100644 (file)
@@ -173,7 +173,7 @@ Time without rootfinding:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 68d4473..7058e74 100644 (file)
@@ -899,7 +899,7 @@ Time for DDaskr - GMRes:
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 3e7e208..52f9f89 100644 (file)
@@ -192,7 +192,7 @@ Temps pour Adams / Functional :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 7f58cd7..89f2f15 100644 (file)
@@ -286,7 +286,7 @@ Temps pour Adams / Functional :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index dacc09b..5cbb6e1 100644 (file)
@@ -58,7 +58,7 @@
             <emphasis>
                 y<subscript>n+1</subscript>
             </emphasis>
-             est déterminée par la valeur actuelle
+            est déterminée par la valeur actuelle
             <emphasis>
                 y<subscript>n</subscript>
             </emphasis>
@@ -250,7 +250,7 @@ Temps pour Runge-Kutta :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index f0eb1cb..059d602 100644 (file)
@@ -58,7 +58,7 @@
             <emphasis>
                 y<subscript>n+1</subscript>
             </emphasis>
-             est déterminée par la valeur actuelle
+            est déterminée par la valeur actuelle
             <emphasis>
                 y<subscript>n</subscript>
             </emphasis>
@@ -234,7 +234,7 @@ Temps pour Dormand-Prince :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 20b7aba..e027135 100644 (file)
@@ -290,7 +290,7 @@ Temps pour Runge-Kutta implicite :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 4e51218..bfc2f1f 100644 (file)
@@ -299,7 +299,7 @@ Temps pour Crank-Nicolson :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 9ef51f0..6690308 100644 (file)
@@ -194,7 +194,7 @@ try xcos_simulate(scs_m, 4); catch disp(lasterror()); end
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 72fb758..b38975d 100644 (file)
@@ -219,7 +219,7 @@ try xcos_simulate(scs_m, 4); catch disp(lasterror()); end
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 31e649a..1c05ece 100644 (file)
@@ -174,7 +174,7 @@ Temps sans recherche de racine :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>
index 2908dd3..178d33d 100644 (file)
@@ -899,7 +899,7 @@ Temps pour DDaskr - GMRes :
                 <link linkend="ode_discrete">ode_discrete</link>
             </member>
             <member>
-                <link linkend="ode_roots">ode_roots</link>
+                <link linkend="ode_root">ode_root</link>
             </member>
             <member>
                 <link linkend="odedc">odedc</link>