Help: fix examples displaying an 'Invalid factor' error 63/17863/2
Paul Bignier [Tue, 8 Mar 2016 15:09:32 +0000 (16:09 +0100)]
 * Also removed useless lines in some files

Change-Id: I3eaba294a3b0269e0d62d43599ec624c16c1d4c4

scilab/modules/differential_equations/help/en_US/dae.xml
scilab/modules/differential_equations/help/fr_FR/dae.xml
scilab/modules/differential_equations/help/ja_JP/dae.xml
scilab/modules/differential_equations/help/ru_RU/dae.xml
scilab/modules/elementary_functions/help/ja_JP/signalprocessing/sysconv.xml
scilab/modules/signal_processing/help/fr_FR/transforms/fft.xml
scilab/modules/signal_processing/help/ja_JP/transforms/fft.xml

index 8cc8b45..14740c7 100644 (file)
@@ -489,7 +489,7 @@ x(t0) = x0 and xdot(t0) = xdot0
         </para>
         <programlisting role="example"><![CDATA[
 // Example with Scilab code
---------------------------------------------------
+//--------------------------------------------------
 function [r, ires] = chemres(t, y, yd)
     r(1) = -0.04*y(1) + 1d4*y(2)*y(3) - yd(1);
     r(2) =  0.04*y(1) - 1d4*y(2)*y(3) - 3d7*y(2)*y(2) - yd(2);
@@ -518,7 +518,7 @@ y = dae([x0, xd0], 0, 4d10, chemres, chemjac); // With jacobian
         </para>
         <programlisting role="example"><![CDATA[
 // Example with C code (C compiler needed)
---------------------------------------------------
+//--------------------------------------------------
 bOK = haveacompiler();
 if bOK <> %t
     [btn] = messagebox(["You need a C compiler for this example."; "Execution of this example is canceled."], "Software problem", 'info');
@@ -616,7 +616,7 @@ cd(previous_dir);
         </para>
         <programlisting role="example"><![CDATA[
 // Example with C code (C compiler needed)
---------------------------------------------------
+//--------------------------------------------------
 bOK = haveacompiler();
 if bOK <> %t
     [btn] = messagebox(["You need a C compiler for this example."; "Execution of this example is canceled."], "Software problem", 'info');
index 0c70ff6..f273c67 100644 (file)
@@ -485,7 +485,7 @@ x(t0) = x0 and xdot(t0) = xdot0
         </para>
         <programlisting role="example"><![CDATA[
 // Exemple avec du code Scilab
---------------------------------------------------
+//--------------------------------------------------
 function [r, ires] = chemres(t, y, yd)
     r(1) = -0.04*y(1) + 1d4*y(2)*y(3) - yd(1);
     r(2) =  0.04*y(1) - 1d4*y(2)*y(3) - 3d7*y(2)*y(2) - yd(2);
@@ -514,7 +514,7 @@ y = dae([x0, xd0], 0, 4d10, chemres, chemjac); // Avec jacobien
         </para>
         <programlisting role="example"><![CDATA[
 // Exemple avec du code C (compilateur C requis)
---------------------------------------------------
+//--------------------------------------------------
 bOK = haveacompiler();
 if bOK <> %t
     [btn] = messagebox(["Vous avez besoin nd'un compilateur C pour cet exemple."; "Arrêt de l'exécution."], "Problème de Software", 'info');
@@ -612,7 +612,7 @@ cd(previous_dir);
         </para>
         <programlisting role="example"><![CDATA[
 // Exemple avec du code C (compilateur C requis)
---------------------------------------------------
+//--------------------------------------------------
 bOK = haveacompiler();
 if bOK <> %t
     [btn] = messagebox(["Vous avez besoin nd'un compilateur C pour cet exemple."; "Arrêt de l'exécution."], "Problème de Software", 'info');
index 0549230..84addf0 100644 (file)
  -->
 
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="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="dae" xml:lang="ja">
-    
     <refnamediv>
-        
         <refname>dae</refname>
-        
         <refpurpose>微分代数方程式ソルバ</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis> y = dae(initial, t0, t, res)
-            
             [y [,hd]] = dae(initial, t0, t [[,rtol], atol], res [,jac] [,hd])
-            
             [y, rd] = dae("root", initial, t0, t, res, ng, surface)
-            
             [y, rd [,hd]] = dae("root", initial, t0, t [[,rtol], atol], res [,jac], ng, surface [,hd])
-            
             [y, rd] = dae("root2", initial, t0, t, res, ng, surface)
-            
             [y, rd [,hd]] = dae("root2", initial, t0, t [[,rtol], atol], res [,jac], ng, surface [, psol, pjac] [, hd])
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
     <refsection>
-        
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>initial</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         列ベクトル. <literal>x0 </literal>または
-                        
                         <literal>[x0;xdot0]</literal> とします.
-                        
                         ただし, <literal>x0</literal>は
-                        
                         初期時刻<literal>t0</literal>における状態量の値,
-                        
                         <literal>ydot0</literal>は状態量の微分の初期値
-                        
                         またはその推定値(下記参照)です.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>t0</term>
-                
                 <listitem>
-                    
                     <para>実数, 初期時刻.</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>t</term>
-                
                 <listitem>
-                    
                     <para>実数のスカラーまたはベクトル. 解を計算する時刻を指定します.
-                        
                         <literal>
-                            
                             <link linkend="daeoptions">%DAEOPTIONS</link>(2)=1
-                            
                         </literal>
-                        
                         と設定することにより
-                        
                         DAEの各ステップで解が得られることに注意してください.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>atol</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         実数のスカラーまたは<literal>x0</literal>と同じ大きさの
-                        
                         列ベクトル. 解の絶対許容誤差.
-                        
                         <literal>atol</literal>がベクトルの場合,
-                        
                         状態量の各要素毎に許容誤差が指定されます.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>rtol</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         実数のスカラーまたは<literal>x0</literal>と同じ大きさの
-                        
                         列ベクトル. 解の相対許容誤差.
-                        
                         <literal>rtol</literal>がベクトルの場合,
-                        
                         状態量の各要素毎に許容誤差が指定されます.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>res</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         <link linkend="external" role="" version="">外部ルーチン</link>.
-                        
                         <literal>g(t,y,ydot)</literal>の値を計算します. 以下のようになります
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>Scilab関数</term>
-                            
                             <listitem>
-                                
                                 <para>この場合, その呼出し手順を
-                                    
                                     <literal>[r,ires]=res(t,x,xdot)</literal> とする
-                                    
                                     必要があり,<literal>res</literal> は
-                                    
                                     残差<literal>r=g(t,x,xdot)</literal> とエラーフラグ
-                                    
                                     <literal>ires</literal>を返す必要があります.
-                                    
                                     <literal>res</literal>が<literal>r</literal>の計算に
-                                    
                                     成功した場合には<literal>ires = 0</literal>,
-                                    
                                     <literal>(t,x,xdot)</literal>のローカルな残差が定義されない
-                                    
                                     場合には <literal>=-1</literal>,
-                                    
                                     パラメータが許容範囲外の場合は <literal>=-2</literal> となります.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>リスト</term>
-                            
                             <listitem>
-                                
                                 <para>外部ルーチンのこの形式は
-                                    
                                     関数にパラメータを指定する際に使用されます.
-                                    
                                     以下のような形式とします:
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 list(res,p1,p2,...)
  ]]></programlisting>
-                                
                                 <para>
-                                    
                                     ただし,ここで関数<literal>res</literal>の呼び出し手順は以下のようになります
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 r=res(t,y,ydot,p1,p2,...)
  ]]></programlisting>
-                                
                                 <para>
-                                    
                                     この場合も<literal>res</literal> は
-                                    
                                     <literal>(t,x,xdot,x1,x2,...)</literal>の関数として残差の値を返し,
-                                    
                                     p1,p2,... は関数のパラメータです.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>文字列</term>
-                            
                             <listitem>
-                                
                                 <para>CまたはFortranルーチンの名前を指します.
-                                    
                                     &lt;r_name&gt; が指定した名前であると仮定します.
-                                    
                                 </para>
-                                
                                 <itemizedlist>
-                                    
                                     <listitem>
-                                        
                                         <para>Fortranの呼出し手順は以下のようにします</para>
-                                        
                                         <para>
-                                            
                                             <literal>&lt;r_name&gt;(t,x,xdot,res,ires,rpar,ipar)</literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>double precision
-                                                
                                                 t,x(*),xdot(*),res(*),rpar(*)
-                                                
                                             </literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>integer ires,ipar(*)</literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>Cの呼出し手順は以下のようにします</para>
-                                        
                                         <para>C2F(&lt;r_name&gt;)(double *t, double *x, double
-                                            
                                             *xdot, double *res, integer *ires, double *rpar, integer
-                                            
                                             *ipar)
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                 </itemizedlist>
-                                
                                 <para>ただし,</para>
-                                
                                 <itemizedlist>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>t</literal> はカレントの時刻
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>x</literal>は状態量の配列
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>xdot</literal> は状態量の微分の配列
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>res は残差の配列</para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>ires</literal>は実行インジケータ
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>rpar</literal> は浮動小数点数の
-                                            
                                             パラメータ値の配列で, 必要ですが <literal>dae</literal> 関数により
-                                            
                                             設定できないもの
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>ipar</literal> は整数の
-                                            
                                             パラメータ値の配列で, 必要ですが <literal>dae</literal> 関数により
-                                            
                                             設定できないもの
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                 </itemizedlist>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>jac</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         <link linkend="external">外部ルーチン</link>.
-                        
                         指定したパラメータの値 <literal>cj</literal>を用いて
-                        
                         <literal>dg/dx+cj*dg/dxdot</literal>の値を計算します. 以下のようになります
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>Scilab関数</term>
-                            
                             <listitem>
-                                
                                 <para>呼出し手順を
-                                    
                                     <literal>r=jac(t,x,xdot,cj)</literal> とする
-                                    
                                     必要があり,
-                                    
                                     <literal>jac</literal>関数は
-                                    
                                     <literal>r=dg(t,x,xdot)/dy+cj*dg(t,x,xdot)/dxdot</literal>
-                                    
                                     を返す必要があります.
-                                    
                                     ただし,<literal>cj</literal>は実数スカラーです.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>リスト</term>
-                            
                             <listitem>
-                                
                                 <para>外部ルーチンのこの形式は
-                                    
                                     関数にパラメータを指定する際に使用されます.
-                                    
                                     以下のような形式とします:
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 list(jac,p1,p2,...)
  ]]></programlisting>
-                                
                                 <para>
-                                    
                                     ただしこの場合の関数<literal>jac</literal>の呼び出し手順は
-                                    
                                     以下となります
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 r=jac(t,x,xdot,p1,p2,...)
  ]]></programlisting>
-                                
                                 <para>
-                                    
                                     この場合でも<literal>jac</literal> は,
-                                    
                                     <literal>(t,x,xdot,cj,p1,p2,...)</literal>の関数として
-                                    
                                     <literal>dg/dx+cj*dg/dxdot</literal>を返します.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>文字列</term>
-                            
                             <listitem>
-                                
                                 <para>CまたはFortranルーチンの名前を指します.
-                                    
                                     &lt;j_name&gt; が指定した名前であると仮定します.
-                                    
                                 </para>
-                                
                                 <itemizedlist>
-                                    
                                     <listitem>
-                                        
                                         <para>Fortranの呼出し手順は以下のようにします</para>
-                                        
                                         <para>
-                                            
                                             <literal>&lt;j_name&gt;(t, x, xdot, r, cj, ires,
-                                                
                                                 rpar, ipar)
-                                                
                                             </literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>double precision t, x(*), xdot(*), r(*),
-                                                
                                                 ci, rpar(*)
-                                                
                                             </literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>integer ires, ipar(*)</literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>Cの呼出し手順は以下のようにします</para>
-                                        
                                         <para>C2F(&lt;j_name&gt;)(double *t, double *x, double
-                                            
                                             *xdot, double *r, double *cj,
-                                            
                                         </para>
-                                        
                                         <para>integer *ires, double *rpar, integer *ipar)</para>
-                                        
                                     </listitem>
-                                    
                                 </itemizedlist>
-                                
                                 <para>
-                                    
                                     ただし <literal>t</literal>, x, xdot, ires, rpar, ipar
-                                    
                                     は上記と似た定義を有し, r は配列の結果です.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>surface</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         <link linkend="external">外部ルーチン</link>.
-                        
                         <literal>ng</literal>個の要素を有する列ベクトル
-                        
                         <literal>surface(t,x)</literal>の値を計算します.
-                        
                         各要素は面(surface)を定義します.
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>Scilab関数</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     その呼び出し手順は<literal>r=surface(t,x)</literal>とする
-                                    
                                     必要があり,この関数は <literal>ng</literal>個の要素を有する
-                                    
                                     ベクトルを返す必要があります.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>リスト</term>
-                            
                             <listitem>
-                                
                                 <para>外部ルーチンのこの形式は
-                                    
                                     関数にパラメータを指定する際に使用されます.
-                                    
                                     以下のような形式とします:
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 list(surface,p1,p2,...)
  ]]></programlisting>
-                                
                                 <para>
-                                    
                                     ただしこの場合の関数<literal>surface</literal>の呼び出し手順は
-                                    
                                     以下となります
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 r=surface(t,x,p1,p2,...)
  ]]></programlisting>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>文字列</term>
