* Bug #12795 fixed - Cacsd doc: typo fixes 54/12354/3
Paul BIGNIER [Tue, 27 Aug 2013 10:12:10 +0000 (12:12 +0200)]
Change-Id: I9f65b647b151a339ef9f199e00ea4719bc8f0370

scilab/CHANGES_5.5.X
scilab/modules/cacsd/help/en_US/arsimul.xml
scilab/modules/cacsd/help/en_US/p_margin.xml
scilab/modules/cacsd/help/en_US/plot_display/phaseplot.xml
scilab/modules/cacsd/help/ja_JP/arsimul.xml
scilab/modules/cacsd/help/ja_JP/p_margin.xml
scilab/modules/cacsd/help/ja_JP/plot_display/phaseplot.xml

index 3d4f19f..1e326b7 100644 (file)
@@ -544,6 +544,8 @@ Bug fixes
 
 * Bug #12790 fixed - Links to zcos files in doc were broken.
 
+* Bug #12795 fixed - Typo fixes in Cacsd doc.
+
 * Bug #12800 fixed - Typo fix in Polynomials doc.
 
 * Bug #12808 fixed - Add missing </td> in doc generation (note, warning, ...).
index 852db54..9d4a388 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - JPC
- * 
+ *
  * 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
  *
  -->
@@ -70,8 +70,8 @@
                 <term>up, yp</term>
                 <listitem>
                     <para>
-                        optional parameter which describe the past.  <literal>up=[ u_0,u_{-1},...,u_{s-1}]</literal>; 
-                        <literal>yp=[ y_0,y_{-1},...,y_{r-1}];</literal>   <literal>ep=[ e_0,e_{-1},...,e_{r-1}]</literal>; 
+                        optional parameter which describe the past.  <literal>up=[ u_0,u_{-1},...,u_{s-1}]</literal>;
+                        <literal>yp=[ y_0,y_{-1},...,y_{r-1}];</literal>   <literal>ep=[ e_0,e_{-1},...,e_{r-1}]</literal>;
                         if they are omitted, the past value are supposed to be zero
                     </para>
                 </listitem>
     <refsection>
         <title>Description</title>
         <para>
-            simulation of an n-dimensional armax process 
+            simulation of an n-dimensional armax process
             <literal>A(z^-1) z(k)= B(z^-1)u(k) + D(z^-1)*sig*e(k)</literal>
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 A(z)= Id+a1*z+...+a_r*z^r;  ( r=0  => A(z)=Id)
 B(z)= b0+b1*z+...+b_s z^s;  ( s=-1 => B(z)=[])
 D(z)= Id+d1*z+...+d_t z^t;  ( t=0  => D(z)=Id)
@@ -104,12 +104,13 @@ D(z)= Id+d1*z+...+d_t z^t;  ( t=0  => D(z)=Id)
     <refsection>
         <title>Method</title>
         <para>
-            a state-space representation is constructed and ode with the option  "discr" is used to compute z
+            a state-space representation is constructed and an ode with the option
+            <literal>"discrete"</literal> is used to compute <literal>z</literal>.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 a=[1,-2.851,2.717,-0.865].*.eye(2,2)
 b=[0,1,1,1].*.[1;1];
 d=[1,0.7,0.2].*.eye(2,2);
@@ -119,5 +120,4 @@ u=rand(1,10,'normal');
 y=arsimul(ar,u)
  ]]></programlisting>
     </refsection>
-    
 </refentry>