-                            
                             <listitem>
-                                
                                 <para>CまたはFortranルーチンの名前を指します.
-                                    
                                     &lt;s_name&gt; が指定した名前であると仮定します,
-                                    
                                 </para>
-                                
                                 <itemizedlist>
-                                    
                                     <listitem>
-                                        
                                         <para>Fortranの呼出し手順は以下のようにします</para>
-                                        
                                         <para>
-                                            
                                             <literal>&lt;r_name&gt;(nx, t, x, ng, r, rpar,
-                                                
                                                 ipar)
-                                                
                                             </literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>double precision t, x(*), r(*),
-                                                
                                                 rpar(*)
-                                                
                                             </literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>integer nx, ng,ipar(*)</literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>Cの呼出し手順は以下のようにします</para>
-                                        
                                         <para>C2F(&lt;r_name&gt;)(double *t, double *x, double
-                                            
                                             *xdot, double *r, double *cj,
-                                            
                                         </para>
-                                        
                                         <para>integer *ires, double *rpar, integer *ipar)</para>
-                                        
                                     </listitem>
-                                    
                                 </itemizedlist>
-                                
                                 <para>
-                                    
                                     ただし,<literal>t</literal>, x, rpar, ipar は
-                                    
                                     上記と同じ定義を有し,<literal>ng </literal> は