index be89ba5..d70a6b6 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Serge STEER
- * 
+ *
  * 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[
 //continuous case
 h=syslin('c',-1+%s,3+2*%s+%s^2)
-[p,fr]=p_margin(h)  
-[p,fr]=p_margin(h+0.7)  
+[p,fr]=p_margin(h)
+[p,fr]=p_margin(h+0.7)
 show_margins(h+0.7,'nyquist')
 
 //discrete case
@@ -97,7 +97,7 @@ show_margins(h,'nyquist')
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="g_margin">p_margin</link>
+                <link linkend="g_margin">g_margin</link>
             </member>
             <member>
                 <link linkend="show_margins">show_margins</link>
index b6686f6..409f57d 100644 (file)
@@ -81,8 +81,8 @@
                 <listitem>
                     <para>an n x m array: the phases in degree corresponding to
                         <literal>frq</literal>. The <literal>phaseplot</literal>
-                        function plots the curves <literal>frq(i,:)</literal> versus
-                        <literal>phi(i,:)</literal> 
+                        function plots the curves <literal>phi(i,:)</literal> versus
+                        <literal>frq(i,:)</literal>
                     </para>
                 </listitem>
             </varlistentry>
@@ -91,8 +91,8 @@
                 <listitem>
                     <para>an n x m complex array. The
                         <literal>phaseplot</literal> function plots the curves
-                        <literal>frq(i,:)</literal> versus
-                        <literal>phase(repf(i,:))</literal> 
+                        <literal>phase(repf(i,:))</literal> versus
+                        <literal>frq(i,:)</literal>
                     </para>
                 </listitem>
             </varlistentry>
         <itemizedlist>
             <listitem>
                 <para>
-                    <literal>phaseplot(sl,...)</literal> case 
+                    <literal>phaseplot(sl,...)</literal> case
                 </para>
                 <para>
                     <literal>sl</literal> can be a continuous-time or discrete-time SIMO
                             a row vector or a 2D array <literal>frq</literal> which
                             gives the frequency values in Hz. 2D array can be used for
                             multi-output systems if one wants to have different frequency
-                            discretization for each input/output couple. 
+                            discretization for each input/output couple.
                         </para>
                     </listitem>
                 </itemizedlist>
             </listitem>
             <listitem>
                 <para>
-                    <literal>phaseplot(frq,...)</literal> case 
+                    <literal>phaseplot(frq,...)</literal> case
                 </para>
                 <para>
                     This case allows to draw frequency phase plots for previously
index 8a63467..34f5baf 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - JPC
- * 
+ *
  * 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
  *
  -->
@@ -70,8 +70,8 @@
                 <term>up, yp</term>
                 <listitem>
                     <para>
-                        前の値を記述するオプションのパラメータ.  <literal>up=[ u_0,u_{-1},...,u_{s-1}]</literal>; 
-                        <literal>yp=[ y_0,y_{-1},...,y_{r-1}];</literal>   <literal>ep=[ e_0,e_{-1},...,e_{r-1}]</literal>; 
+                        前の値を記述するオプションのパラメータ.  <literal>up=[ u_0,u_{-1},...,u_{s-1}]</literal>;
+                        <literal>yp=[ y_0,y_{-1},...,y_{r-1}];</literal>   <literal>ep=[ e_0,e_{-1},...,e_{r-1}]</literal>;
                         省略された場合, 前の値はゼロであると仮定されます.
                     </para>
                 </listitem>
@@ -92,7 +92,7 @@
             以下のn次元 armax プロセスのシミュレーションを行います,
             <literal>A(z^-1) z(k)= B(z^-1)u(k) + D(z^-1)*sig*e(k)</literal>
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 A(z)= Id+a1*z+...+a_r*z^r;  ( r=0  => A(z)=Id)
 B(z)= b0+b1*z+...+b_s z^s;  ( s=-1 => B(z)=[])
 D(z)= Id+d1*z+...+d_t z^t;  ( t=0  => D(z)=Id)
@@ -106,7 +106,7 @@ D(z)= Id+d1*z+...+d_t z^t;  ( t=0  => D(z)=Id)
         <title>手法</title>
         <para>
             状態空間表現が構築され,
-            odeにオプション "discr"を指定することにより,
+            odeにオプション "discrete"を指定することにより,
             zを計算することができます.
         </para>
     </refsection>
index c407366..db0420f 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Serge STEER
- * 
+ *
  * 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>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //連続時間系の場合
 h=syslin('c',-1+%s,3+2*%s+%s^2)
-[p,fr]=p_margin(h)  
-[p,fr]=p_margin(h+0.7)  
+[p,fr]=p_margin(h)
+[p,fr]=p_margin(h+0.7)
 show_margins(h+0.7,'nyquist')
 
 //離散時間系の場合
@@ -100,7 +100,7 @@ show_margins(h,'nyquist')
         <title>参照</title>
         <simplelist type="inline">
             <member>
-                <link linkend="g_margin">p_margin</link>
+                <link linkend="g_margin">g_margin</link>
             </member>
             <member>
                 <link linkend="show_margins">show_margins</link>
index 3bedf29..54e8dbe 100644 (file)
@@ -50,7 +50,7 @@
             <varlistentry>
                 <term>step</term>
                 <listitem>
-                    <para>実スカラー: 周波数離散化刻み (指数スケール)). 
+                    <para>実スカラー: 周波数離散化刻み (指数スケール)).
                         指定しない場合、このアルゴリズムは、
                         適用型周波数刻みを使用します.
                     </para>
@@ -73,7 +73,7 @@
             <varlistentry>
                 <term>db</term>
                 <listitem>
-                    <para>n x m 配列: 
+                    <para>n x m 配列:
                         <literal>frq</literal>に対応する大きさ. この引数が使用されない場合、
                         <literal>phaseplot</literal>は<literal>gainplot</literal>および
                         <literal>bode</literal>と同じ呼び出し手順となります.
@@ -86,7 +86,7 @@
                     <para>
                         n x m 配列:  <literal>frq</literal>に対応する位相[deg].
                         <literal>phaseplot</literal>関数は曲線
-                        <literal>frq(i,:)</literal> 対 <literal>phi(i,:)</literal>
+                        <literal>phi(i,:)</literal> 対 <literal>frq(i,:)</literal>
                         をプロットします.
                     </para>
                 </listitem>
@@ -96,8 +96,8 @@
                 <listitem>
                     <para>n x m 複素数配列.
                         <literal>phaseplot</literal> 関数は,曲線
-                        <literal>frq(i,:)</literal> 対
-                        <literal>phase(repf(i,:))</literal> をプロットします.
+                        <literal>phase(repf(i,:))</literal> 対
+                        <literal>frq(i,:)</literal> をプロットします.
                     </para>
                 </listitem>
             </varlistentry>
         <itemizedlist>
             <listitem>
                 <para>
-                    <literal>phaseplot(sl,...)</literal> の場合, 
+                    <literal>phaseplot(sl,...)</literal> の場合,
                 </para>
                 <para>
-                    <literal>sl</literal> 
+                    <literal>sl</literal>
                     は連続系または離散系SIMOとすることができます.
                     多出力の場合,出力は異なる記号でプロットされます.
                 </para>
                         <para>
                             上限および下限周波数[Hz]
                             <literal>fmin</literal>, <literal>fmax</literal>および
-                            周波数刻み(オプション) <literal>step</literal>. 
+                            周波数刻み(オプション) <literal>step</literal>.
                             <literal>fmin</literal> および
                             <literal>fmax</literal>のデフォルト値は,
                             <literal>sl</literal>が連続系の場合
             </listitem>
             <listitem>
                 <para>
-                    <literal>phaseplot(frq,...)</literal> の場合 
+                    <literal>phaseplot(frq,...)</literal> の場合
                 </para>
                 <para>
                     この場合,事前に計算された周波数応答により周波数位相プロットを