-                                    
                                     surfacesの数, <literal>nx</literal> は状態量の次元,
-                                    
                                     r は結果の配列です.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>rd</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         2個のエントリ <literal>[times num]</literal>を有するベクトル.
-                        
                         <literal>times</literal> は面が交差した時刻の値,
-                        
                         <literal>num</literal> は交差した面の数です
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>pjac</term>
-                
                 <listitem>
-                    
                     <para>
-                        
-                        外部 (関数, リストまたは文字列). 
-                        
+                        外部 (関数, リストまたは文字列).
                         <link linkend="daskr">daskr</link>参照.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>psol</term>
-                
                 <listitem>
-                    
                     <para>
-                        
-                        外部 (関数, リストまたは文字列). 
-                        
+                        外部 (関数, リストまたは文字列).
                         <link linkend="daskr">daskr</link>参照.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>hd</term>
-                
                 <listitem>
-                    
                     <para>実数のベクトル,
-                        
                         <literal>dae</literal> コンテキストを保持する出力.
-                        
                         (ホットスタートで)積分を再開するための入力引数として使用可能です.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>y</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         実数の行列.
-                        
                         <literal>
-                            
                             <link linkend="daeoptions">%DAEOPTIONS</link>(2)=1
-                            
                         </literal>
-                        
                         の場合, 各列
-                        
                         はベクトル <literal>[t;x(t);xdot(t)]</literal> です.
-                        
                         ただし, <literal>t</literal> は解が計算された時刻です.
-                        
                         それ以外の場合, <literal>y</literal> はベクトル
-                        
                         <literal>[x(t);xdot(t)]</literal>です.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>説明</title>
-        
         <para>
-            
             <literal>dae</literal> 関数は,
-            
             陰的な微分方程式積分用に設計された
-            
             <link linkend="dassl">dassl</link> および <link linkend="dasrt">dasrt</link>
-            
             関数の上位に構築されたゲートウエイです.
-            
         </para>
-        
         <para>
-            
             オプション <literal>"root"</literal> は
-            
             <link linkend="dasrt">dasrt</link> ルーチンをコールし,
-            
             <literal>"root2"</literal> は <link linkend="dasrt">daskr</link>をコールします.
-            
         </para>
-        
         <programlisting role="no-scilab-exec"><![CDATA[
 g(t,x,xdot)=0
 x(t0)=x0  および   xdot(t0)=xdot0
  ]]></programlisting>
-        
         <para>
-            
             <emphasis>initial</emphasis>引数に<literal>xdot0</literal> が指定されない場合,
-            
             <literal>dae</literal>関数は <literal>g(t,x0,xdot0)=0</literal>
-            
             を解くことによりこれを計算しようとします.
-            
         </para>
-        
         <para>
-            
             <literal>xdot0</literal> が <emphasis>initial</emphasis>引数で指定された場合,
-            
             <literal>g(t,x0,xdot0)=0</literal>を満たす互換性がある微係数または近似値の
-            
             どちらかとなります.
-            
             後者の場合,
-            
             <literal>
-                
                 <link linkend="daeoptions">%DAEOPTIONS</link>(7)
-                
             </literal>
-            
             を 1 に設定する必要があります.
-            
         </para>
-        
         <para>Scilab および C でコーディングされた外部ルーチンを使用する詳細な例については,
-            
-            <literal>modules/differential_equations/tests/unit_tests/dassldasrt.tst</literal> 
-            
+            <literal>modules/differential_equations/tests/unit_tests/dassldasrt.tst</literal>
             および
-            
             <literal>modules/differential_equations/tests/unit_tests/daskr.tst</literal>
-            
             で提供されています.
-            
         </para>
-        
     </refsection>
-    
     <refsection>
-        
         <title>例</title>
-        
         <para>
-            
             例 #1: dassl (求解なし)
-            
         </para>
-        
         <programlisting role="example"><![CDATA[
 // Scilabコードを使用する例
 function [r,ires]=chemres(t,y,yd)
@@ -941,13 +498,9 @@ y=dae([x0,xd0],0,t,chemres);// 指定した観測時刻での点を返す
 y=dae([x0,xd0],0,4d10,chemres); // ヤコビアン指定なし
 y=dae([x0,xd0],0,4d10,chemres,chemjac); // ヤコビアン指定あり
  ]]></programlisting>
-        
         <para>
-            
             例 #2: dasrt ("root")
-            
         </para>
-        
         <programlisting role="example"><![CDATA[
 // C コードの例 (Cコンパイラが必要) --------------------------------------------------
 bOK = haveacompiler();
@@ -995,7 +548,6 @@ plot(yy(1,1),yy(2,1),'r+')
 xstring(yy(1,1)+0.1,yy(2,1),string(nn(1)));
 cd(previous_dir);
  ]]></programlisting>
-        
         <scilab:image localized="false"><![CDATA[
 code = ['#include <math.h>'
       'void res22(double *t, double *y, double *yd, double *res, int *ires, double *rpar, int *ipar)'
@@ -1035,16 +587,12 @@ plot(yy(1, 1), yy(2, 1), 'r+')
 xstring(yy(1, 1)+0.1, yy(2, 1), string(nn(1)));
 cd(previous_dir);
  ]]></scilab:image>
-        
         <para>
-            
             例 #3: daskr ("root2"), デフォルトの 'psol' および 'pjac' ルーチンを使用
-            
         </para>
-        
         <programlisting role="example"><![CDATA[
 // Example with C code (C compiler needed)
---------------------------------------------------
+//--------------------------------------------------
 bOK = haveacompiler();
 if bOK <> %t
     [btn] = messagebox(["You need a C compiler for this example."; "Execution of this example is canceled."], "Software problem", 'info');
@@ -1099,7 +647,6 @@ plot(yy(1, 1), yy(2, 1), 'r+')
 xstring(yy(1, 1)+0.1, yy(2, 1), string(nn(1)));
 cd(previous_dir);
  ]]></programlisting>
-        
         <scilab:image><![CDATA[
 code = ['#include <math.h>'
       'void res22(double *t, double *y, double *yd, double *res, int *ires, double *rpar, int *ipar)'
@@ -1140,72 +687,37 @@ plot(yy(1, 1), yy(2, 1), 'r+')
 xstring(yy(1, 1)+0.1, yy(2, 1), string(nn(1)));
 cd(previous_dir);
  ]]></scilab:image>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="ode">ode</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="daeoptions">daeoptions</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="dassl">dassl</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="dasrt">dasrt</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="daskr">daskr</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="impl">impl</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="fort">fort</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="link">link</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="external">external</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
 </refentry>
-
index 17df03d..181b094 100644 (file)
@@ -502,7 +502,7 @@ y=dae([x0,xd0],0,4d10,chemres,chemjac); // с якобианом
  ]]></programlisting>
         <programlisting role="example"><![CDATA[
 //пример с кодом C (необходим C-компилятор)
---------------------------------------------------
+//--------------------------------------------------
 bOK=haveacompiler();
 if bOK<>%t
     [btn] = messagebox(["Для этого примера Вам необходим C-компилятор.";"Выполнение этого примера отменено."], "Проблема с программным обеспечением", 'info');
index 7c65ac0..6d9cd94 100644 (file)
@@ -3,7 +3,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  -->
 
 <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="sysconv" xml:lang="ja">
-    
     <refnamediv>
-        
         <refname>sysconv</refname>
-        
         <refpurpose>システム変換</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>[s1,s2]=sysconv(s1,s2)</synopsis>
-        
     </refsynopsisdiv>
-    
     <refsection>
-        
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>s1,s2</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         リスト (線形システム <literal>syslin</literal> )
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>説明</title>
-        
         <para>
-            
             <literal>s1</literal> および <literal>s2</literal> を
-            
             システムの相互接続処理を行うために共通の表現に変換します.
-            
             変換規則は以下の表で指定されています.
-            
         </para>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>"c"</term>
-                
                 <listitem>
-                    
                     <para>連続時間システム</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>"d"</term>
-                
                 <listitem>
-                    
                     <para>離散時間システム</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>n</term>
-                
                 <listitem>
-                    
                     <para>サンプル周期nのサンプル化システム</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>[]</term>
-                
                 <listitem>
-                    
                     <para>未定義の時間領域を有するシステム.
-                        
                         混合システムの場合,
-                        
                         <literal>s1</literal> および <literal>s2</literal> は
-                        
                         状態空間表現に変換されます.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
  s1\s2 |    "c"     |     "d"     |      n2        |     []     |
  ---------------------------------------------------------------
  "c"   | nothing    |uncompatible | c2e(s1,n2)     |  c(s2)     |
  []    | c(s1)      | d(s1)       | e(s1,n2)       |  nothing   |
  ---------------------------------------------------------------
   ]]></programlisting>
-        
         <para>以下のような意味があります:</para>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>n1,n2</term>
-                
                 <listitem>
-                    
                     <para>サンプリング周期</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>c2e(s,n)</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         連続時間システム sをサンプリング周期nの
-                        
                         離散システムに変換.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>c(s)</term>
-                
                 <listitem>
-                    
                     <para>連続システムに変換 (時間領域は
-                        
                         <literal>"c"</literal>)
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>d(s)</term>
-                
                 <listitem>
-                    
                     <para>離散システムに変換 (時間領域は
-                        
                         <literal>"d"</literal>)
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>e(s,n)</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         周期<literal>n</literal>のサンプル化システムに変換
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 s1=ssrand(1,1,2);
 s2=ss2tf(s1);
 [s1,s2]=sysconv(s1,s2);
  ]]></programlisting>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="syslin">syslin</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="ss2tf">ss2tf</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="tf2ss">tf2ss</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
 </refentry>
-
index c990776..26da883 100644 (file)
@@ -3,7 +3,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 1997   - INRIA
  * Copyright (C) 2012 - Serge Steer - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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:mml="http://www.w3.org/1998/Math/MathML" 
-          xmlns:db="http://docbook.org/ns/docbook" 
+<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="fr" xml:id="fft">
     <refnamediv>
         <refname>fft</refname>
                                 Par exemple si, <literal>A</literal> est un tableau 3-D,
                                 <literal>X=fft(A,-1,2)</literal> est équivalent à:
                             </para>
-                            <programlisting role=""><![CDATA[ 
+                            <programlisting role=""><![CDATA[
               for i1=1:size(A,1)
               for i3=1:size(A,3)
               X(i1,:,i3)=fft(A(i1,:,i3),-1);
                             <para>
                                 et <literal>X=fft(A,-1,[1 3])</literal> est équivalent à:
                             </para>
-                            <programlisting role=""><![CDATA[ 
+                            <programlisting role=""><![CDATA[
               for i2=1:size(A,2)
               X(:,i2,:)=fft(A(:,i2,:),-1);
               end
                 qui a pour dimensions <literal>n1</literal>, ...,
                 <literal>np</literal> est symétrique conjugué pour la fft si
                 et seulement si <literal>B==conj(B([1 n1:-1:2],[1
-                    n2:-1:2],...,[1 np:-1:2])) 
+                    n2:-1:2],...,[1 np:-1:2]))
                 </literal>
                 .Dans un tel cas le
                 résultat de la fft est réel et un algorithme spécifique
                         fft suivants correspondants aux mêmes dimensions et mêmes
                         options.
                     </para>
-                    <para> 
+                    <para>
                         Les fonctions <link
              linkend="get_fftw_wisdom">get_fftw_wisdom</link>, <link
              linkend="set_fftw_wisdom">set_fftw_wisdom</link>
     <refsection>
         <title>Examples</title>
         <para>1-D fft</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Composantes fréquentielles d'un signal
 //----------------------------------
-// Construction d'un signal bruité échantilloné à 1000hz 
+// Construction d'un signal bruité échantilloné à 1000hz
 //        contenant deux fréquences pures à  50 et 70 Hz.
 sample_rate=1000;
 t = 0:1/sample_rate:0.6;
 N=size(t,'*'); //nombre d'échantillons
 s=sin(2*%pi*50*t)+sin(2*%pi*70*t+%pi/4)+grand(1,N,'nor',0,1);
-  
+
 y=fft(s);
 //y est symétrique, on ne garde que  N/2 points
 f=sample_rate*(0:(N/2))/N; //vecteur de fréquences associé
@@ -382,8 +382,8 @@ plot(f,abs(y(1:n)))
     ]]></programlisting>
         
         <para>2-D fft</para>
-        <programlisting role="example"><![CDATA[ 
-----------------------------------
+        <programlisting role="example"><![CDATA[
+//----------------------------------
 A = zeros(256,256);
 A(5:24,13:17) = 1;
 X = fftshift(fft(A));
@@ -391,7 +391,7 @@ set(gcf(),"color_map",jetcolormap(128));
 clf;grayplot(0:255,0:255,abs(X)')
      ]]></programlisting>
         <para>mupliple fft</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //simple case, 3 1-D fft at a time
 N=2048;
 t=linspace(0,10,2048);
@@ -413,7 +413,7 @@ y=fft(A,-1,[2 4 5]);
 
 //equivalent (but less efficient code)
 y1=zeros(A);
-for i1=1:Dims(1) 
+for i1=1:Dims(1)
   for i3=1:Dims(3)
     ind=list(i1,:,i3,:,:);
     y1(ind(:))=fft(A(ind(:)),-1);
@@ -421,7 +421,7 @@ for i1=1:Dims(1)
 end
    ]]></programlisting>
         
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Définition directe de la transformée de Fourier discrete
 //--------------------------------------------------------
 function xf=DFT(x,flag);
@@ -440,7 +440,7 @@ endfunction
 //Comparaison avec l'algorithme de la transformée rapide:
 a=rand(1,1000);
 norm(DFT(a,1) - fft(a,1))
-norm(DFT(a,-1) - fft(a,-1)) 
+norm(DFT(a,-1) - fft(a,-1))
 
 timer();DFT(a,-1);timer()
 timer();fft(a,-1);timer()
index 7721a17..39d2df6 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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="fft">
-    
     <refnamediv>
-        
         <refname>fft</refname>
-        
         <refpurpose>高速フーリエ変換</refpurpose>
-        
     </refnamediv>
-    
     <refnamediv xml:id="ifft">
-        
         <refname>ifft</refname>
-        
         <refpurpose>高速フーリエ逆変換</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>X=fft(A [,sign] [,option])
-            
             X=fft(A,sign,selection  [,option])
-            
             X=fft(A,sign,dims,incr [,option] )
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
     <refsection>
-        
         <title>パラメータ</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>A</term>
-                
                 <listitem>
-                    
                     <para>
-                        
-                        実数または複素数ベクトル, 
-                        
+                        実数または複素数ベクトル,
                         実数または複素数配列(ベクトル, 行列またはN-D配列).
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>X</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         <literal>A</literal>と同じ形状の実数または複素数配列
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>sign</term>
-                
                 <listitem>
-                    
                     an integer. with possible values <literal>1</literal> or
-                    
                     <literal>-1</literal>. Select direct or inverse
-                    
                     transform. The default value is <literal>-1</literal>
-                    
                     (direct transform).
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>option</term>
-                
                 <listitem>
-                    
                     文字列. 指定可能な値は
-                    
                     <literal>"symmetric"</literal> または
-                    
-                    <literal>"nonsymmetric"</literal>です. 
-                    
+                    <literal>"nonsymmetric"</literal>です.
                     <literal>A</literal>が対称かどうかを示します.
-                    
                     この引数が省略された場合,アルゴリズムは
-                    
                     <literal>A</literal>が対称かどうかを自動的に定義します.
-                    
                     詳細は説明のパートを参照ください.
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>selection</term>
-                
                 <listitem>
-                    
                     <literal>A</literal> 配列の次元の添字を有するベクトル.
-                    
-                    詳細は説明のパートを参照ください.            
-                    
+                    詳細は説明のパートを参照ください.
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>dims</term>
-                
                 <listitem>
-                    
                     整数値を有する正の数のベクトルまたは正の整数値のベクトル.
-                    
-                    詳細は説明のパートを参照ください.            
-                    
+                    詳細は説明のパートを参照ください.
                     <para>
-                        
                         各要素は<literal>A</literal>の要素の総数の約数とする
-                        
                         必要があります.
-                        
                     </para>
-                    
                     <para>
-                        
                         要素の積は<literal>A</literal>の全要素数より
-                        
                         少ない必要があります.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>incr</term>
-                
                 <listitem>
-                    
                     整数値を有する正の数のベクトルまたは正の整数値のベクトル.
-                    
-                    詳細は説明のパートを参照ください.            
-                    
+                    詳細は説明のパートを参照ください.
                     <para>
-                        
                         <literal>incr</literal> は,
-                        
                         <literal>dims</literal>と同じ要素数とする必要があります.
-                        
                     </para>
-                    
                     <para>
-                        
                         各要素は
-                        
                         <literal>A</literal>の全要素数の約数とする必要があります.
-                        
                     </para>
-                    
                     <para>
-                        
                         <literal>incr</literal>要素は厳密に昇順とする必要があります.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>説明</title>
-        
         この関数は直接または逆の1次元またはN次元離散フーリエ変換を
-        
         行います.
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>短縮構文 </term>
-                
                 <listitem>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>直接</term>
-                            
                             <listitem>
-                                
                                 <literal>X=fft(A,-1 [,option])</literal> または
-                                
                                 <literal>X=fft(A [,option])</literal>
-                                
                                 は直接変換を出力します.
-                                
                                 <variablelist>
-                                    
                                     <varlistentry>
-                                        
                                         <term>単一変量</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 <literal>A</literal> が単一変量のベクトルの場合,
-                                                
                                                 次のように直接FFTが計算されます:
-                                                
                                             </para>
-                                            
                                             <para>
-                                                
                                                 <latex>
-                                                    
                                                     $x(k) = \sum_{m=1}^n {a(m)*e^{-\frac{2i*\pi}{n}(m-1) (k-1)}$
-                                                    
                                                 </latex>
-                                                
                                             </para>
-                                            
                                             <para>
-                                                
-                                                (引数<literal>-1</literal>は指数の符号を示しており, 
-                                                
+                                                (引数<literal>-1</literal>は指数の符号を示しており,
                                                 "逆"ではありません),
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
-                                    
-                                    
                                     <varlistentry>
-                                        
                                         <term>多変量</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 <literal>A</literal>が行列または多次元配列の場合,
-                                                
                                                 多変量直接FFTが行われます.
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                 </variablelist>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>逆</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     <literal>X=fft(A,1)</literal>または
-                                    
                                     <literal>X=ifft(A)</literal> は,
-                                    
                                     <literal>A==ifft(fft(A))</literal>のような
-                                    
                                     正規化された逆変換を実行します.
-                                    
                                 </para>
-                                
                                 <variablelist>
-                                    
                                     <varlistentry>
-                                        
                                         <term>単一変量</term>
-                                        
                                         <listitem>
-                                            
                                             <literal>A</literal> がベクトルの場合,
-                                            
-                                            単一変量逆FFTが実行されます. 
-                                            
+                                            単一変量逆FFTが実行されます.
                                             <para>
-                                                
                                                 <latex>
-                                                    
                                                     $x(k) = \sum_{m=1}^n
-                                                    
                                                     {a(m)*e^{+\frac{2i*\pi}{n} (m-1) (k-1)}$
-                                                    
                                                 </latex>
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>多変量</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 <literal>A</literal>が行列または多次元配列の場合,
-                                                
                                                 多変量逆FFTが実行されます.
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                 </variablelist>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>多次元FFTの長い構文</term>
-                
                 <listitem>
-                    
                     <itemizedlist>
-                        
                         <listitem>
-                            
                             <para>
-                                
                                 <literal>X=fft(A,sign,selection [,option])</literal>
-                                
                                 により,選択した次元方向の<literal>A</literal>の
-                                
                                 "スライス"の直接または逆fftを効率的に実行することができます.
-                                
                             </para>
-                            
                             <para>
-                                
                                 例えば,<literal>A</literal> が3次元配列の場合,
-                                
                                 <literal>X=fft(A,-1,2)</literal>は以下と等価です:
-                                
                             </para>
-                            
                             <programlisting role=""><![CDATA[
 for i1=1:size(A,1)
   for i3=1:size(A,3)
@@ -403,198 +204,103 @@ for i1=1:size(A,1)
   end
 end
               ]]></programlisting>
-                            
                             <para>
-                                
                                 <literal>X=fft(A,-1,[1 3])</literal>は以下と等価です:
-                                
                             </para>
-                            
                             <programlisting role=""><![CDATA[
 for i2=1:size(A,2)
   X(:,i2,:)=fft(A(:,i2,:),-1);
 end
               ]]></programlisting>
-                            
                         </listitem>
-                        
                         <listitem>
-                            
                             <para>
-                                
                                 前記の構文,
-                                
                                 <literal>X=fft(A,sign,dims,incr [,option])</literal> は,
-                                
                                 指定した次元方向に <literal>A</literal>のスライスの
-                                
                                 直接または逆fftを行うことも可能です.
-                                
                             </para>
-                            
                             <para>
-                                
                                 例えば, <literal>A</literal> が
-                                
                                 <literal>n1*n2*n3</literal> 個の要素を有する配列の場合,
-                                
                                 <literal>X=fft(A,-1,n1,1)</literal> は
-                                
                                 <literal>X=fft(matrix(A,[n1,n2,n3]),-1,1)</literal>
-                                
                                 と等価です.
-                                
                                 また、<literal>X=fft(A,-1,[n1 n3],[1 n1*n2])</literal>
-                                
                                 は
-                                
                                 <literal>X=fft(matrix(A,[n1,n2,n3]),-1,[1,3])</literal>
-                                
                                 と等価です.
-                                
                             </para>
-                            
                         </listitem>
-                        
                     </itemizedlist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
-                <term>option引数の使用法</term> 
-                
+                <term>option引数の使用法</term>
                 この引数は<literal>A</literal>またはその"スライス"全体
-                
                 の対称性に関してfftアルゴリズムに情報を提供するために使用できます.
-                
                 次元<literal>n1</literal>, ..., <literal>np</literal>の
-                
                 N次元配列<literal>B</literal> は,
-                
                 <literal>B==conj(B([1 n1:-1:2],[1
-                    
                     n2:-1:2],...,[1 np:-1:2]))
-                    
                 </literal>
                 の場合に限り,fftが共役対称です.
-                
                 このような場合,
-                
                 結果<literal>X</literal>は実数で,効率的な専用のアルゴリズムを
-                
                 使用できます.
-                
                 <listitem>
-                    
                     <itemizedlist>
-                        
                         <listitem>
-                            
                             <term>"symmetric"</term> は,
-                            
                             <literal>A</literal>またはその全"スライス"を
-                            
                             共役対称として扱うfftを実行する値です.
-                            
                             このオプションは,
-                            
                             <literal>A</literal> またはその全"スライス" が
-                            
                             丸め誤差の影響で厳密に対称ではない場合に,
-                            
                             自動的な対称性の定義を回避したい場合に有用です.
-                            
                         </listitem>
-                        
                         <listitem>
-                            
                             <term>"nonsymmetric"</term> は対称性を考慮せずに
-                            
                             fftを実行する値です.
-                            
                             このオプションは自動的な対称性の定義を
-                            
                             回避したい場合に有用です.
-                            
                         </listitem>
-                        
                         <listitem>
-                            
-                            <term>unspecified</term> 
-                            
+                            <term>unspecified</term>
                             このオプションが省略された場合,fftアルゴリズムは
-                            
                             自動的に正しい対称性を確認します.
-                            
                         </listitem>
-                        
-                        
-                        
                     </itemizedlist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>fftの最適化</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         注意: fftw 関数は自動的に直近のパラメータをメモリに保存し,
-                        
                         2回目に再利用します.
-                        
                         これにより,(同じパラメータで)連続的なコールを行った場合に
-                        
                         著しく計算時間が改善します.
-                        
                     </para>
-                    
                     <para>
-                        
-                        <link linkend="get_fftw_wisdom">get_fftw_wisdom</link>, 
-                        
+                        <link linkend="get_fftw_wisdom">get_fftw_wisdom</link>,
                         <link linkend="set_fftw_wisdom">set_fftw_wisdom</link>関数により
-                        
                         更にfftを最適化することができます.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>アルゴリズム</title>
-        
         <para>
-            
             この関数は,<ulink url="http://www.fftw.org/">fftw3</ulink> ライブラリを
-            
             使用しています.
-            
         </para>
-        
     </refsection>
-    
     <refsection>
-        
         <title>例</title>
-        
         <para>1次元fft</para>
-        
         <programlisting role="example"><![CDATA[
 //Frequency components of a signal
 //----------------------------------
@@ -613,20 +319,16 @@ n=size(f,'*')
 clf()
 plot(f,abs(y(1:n)))
      ]]></programlisting>
-        
         <para>2次元fft</para>
-        
         <programlisting role="example"><![CDATA[
-----------------------------------
+//----------------------------------
 A = zeros(256,256);
 A(5:24,13:17) = 1;
 X = fftshift(fft(A));
 set(gcf(),"color_map",jetcolormap(128));
 clf;grayplot(0:255,0:255,abs(X)')
      ]]></programlisting>
-        
         <para>mupliple fft</para>
-        
         <programlisting role="example"><![CDATA[
 //simple case, 3 1-D fft at a time
 N=2048;
@@ -656,7 +358,6 @@ for i1=1:Dims(1)
   end
 end
    ]]></programlisting>
-        
         <programlisting role="example"><![CDATA[
 //Using explicit formula for  1-D discrete Fourier transform
 //------------------------------------------------
@@ -681,60 +382,31 @@ norm(DFT(a,-1) - fft(a,-1))
 timer();DFT(a,-1);timer()
 timer();fft(a,-1);timer()
      ]]></programlisting>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="corr">corr</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="fftw_flags">fftw_flags</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="get_fftw_wisdom">get_fftw_wisdom</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="set_fftw_wisdom">set_fftw_wisdom</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="fftw_forget_wisdom">fftw_forget_wisdom</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>参考文献</title>
-        
         <para>
-            
             Matteo Frigo and Steven G. Johnson, "FFTW Documentation" <ulink url="http://www.fftw.org/#documentation">http://www.fftw.org/#documentation</ulink>
-            
         </para>
-        
     </refsection>
-    
 </refentry>
-