Help: various fixes (next) 17/18317/9
Samuel GOUGEON [Tue, 28 Jun 2016 17:29:38 +0000 (19:29 +0200)]
Change-Id: I4096f8b0ba53c203519c5ad507ccf094b01a1043

36 files changed:
scilab/modules/cacsd/help/en_US/linear_system_representation/sm2des.xml
scilab/modules/cacsd/help/en_US/linear_system_representation/sm2ss.xml
scilab/modules/data_structures/help/fr_FR/iscell.xml [deleted file]
scilab/modules/data_structures/help/pt_BR/typename.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/meshgrid.xml
scilab/modules/elementary_functions/help/en_US/integer_representation/dec2base.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/meshgrid.xml
scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/meshgrid.xml
scilab/modules/elementary_functions/help/ja_JP/integer_representation/dec2base.xml
scilab/modules/elementary_functions/help/pt_BR/elementarymatrices/meshgrid.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/meshgrid.xml
scilab/modules/elementary_functions/help/ru_RU/integer_representation/dec2base.xml
scilab/modules/graphics/help/fr_FR/axes_operations/isoview.xml
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/meshgrid_1.png
scilab/modules/linear_algebra/help/en_US/factorization/householder.xml
scilab/modules/linear_algebra/help/fr_FR/factorization/CHAPTER
scilab/modules/linear_algebra/help/fr_FR/factorization/householder.xml
scilab/modules/linear_algebra/help/fr_FR/kernel/CHAPTER
scilab/modules/linear_algebra/help/fr_FR/subspaces/CHAPTER
scilab/modules/linear_algebra/help/ja_JP/factorization/householder.xml [deleted file]
scilab/modules/linear_algebra/help/pt_BR/factorization/householder.xml [deleted file]
scilab/modules/optimization/help/en_US/neldermead/fminsearch.xml
scilab/modules/optimization/help/en_US/neldermead/neldermead.xml
scilab/modules/optimization/help/en_US/neldermead/nmplot.xml
scilab/modules/optimization/help/en_US/neldermead/optimget.xml
scilab/modules/optimization/help/en_US/neldermead/optimplotfunccount.xml
scilab/modules/optimization/help/en_US/neldermead/optimplotfval.xml
scilab/modules/optimization/help/en_US/neldermead/optimplotx.xml
scilab/modules/optimization/help/en_US/neldermead/optimset.xml
scilab/modules/randlib/help/en_US/grand.xml
scilab/modules/randlib/help/fr_FR/grand.xml
scilab/modules/randlib/help/ja_JP/grand.xml
scilab/modules/randlib/help/ru_RU/grand.xml
scilab/modules/spreadsheet/help/en_US/csvDefault.xml
scilab/modules/spreadsheet/help/ja_JP/csvDefault.xml

index 890affd..222c434 100644 (file)
  * 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" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="sm2des">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="sm2des">
     <refnamediv>
         <refname>sm2des</refname>
         <refpurpose>system matrix to descriptor</refpurpose>
index a79c5c5..2216a62 100644 (file)
  * 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" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="sm2ss">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="sm2ss">
     <refnamediv>
         <refname>sm2ss</refname>
         <refpurpose>system matrix to state-space</refpurpose>
diff --git a/scilab/modules/data_structures/help/fr_FR/iscell.xml b/scilab/modules/data_structures/help/fr_FR/iscell.xml
deleted file mode 100644 (file)
index 936591e..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Vincent COUVERT
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="iscell" xml:lang="fr">
-    <refnamediv>
-        <refname>iscell</refname>
-        <refpurpose>Check if a variable is a cell array</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>bool = iscell(x)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parameters</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>Scilab variable</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>bool</term>
-                <listitem>
-                    <para>A boolean</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>iscell(x)</literal> returns true if x is a cell array
-            and false otherwise.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-iscell(1)
-
-iscell(cell())
-
-c = cell(1,2);
-c{1} = "Scilab";
-c{2} = datenum();
-iscell(c)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="cell">cell</link>
-            </member>
-            <member>
-                <link linkend="isstruct">isstruct</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 687182f..aeda74e 100644 (file)
@@ -2,20 +2,20 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="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="typename" xml:lang="pt">
     <refnamediv>
         <refname>typename</refname>
-        <refpurpose>associa um nome ao tipo de variável</refpurpose>
+        <refpurpose>associa um nome ao tipo de variável</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Syntax</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[types [ [,names]]=typename()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parameters</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>types</term>
                 <listitem>
-                    <para>vetor coluna de inteiros: os códigos dos tipos de cada tipo de
+                    <para>vetor coluna de inteiros: os códigos dos tipos de cada tipo de
                         dado definido.
                     </para>
                 </listitem>
@@ -23,7 +23,7 @@
             <varlistentry>
                 <term>names</term>
                 <listitem>
-                    <para>vetor coluna de strings: os nomes associados aos códigos de
+                    <para>vetor coluna de strings: os nomes associados aos códigos de
                         tipos.
                     </para>
                 </listitem>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>O overloading de funções e operadores faz uso de nomes formais
-            associados aos tipos de dados para formar o nome da função de overloading
+        <title>Descrição</title>
+        <para>O overloading de funções e operadores faz uso de nomes formais
+            associados aos tipos de dados para formar o nome da função de overloading
             (ver overloading). <literal>typename</literal> pode ser usado para
             manipular esses nomes formais para tipos de dados "hard-coded" (os nomes
             formais de tipos de dados codificados de <literal>tlist</literal> ou
-            <literal>mlist</literal> são definidos de outra forma, ver
+            <literal>mlist</literal> são definidos de outra forma, ver
             <literal>overloading</literal>).
         </para>
         <para>
             <literal>typename</literal>
-            retorna informações sobre tipos de dados definidos.
+            retorna informações sobre tipos de dados definidos.
         </para>
     </refsection>
     <refsection>
-        <title> Ver Também </title>
+        <title> Ver Também </title>
         <simplelist type="inline">
             <member>
                 <link linkend="type">type</link>
index d25e3b3..dfa810f 100644 (file)
         <title>Examples</title>
         <programlisting role="example"><![CDATA[ 
 x = -1:0.1:1;
-y = -1:0.1:1;
-
-[X,Y] = meshgrid(x,y);
-
-for i=1:size(X,1)
-  for j=1:size(X,2)
-    Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-  end
-end
-
-surf(X,Y,Z)
+[X, Y] = meshgrid(x);
+Z = sinc(2*%pi * X.*Y);
+surf(X, Y, Z)
  ]]></programlisting>
         <scilab:image>
-            x = -1:0.1:1;
-            y = -1:0.1:1;
-            
-            [X,Y] = meshgrid(x,y);
-            
-            for i=1:size(X,1)
-            for j=1:size(X,2)
-            Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-            end
-            end
-            
-            surf(X,Y,Z)
+          x = -1:0.1:1;
+          [X,Y] = meshgrid(x);
+          Z = sinc(2*%pi*X.*Y);
+          surf(X, Y, Z)
         </scilab:image>
     </refsection>
     <refsection role="see also">
index d922267..d7b67fb 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>str = dec2base(d, base)</synopsis>
-        <synopsis>str = dec2base(d, base, n)</synopsis>
+        <synopsis>
+           str = dec2base(d, base)
+           str = dec2base(d, base, n)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index d10519d..e097415 100644 (file)
     </refsection>
     <refsection>
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x = -1:0.1:1;
-y = -1:0.1:1;
-
-[X,Y] = meshgrid(x,y);
-
-for i=1:size(X,1)
-  for j=1:size(X,2)
-    Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-  end
-end
-
-surf(X,Y,Z)
+[X,Y] = meshgrid(x);
+Z = sinc(2*%pi * X.*Y);
+surf(X, Y, Z)
  ]]></programlisting>
         <scilab:image>
             x = -1:0.1:1;
-            y = -1:0.1:1;
-            
-            [X,Y] = meshgrid(x,y);
-            
-            for i=1:size(X,1)
-            for j=1:size(X,2)
-            Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-            end
-            end
-            
-            surf(X,Y,Z)
+            [X,Y] = meshgrid(x);
+            Z = sinc(2*%pi*X.*Y);
+            surf(X, Y, Z)
         </scilab:image>
     </refsection>
     <refsection role="see also">
index 70961e4..7663862 100644 (file)
         
         <programlisting role="example"><![CDATA[ 
 x = -1:0.1:1;
-y = -1:0.1:1;
-
-[X,Y] = meshgrid(x,y);
-
-for i=1:size(X,1)
-  for j=1:size(X,2)
-    Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-  end
-end
-
-surf(X,Y,Z)
- ]]></programlisting>
-        
+[X, Y] = meshgrid(x);
+Z = sinc(2*%pi * X.*Y);
+surf(X, Y, Z)
+     ]]></programlisting>
         <scilab:image>
-            
-            x = -1:0.1:1;
-            
-            y = -1:0.1:1;
-            
-            
-            
-            [X,Y] = meshgrid(x,y);
-            
-            
-            
-            for i=1:size(X,1)
-            
-            for j=1:size(X,2)
-            
-            Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-            
-            end
-            
-            end
-            
-            
-            
-            surf(X,Y,Z)
-            
+          x = -1:0.1:1;
+          [X,Y] = meshgrid(x);
+          Z = sinc(2*%pi*X.*Y);
+          surf(X, Y, Z)
         </scilab:image>
         
     </refsection>
index aae8af9..664e9ef 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>str = dec2base(d, base)</synopsis>
-        <synopsis>str = dec2base(d, base, n)</synopsis>
+        <synopsis>
+            str = dec2base(d, base)
+            str = dec2base(d, base, n)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index 75cf799..72446c6 100644 (file)
         <refpurpose>cria matrizes ou arrays 3-D</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[X, Y] = meshgrid(x)
             [X, Y] = meshgrid(x,y)
             [X, Y, Z] = meshgrid(x,y,z)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>x, y, z</term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>...</para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x = -1:0.1:1;
-y = -1:0.1:1;
-
-[X,Y] = meshgrid(x,y);
-
-for i=1:size(X,1)
-  for j=1:size(X,2)
-    Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-  end
-end
-
-surf(X,Y,Z)
- ]]></programlisting>
+[X, Y] = meshgrid(x);
+Z = sinc(2*%pi * X.*Y);
+surf(X, Y, Z)
+     ]]></programlisting>
         <scilab:image>
-            x = -1:0.1:1;
-            y = -1:0.1:1;
-            
-            [X,Y] = meshgrid(x,y);
-            
-            for i=1:size(X,1)
-            for j=1:size(X,2)
-            Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-            end
-            end
-            
-            surf(X,Y,Z)
+          x = -1:0.1:1;
+          [X,Y] = meshgrid(x);
+          Z = sinc(2*%pi*X.*Y);
+          surf(X, Y, Z)
         </scilab:image>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="ndgrid">ndgrid</link>
index 9c21d8f..9bea322 100644 (file)
     </refsection>
     <refsection>
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x = -1:0.1:1;
-y = -1:0.1:1;
-[X,Y] = meshgrid(x,y);
-for i=1:size(X,1)
-  for j=1:size(X,2)
-    Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-  end
-end
-surf(X,Y,Z)
- ]]></programlisting>
+[X, Y] = meshgrid(x);
+Z = sinc(2*%pi * X.*Y);
+surf(X, Y, Z)
+     ]]></programlisting>
         <scilab:image>
             x = -1:0.1:1;
-            y = -1:0.1:1;
-            
-            [X,Y] = meshgrid(x,y);
-            
-            for i=1:size(X,1)
-            for j=1:size(X,2)
-            Z(i,j) = sinc(2*%pi*X(i,j)*Y(i,j));
-            end
-            end
-            
-            surf(X,Y,Z)
+            [X,Y] = meshgrid(x);
+            Z = sinc(2*%pi*X.*Y);
+            surf(X, Y, Z)
         </scilab:image>
     </refsection>
     <refsection role="see also">
index a2e9e83..6e2f342 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>str = dec2base(d, base)</synopsis>
-        <synopsis>str = dec2base(d, base, n)</synopsis>
+        <synopsis>
+            str = dec2base(d, base)
+            str = dec2base(d, base, n)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
index 497abba..3a2a7c5 100644 (file)
@@ -77,7 +77,7 @@
         </para>
         <para>
             <literal>isoview("off")</literal> ou <literal>isoview off</literal>
-            relaxes les échelles en x, y (voire z) pour le repère actif.
+            relaxe les échelles en x, y (voire z) pour le repère actif.
         </para>
         <para>
             <literal>isoview(idGraphics,..)</literal> agit sur tous les repères
index 5618ca6..748f659 100644 (file)
@@ -958,7 +958,7 @@ histplot_ru_RU_2.png=8117e3f08f726740eb7a4e19b7c80cf1
 histplot_ru_RU_3.png=cd3e60e8f0a028549da7547fbf4b7222
 histplot_ru_RU_4.png=ac27914effe5c72bfcd955f7a90d43d2
 hotcolormap_1.png=93b81776ad0b15d88239eab74997022e
-householder_1.png=e4cf33e6819540c66917a01587518816
+householder_1.png=8a7bce8cfadfbf5d70436734b66ec20d
 hsv2rgb_1.png=7d20c259e94301d9763fbddb7bff4784
 hsvcolormap_1.png=11918d88bcc793200af0b9f1b58b0554
 iir_1.png=e675c2755f68ddc4611c849895b63012
@@ -1014,7 +1014,7 @@ math_rendering_features_in_graphic_1.png=b1259d51258d72193bd32a47c8f96ca4
 math_rendering_features_in_graphic_2.png=2a250fff903253e1b1b67595c021b1ee
 mese_1.png=c4ce712eded4fbbd49bb86b02e14afe9
 mesh_1.png=a17150f02dbe853486f73801c9afcd11
-meshgrid_1.png=8e04fd2c2709e1dd252aa22404c6a0b2
+meshgrid_1.png=9568cd9a7f4be8fde70668a8c5fbfd28
 milk_drop_1.png=776c1045c1ea4a0cf189d08162567afc
 move_1.png=c4599a8693c9c099ac9c7f1a5dee3e91
 mrfit_1.png=d8d3736f01fc8fc707c53508cddd575f
index 3f07e35..a2d775f 100644 (file)
Binary files a/scilab/modules/helptools/images/meshgrid_1.png and b/scilab/modules/helptools/images/meshgrid_1.png differ
index c7f860a..ac6f1e8 100644 (file)
@@ -16,7 +16,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="householder">
     <refnamediv>
         <refname>householder</refname>
-        <refpurpose>Householder orthogonal reflexion matrix</refpurpose>
+        <refpurpose>Householder orthogonal reflexion matrix. Symetrical wrt a plane</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
                 </listitem>
             </itemizedlist>
         </para>
-        <para>
+        <note>
             If the related reflexion matrix <varname>H</varname> is computed, for any point A
             of column coordinates <literal>a</literal>, <literal>H*a</literal> are the coordinates of
-            the reflected image of A (see the example below).
-        </para>
+            the symetrical image of A with respect to the <literal>(v,w)</literal> plane
+            (see the example below).
+        </note>
         <note>
             If <varname>v</varname> or/and <varname>w</varname> are in row, they are priorly
             transposed into columns.
@@ -149,7 +150,7 @@ clean(hm' - hm)         // must be zeros(3,3)
 clean(det(hm))          // must be -1
  ]]></programlisting>
         <para>
-            <emphasis role="bold"> Application:</emphasis> Reflected image of an object w.r. to a given plane
+            <emphasis role="bold"> Application:</emphasis> Symetrical image of an object w.r.t. a given plane
         </para>
         <programlisting role="example"><![CDATA[
 // (OA) = [0 0 1] is reflected in O into (OB) = [ 1 1 0.3 ]:
@@ -163,7 +164,7 @@ Xe = (cos(u).*u)'*(1+cos(v)/2)+10;
 Ye = (u/2)'*sin(v);
 Ze = (sin(u).*u)'*(1+cos(v)/2);
 
-// Reflected object:
+// Symetrical object:
 Pe = [ Xe(:)' ; Ye(:)' ; Ze(:)'];
 Pr = H*Pe;
 Xr = matrix(Pr(1,:),40,-1);
@@ -197,11 +198,63 @@ a.children(2).foreground = 1;
 a.children(3).foreground = color("green");
 drawnow()
  ]]></programlisting>
+        <scilab:image>
+            // (OA) = [0 0 1] is reflected in O into (OB) = [ 1 1 0.3 ]:
+            [n, H] = householder([0 0 1]', [ 1 1 0.3 ]');
+            // "n" is the unit vector orthogonal to the reflecting plane
+
+            // Emitting object (feature from shell demo):
+            u = linspace(0,2*%pi,40);
+            v = linspace(0,2*%pi,20);
+            Xe = (cos(u).*u)'*(1+cos(v)/2)+10;
+            Ye = (u/2)'*sin(v);
+            Ze = (sin(u).*u)'*(1+cos(v)/2);
+
+            // Symetrical object:
+            Pe = [ Xe(:)' ; Ye(:)' ; Ze(:)'];
+            Pr = H*Pe;
+            Xr = matrix(Pr(1,:),40,-1);
+            Yr = matrix(Pr(2,:),40,-1);
+            Zr = matrix(Pr(3,:),40,-1);
+
+            // Reflecting plane containing O: n(1).x + n(2).y + n(3).z = 0
+            //   Sampling space:
+            x = linspace(min([Xe(:);Xr(:)]), max([Xe(:);Xr(:)]),20);
+            y = linspace(min([Ye(:);Yr(:)]), max([Ye(:);Yr(:)]),20);
+            [X, Y] = meshgrid(x,y);
+            //   Generating the mirror:
+            deff("z = mirror(x,y,n)","z = -n(1)/n(3)*x - n(2)/n(3)*y")
+            Zm = mirror(X,Y,n);
+
+            // Plotting:
+            clf
+            drawlater
+            f = gcf();
+            f.color_map = [ 0.8 0.8 0.8 ; jetcolormap(100)];
+            surf(Xe,Ye,Ze)
+            surf(X,Y,Zm)
+            surf(Xr,Yr,Zr)
+            a = gca();
+            a.isoview = "on";
+            a.rotation_angles = [74 123];
+            a.children.color_flag = 0;
+            a.children.color_mode = 0;
+            a.children(1).foreground = color("red");
+            a.children(2).foreground = 1;
+            a.children(3).foreground = color("green");
+            drawnow
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="proj">proj</link>
+            </member>
+            <member>
+                <link linkend="scaling">scaling</link>
+            </member>
+            <member>
                 <link linkend="qr">qr</link>
             </member>
             <member>
index 586b6bd..d3631bb 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: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="householder">
     <refnamediv>
         <refname>householder</refname>
-        <refpurpose>Matrice de Householder  </refpurpose>
+        <refpurpose>Matrice de Householder. Symétrique par rapport à un plan</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
         <synopsis>
             householder         // demo
-            u     = householder(v [,w])
+            u = householder(v [,w])
             [u, H] = householder(v [,w])
         </synopsis>
     </refsynopsisdiv>
                 </listitem>
             </itemizedlist>
         </para>
-
-        <para>
+        
+        <note>
             Si la matrice de réflexion <varname>H</varname> correspondante est calculée,
             pour tout point A de coordonnées <literal>a</literal> en colonne, <literal>H*a</literal>
-            sont les coordonnées de l'image réfléchie de A (exemple ci-dessous).
-        </para>
+            sont les coordonnées du symétrique de A par rapport au plan <literal>(v,w)</literal>
+            (exemple ci-dessous).
+        </note>
         <note>
             Si <varname>v</varname> ou/et <varname>w</varname> sont des vecteurs ligne,
             ils sont préalablement transposés en colonnes.
@@ -132,30 +133,30 @@ b = rand(3,1);
 norm(rb)
 
 [rb2b, hm] = householder(b, 2*b);
-[b rb2b clean(hm*b ./ b) ]  // last column must be uniform
-norm(rb2b)                  // must be 1
+[b rb2b clean(hm*b ./ b) ]  // la dernière colonne doit être uniforme
+norm(rb2b)                  // doit valoir 1
 
 c = rand(3,1);
 [rbc, hm] = householder(b,c);
-norm(rbc)          // must be 1
-hm*b ./c           // must be uniform
+norm(rbc)          // doit valoir 1
+hm*b ./c           // doit être uniforme
 
 d = b + %i*c;
 e = rand(3,1) + %i*rand(3,1);
 [rde, hm] = householder(d,e);
-norm(rbc)               // must be 1
-clean(inv(hm) - hm)     // must be zeros(3,3)
-clean(hm' - hm)         // must be zeros(3,3)
-clean(det(hm))          // must be -1
+norm(rbc)               // doit valoir 1
+clean(inv(hm) - hm)     // doit valoir zeros(3,3)
+clean(hm' - hm)         // doit valoir zeros(3,3)
+clean(det(hm))          // doit valoir -1
  ]]></programlisting>
-
+        
         <para>
-            <emphasis role="bold">Application :</emphasis> Image réfléchie d'un objet par rapport à un plan donné.
+            <emphasis role="bold">Application :</emphasis> Symétrique d'un objet par rapport à un plan donné.
         </para>
         <programlisting role="example"><![CDATA[
 // (OA) = [0 0 1] se réfléchit en O en (OB) = [ 1 1 0.3 ]:
 [n, H] = householder([0 0 1]', [ 1 1 0.3 ]');
-// "n" est la normale au plan réflecteur
+// "n" est la normale au plan "réflecteur"
 
 // Objet source :
 u = linspace(0,2*%pi,40);
@@ -164,14 +165,14 @@ Xe = (cos(u).*u)'*(1+cos(v)/2)+10;
 Ye = (u/2)'*sin(v);
 Ze = (sin(u).*u)'*(1+cos(v)/2);
 
-// Image réfléchie de l'object :
+// Image symétrique de l'objet :
 P = [ Xe(:)' ; Ye(:)' ; Ze(:)'];
 Pr = H*P;
 Xr = matrix(Pr(1,:),40,-1);
 Yr = matrix(Pr(2,:),40,-1);
 Zr = matrix(Pr(3,:),40,-1);
 
-// Plan réflecteur contnant O : n(1).x + n(2).y + n(3).z = 0:
+// Plan réflecteur contenant O : n(1).x + n(2).y + n(3).z = 0:
 //  Grille d'espace :
 x = linspace(min([Xe(:);Xr(:)]), max([Xe(:);Xr(:)]),20);
 y = linspace(min([Ye(:);Yr(:)]), max([Ye(:);Yr(:)]),20);
@@ -199,13 +200,62 @@ a.children(3).foreground = color("green");
 drawnow()
  ]]></programlisting>
         <scilab:image>
-            householder();
+            // (OA) = [0 0 1] is reflected in O into (OB) = [ 1 1 0.3 ]:
+            [n, H] = householder([0 0 1]', [ 1 1 0.3 ]');
+            // "n" is the unit vector orthogonal to the reflecting plane
+            
+            // Emitting object (feature from shell demo):
+            u = linspace(0,2*%pi,40);
+            v = linspace(0,2*%pi,20);
+            Xe = (cos(u).*u)'*(1+cos(v)/2)+10;
+            Ye = (u/2)'*sin(v);
+            Ze = (sin(u).*u)'*(1+cos(v)/2);
+            
+            // Symetrical object:
+            Pe = [ Xe(:)' ; Ye(:)' ; Ze(:)'];
+            Pr = H*Pe;
+            Xr = matrix(Pr(1,:),40,-1);
+            Yr = matrix(Pr(2,:),40,-1);
+            Zr = matrix(Pr(3,:),40,-1);
+            
+            // Reflecting plane containing O: n(1).x + n(2).y + n(3).z = 0
+            //   Sampling space:
+            x = linspace(min([Xe(:);Xr(:)]), max([Xe(:);Xr(:)]),20);
+            y = linspace(min([Ye(:);Yr(:)]), max([Ye(:);Yr(:)]),20);
+            [X, Y] = meshgrid(x,y);
+            //   Generating the mirror:
+            deff("z = mirror(x,y,n)","z = -n(1)/n(3)*x - n(2)/n(3)*y")
+            Zm = mirror(X,Y,n);
+            
+            // Plotting:
+            clf
+            drawlater
+            f = gcf();
+            f.color_map = [ 0.8 0.8 0.8 ; jetcolormap(100)];
+            surf(Xe,Ye,Ze)
+            surf(X,Y,Zm)
+            surf(Xr,Yr,Zr)
+            a = gca();
+            a.isoview = "on";
+            a.rotation_angles = [74 123];
+            a.children.color_flag = 0;
+            a.children.color_mode = 0;
+            a.children(1).foreground = color("red");
+            a.children(2).foreground = 1;
+            a.children(3).foreground = color("green");
+            drawnow
         </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
+                <link linkend="proj">proj</link>
+            </member>
+            <member>
+                <link linkend="scaling">scaling</link>
+            </member>
+            <member>
                 <link linkend="qr">qr</link>
             </member>
             <member>
diff --git a/scilab/modules/linear_algebra/help/ja_JP/factorization/householder.xml b/scilab/modules/linear_algebra/help/ja_JP/factorization/householder.xml
deleted file mode 100644 (file)
index f86ed86..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- * Copyright (C) 2015 - Samuel GOUGEON
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * 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" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="householder">
-    
-    <refnamediv>
-        <refname>householder</refname>
-        <refpurpose>ハウスホルダー直交鏡映行列</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>
-            householder         // demo
-            u     = householder(v [,w])
-            [u, H] = householder(v [,w])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection role="arguments">
-        <title>引数</title>
-        <variablelist>
-            <varlistentry>
-                <term>v</term>
-                <listitem>
-                    <para>実数または複素数の列ベクトル</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>w</term>
-                <listitem>
-                    <para>
-                        <literal>v</literal>と同じ大きさの実数または複素数の列ベクトル.
-                        デフォルト値は<literal>eye(v)</literal>((Ox) axis).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>u</term>
-                <listitem>
-                    <para>
-                        unit vector lying in the <literal>(v,w)</literal> plane and orthogonal
-                        to the bisectrix of <literal>(v,w)</literal>.
-                        Column of size(v) of real or complex numbers.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>H</term>
-                <listitem>
-                    <para>
-                        Orthogonal Householder reflexion matrix: <literal>H= eye() - 2*u*u'</literal>.
-                        <varname>H</varname> is such that <literal>inv(H)==H</literal>,
-                        <literal>H'==H</literal>, and <literal>det(H)==-1</literal>.
-                    </para>
-                    <para>
-                        If <varname>v</varname> and <varname>w</varname> are real,
-                        <literal>H*v</literal> is proportional to <varname>w</varname>.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection role="description">
-        <title>説明</title>
-        <para>
-            <literal>householder(..)</literal> computes the unit vector <varname>u</varname>
-            lying in the <literal>(v,w)</literal> plane and orthogonal to the bisectrix of
-            <literal>(v,w)</literal>.
-        </para>
-        <para>
-            If <varname>v</varname> and <varname>w</varname> are proportional:
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        If they are opposite, <literal>u= v/|v|</literal> is returned.
-                    </para>
-                </listitem>
-                <listitem>
-                    If they are real and have the same direction, <varname>u</varname> is set
-                    in the (xOy) plane with a priori <literal>u(1)>0</literal>, and orthogonal to
-                    <varname>v</varname> (<literal>u'*v==0</literal>). However,
-                    <itemizedlist>
-                        <listitem>
-                            If they are along (Ox), <literal>u = (Oy+)</literal> is returned instead.
-                        </listitem>
-                        <listitem>
-                            If <varname>v</varname> and <varname>w</varname> are scalars with same
-                            signs, the orthogonal sub-space is restricted to <literal>{0}</literal>
-                            that can't be normalized:
-                            <varname>u</varname> and <varname>H</varname> are then set to
-                            <literal>%nan</literal>.
-                        </listitem>
-                    </itemizedlist>
-                </listitem>
-            </itemizedlist>
-        </para>
-
-        <para>
-            If the related reflexion matrix <varname>H</varname> is computed, for any point A
-            of column coordinates <literal>a</literal>, <literal>H*a</literal> are the coordinates of
-            the reflected image of A (see the example below).
-        </para>
-        <note>
-            If <varname>v</varname> or/and <varname>w</varname> are in row, they are priorly
-            transposed into columns.
-        </note>
-        <warning>
-            If <varname>v</varname> or/and <varname>w</varname> are <literal>[]</literal>,
-            <literal>[]</literal> is returned for <varname>u</varname> and <varname>H</varname>.
-        </warning>
-    </refsection>
-    <refsection role="examples">
-        <title>例</title>
-        <programlisting role="example"><![CDATA[
-a = [ rand(1,1) 0  0 ]';
-[ra hm] = householder(a);
-[a ra hm*a ]
-norm(ra)
-
-b = rand(3,1);
-[rb, hm] = householder(b);
-[b rb eye(b) clean(hm*b) ]
-norm(rb)
-
-[rb2b, hm] = householder(b, 2*b);
-[b rb2b clean(hm*b ./ b) ]  // last column must be uniform
-norm(rb2b)                  // must be 1
-
-c = rand(3,1);
-[rbc, hm] = householder(b,c);
-norm(rbc)          // must be 1
-hm*b ./c           // must be uniform
-
-d = b + %i*c;
-e = rand(3,1) + %i*rand(3,1);
-[rde, hm] = householder(d,e);
-norm(rbc)               // must be 1
-clean(inv(hm) - hm)     // must be zeros(3,3)
-clean(hm' - hm)         // must be zeros(3,3)
-clean(det(hm))          // must be -1
- ]]></programlisting>
-        <para>
-            <emphasis role="bold">Application:</emphasis> Reflected image of an object w.r. to a given plane
-        </para>
-        <programlisting role="example"><![CDATA[
-// (OA) = [0 0 1] is reflected in O into (OB) = [ 1 1 0.3 ]:
-[n, H] = householder([0 0 1]', [ 1 1 0.3 ]');
-// "n" is the unit vector orthogonal to the reflecting plane
-
-// Emitting object (feature from shell demo):
-u = linspace(0,2*%pi,40);
-v = linspace(0,2*%pi,20);
-Xe = (cos(u).*u)'*(1+cos(v)/2)+10;
-Ye = (u/2)'*sin(v);
-Ze = (sin(u).*u)'*(1+cos(v)/2);
-
-// Reflected object:
-Pe = [ Xe(:)' ; Ye(:)' ; Ze(:)'];
-Pr = H*Pe;
-Xr = matrix(Pr(1,:),40,-1);
-Yr = matrix(Pr(2,:),40,-1);
-Zr = matrix(Pr(3,:),40,-1);
-
-// Reflecting plane containing O: n(1).x + n(2).y + n(3).z = 0
-//   Sampling space:
-x = linspace(min([Xe(:);Xr(:)]), max([Xe(:);Xr(:)]),20);
-y = linspace(min([Ye(:);Yr(:)]), max([Ye(:);Yr(:)]),20);
-[X, Y] = meshgrid(x,y);
-//   Generating the mirror:
-deff("z = mirror(x,y,n)","z = -n(1)/n(3)*x - n(2)/n(3)*y")
-Zm = mirror(X,Y,n);
-
-// Plotting:
-clf()
-isoview()
-drawlater()
-f = gcf();
-f.color_map = [ 0.8 0.8 0.8 ; jetcolormap(100)];
-surf(Xe,Ye,Ze)
-surf(X,Y,Zm)
-surf(Xr,Yr,Zr)
-a = gca();
-a.rotation_angles = [74 123];
-a.children.color_flag = 0;
-a.children.color_mode = 0;
-a.children(1).foreground = color("red");
-a.children(2).foreground = 1;
-a.children(3).foreground = color("green");
-drawnow()
- ]]></programlisting>
-        <scilab:image>
-            householder();
-        </scilab:image>
-    </refsection>
-
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="qr">qr</link>
-            </member>
-            <member>
-                <link linkend="givens">givens</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>履歴</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0</revnumber>
-                <revdescription>
-                    <para>Householder reflexion matrix added as second output parameter.
-                        Demo householder() added. Help page reviewed.
-                    </para>
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/linear_algebra/help/pt_BR/factorization/householder.xml b/scilab/modules/linear_algebra/help/pt_BR/factorization/householder.xml
deleted file mode 100644 (file)
index 7a1a6ba..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- * Copyright (C) 2015 - Samuel GOUGEON
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * 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:ns4="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="householder" xml:lang="pt">
-    <refnamediv>
-        <refname>householder</refname>
-        <refpurpose>matriz de reflexão ortogonal de Householder</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>
-            householder         // demo
-            u     = householder(v [,w])
-            [u, H] = householder(v [,w])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection role="arguments">
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>v</term>
-                <listitem>
-                    <para>vetor coluna de reais ou complexos</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>w</term>
-                <listitem>
-                    <para>vetor coluna de reais ou complexos com o mesmo tamanho que
-                        <varname>v</varname>. Valor padrão é <literal>eye(v)</literal> ((Ox) axis)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>u</term>
-                <listitem>
-                    <para>
-                        unit vector lying in the <literal>(v,w)</literal> plane and orthogonal
-                        to the bisectrix of <literal>(v,w)</literal>.
-                        Column of size(v) of real or complex numbers.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>H</term>
-                <listitem>
-                    <para>
-                        Orthogonal Householder reflexion matrix: <literal>H= eye() - 2*u*u'</literal>.
-                        <varname>H</varname> is such that <literal>inv(H)==H</literal>,
-                        <literal>H'==H</literal>, and <literal>det(H)==-1</literal>.
-                    </para>
-                    <para>
-                        If <varname>v</varname> and <varname>w</varname> are real,
-                        <literal>H*v</literal> is proportional to <varname>w</varname>.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection role="description">
-        <title>Descrição</title>
-        <para>
-            <literal>householder(..)</literal> computes the unit vector <varname>u</varname>
-            lying in the <literal>(v,w)</literal> plane and orthogonal to the bisectrix of
-            <literal>(v,w)</literal>.
-        </para>
-        <para>
-            If <varname>v</varname> and <varname>w</varname> are proportional:
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        If they are opposite, <literal>u= v/|v|</literal> is returned.
-                    </para>
-                </listitem>
-                <listitem>
-                    If they are real and have the same direction, <varname>u</varname> is set
-                    in the (xOy) plane with a priori <literal>u(1)>0</literal>, and orthogonal to
-                    <varname>v</varname> (<literal>u'*v==0</literal>). However,
-                    <itemizedlist>
-                        <listitem>
-                            If they are along (Ox), <literal>u = (Oy+)</literal> is returned instead.
-                        </listitem>
-                        <listitem>
-                            If <varname>v</varname> and <varname>w</varname> are scalars with same
-                            signs, the orthogonal sub-space is restricted to <literal>{0}</literal>
-                            that can't be normalized:
-                            <varname>u</varname> and <varname>H</varname> are then set to
-                            <literal>%nan</literal>.
-                        </listitem>
-                    </itemizedlist>
-                </listitem>
-            </itemizedlist>
-        </para>
-
-        <para>
-            If the related reflexion matrix <varname>H</varname> is computed, for any point A
-            of column coordinates <literal>a</literal>, <literal>H*a</literal> are the coordinates of
-            the reflected image of A (see the example below).
-        </para>
-        <note>
-            If <varname>v</varname> or/and <varname>w</varname> are in row, they are priorly
-            transposed into columns.
-        </note>
-        <warning>
-            If <varname>v</varname> or/and <varname>w</varname> are <literal>[]</literal>,
-            <literal>[]</literal> is returned for <varname>u</varname> and <varname>H</varname>.
-        </warning>
-    </refsection>
-    <refsection role="examples">
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-a = [ rand(1,1) 0  0 ]';
-[ra hm] = householder(a);
-[a ra hm*a ]
-norm(ra)
-
-b = rand(3,1);
-[rb, hm] = householder(b);
-[b rb eye(b) clean(hm*b) ]
-norm(rb)
-
-[rb2b, hm] = householder(b, 2*b);
-[b rb2b clean(hm*b ./ b) ]  // last column must be uniform
-norm(rb2b)                  // must be 1
-
-c = rand(3,1);
-[rbc, hm] = householder(b,c);
-norm(rbc)          // must be 1
-hm*b ./c           // must be uniform
-
-d = b + %i*c;
-e = rand(3,1) + %i*rand(3,1);
-[rde, hm] = householder(d,e);
-norm(rbc)               // must be 1
-clean(inv(hm) - hm)     // must be zeros(3,3)
-clean(hm' - hm)         // must be zeros(3,3)
-clean(det(hm))          // must be -1
- ]]></programlisting>
-        <para>
-            <emphasis role="bold">Application:</emphasis> Reflected image of an object w.r. to a given plane
-        </para>
-        <programlisting role="example"><![CDATA[
-// (OA) = [0 0 1] is reflected in O into (OB) = [ 1 1 0.3 ]:
-[n, H] = householder([0 0 1]', [ 1 1 0.3 ]');
-// "n" is the unit vector orthogonal to the reflecting plane
-
-// Emitting object (feature from shell demo):
-u = linspace(0,2*%pi,40);
-v = linspace(0,2*%pi,20);
-Xe = (cos(u).*u)'*(1+cos(v)/2)+10;
-Ye = (u/2)'*sin(v);
-Ze = (sin(u).*u)'*(1+cos(v)/2);
-
-// Reflected object:
-Pe = [ Xe(:)' ; Ye(:)' ; Ze(:)'];
-Pr = H*Pe;
-Xr = matrix(Pr(1,:),40,-1);
-Yr = matrix(Pr(2,:),40,-1);
-Zr = matrix(Pr(3,:),40,-1);
-
-// Reflecting plane containing O: n(1).x + n(2).y + n(3).z = 0
-//   Sampling space:
-x = linspace(min([Xe(:);Xr(:)]), max([Xe(:);Xr(:)]),20);
-y = linspace(min([Ye(:);Yr(:)]), max([Ye(:);Yr(:)]),20);
-[X, Y] = meshgrid(x,y);
-//   Generating the mirror:
-deff("z = mirror(x,y,n)","z = -n(1)/n(3)*x - n(2)/n(3)*y")
-Zm = mirror(X,Y,n);
-
-// Plotting:
-clf
-isoview()
-drawlater
-f = gcf();
-f.color_map = [ 0.8 0.8 0.8 ; jetcolormap(100)];
-surf(Xe,Ye,Ze)
-surf(X,Y,Zm)
-surf(Xr,Yr,Zr)
-a = gca();
-a.rotation_angles = [74 123];
-a.children.color_flag = 0;
-a.children.color_mode = 0;
-a.children(1).foreground = color("red");
-a.children(2).foreground = 1;
-a.children(3).foreground = color("green");
-drawnow()
- ]]></programlisting>
-        <scilab:image>
-            householder();
-        </scilab:image>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="qr">qr</link>
-            </member>
-            <member>
-                <link linkend="givens">givens</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>Histórico</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0</revnumber>
-                <revdescription>
-                    <para>Householder reflexion matrix added as second output parameter.
-                        Demo householder() added. Help page reviewed.
-                    </para>
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index 1300f7c..937ab67 100644 (file)
@@ -12,7 +12,7 @@
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             x = fminsearch ( costf , x0 )
             x = fminsearch ( costf , x0 , options )
index e016968..a1f80dd 100644 (file)
@@ -22,7 +22,7 @@
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             newobj = neldermead_new ()
             this = neldermead_destroy (this)
index 31b54d8..4e63e44 100644 (file)
@@ -22,7 +22,7 @@
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             newobj = nmplot_new ()
             this = nmplot_destroy (this)
index 93c761b..2124fe3 100644 (file)
@@ -8,7 +8,7 @@
         <refpurpose>Queries an optimization data structure.</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             val = optimget ( options , key )
             val = optimget ( options , key , value )
index 847ccd8..3fe7c80 100644 (file)
@@ -8,7 +8,7 @@
         <refpurpose>Plot the number of function evaluations of an optimization algorithm</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             optimplotfunccount ( x , optimValues , state )
         </synopsis>
index 307185b..2e05b9f 100644 (file)
@@ -8,7 +8,7 @@
         <refpurpose>Plot the function value of an optimization algorithm</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             optimplotfval ( x , optimValues , state )
         </synopsis>
index f762d77..e1b7d26 100644 (file)
@@ -8,7 +8,7 @@
         <refpurpose>Plot the value of the parameters of an optimization algorithm</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             optimplotx ( x , optimValues , state )
         </synopsis>
index 6e5d9bc..93e2c56 100644 (file)
@@ -8,7 +8,7 @@
         <refpurpose>Configures and returns an optimization data structure.</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>SYNOPSIS</title>
+        <title>Syntax</title>
         <synopsis>
             options = optimset ()
             options = optimset ( funname )
index b48ec33..f9f90f6 100644 (file)
             Y = grand(m, n, "unf", Low, High)
             Y = grand(m, n, "uin", Low, High)
             Y = grand(m, n, "lgi")
-            
+
             Y = grand(m, n, o,..,"..",...)
             Y = grand(X, ...)
-            
+        </synopsis>
+
+        <synopsis>
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
-            
+        </synopsis>
+
+        <synopsis>
             S = grand("getgen")
-            grand("setgen", gen)
-            
+                grand("setgen", gen)
+
             S = grand("getsd")
-            grand("setsd", S)
-            
-            S = grand("phr2sd", phrase)
-            
+                grand("setsd", S)
+
             grand("setcgn", G)
             S = grand("getcgn")
-            
+
+            S = grand("phr2sd", phrase)
+
             grand("initgn", I)
-            
             grand("setall", s1, s2, s3, s4)
-            
             grand("advnst", K)
         </synopsis>
     </refsynopsisdiv>
index bfe1b8c..19a1b09 100644 (file)
             Y = grand(m, n, "unf", Low, High)
             Y = grand(m, n, "uin", Low, High)
             Y = grand(m, n, "lgi")
-            
+
             Y = grand(m, n, o,..,"..",...)
-            Y = grand(X,...)
-            
+            Y = grand(X, ...)
+        </synopsis>
+
+        <synopsis>
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
-            
+        </synopsis>
+
+        <synopsis>
             S = grand("getgen")
-            grand("setgen", gen)
-            
-            S = grand("phr2sd", phrase)
-            
+                grand("setgen", gen)
+
             S = grand("getsd")
-            grand("setsd", S)
-            
+                grand("setsd", S)
+
             grand("setcgn", G)
             S = grand("getcgn")
-            
+
+            S = grand("phr2sd", phrase)
+
             grand("initgn", I)
-            
             grand("setall", s1, s2, s3, s4)
-            
             grand("advnst", K)
         </synopsis>
     </refsynopsisdiv>
index 314c7b3..32294fd 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>Y=grand(m, n, dist_type [,p1,...,pk])
-            Y=grand(X, dist_type [,p1,...,pk])
-            Y=grand(n, dist_type [,p1,...,pk])
-            S=grand(action [,q1,....,ql])
+        <synopsis>
+            Y = grand(m, n, "bet", A, B)
+            Y = grand(m, n, "bin", N, p)
+            Y = grand(m, n, "nbn", N, p)
+            Y = grand(m, n, "chi", Df)
+            Y = grand(m, n, "nch", Df, Xnon)
+            Y = grand(m, n, "exp", Av)
+            Y = grand(m, n, "f", Dfn, Dfd)
+            Y = grand(m, n, "nf", Dfn, Dfd, Xnon)
+            Y = grand(m, n, "gam", shape, rate)
+            Y = grand(m, n, "nor", Av, Sd)
+            Y = grand(m, n, "geom", p)
+            Y = grand(m, n, "poi", mu)
+            Y = grand(m, n, "def")
+            Y = grand(m, n, "unf", Low, High)
+            Y = grand(m, n, "uin", Low, High)
+            Y = grand(m, n, "lgi")
+
+            Y = grand(m, n, o,..,"..",...)
+            Y = grand(X, ...)
+        </synopsis>
+
+        <synopsis>
+            Y = grand(n, "mn", Mean, Cov)
+            Y = grand(n, "markov", P, x0)
+            Y = grand(n, "mul", nb, P)
+            Y = grand(n, "prm", vect)
+        </synopsis>
+
+        <synopsis>
+            S = grand("getgen")
+                grand("setgen", gen)
+
+            S = grand("getsd")
+                grand("setsd", S)
+
+            grand("setcgn", G)
+            S = grand("getcgn")
+
+            S = grand("phr2sd", phrase)
+
+            grand("initgn", I)
+            grand("setall", s1, s2, s3, s4)
+            grand("advnst", K)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>パラメータ</title>
         <variablelist>
             <varlistentry>
-                <term>m, n</term>
+                <term>m, n, o</term>
                 <listitem>
                     <para>
-                        整数, 出力行列 <literal>Y</literal>の大きさ
+                        integers, size of the wanted matrix / hypermatrix <varname>Y</varname>.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>X</term>
                 <listitem>
                     <para>
-                        次元(つまり<literal>mx n</literal>) のみ使用される行列 
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>dist_type</term>
-                <listitem>
-                    <para>生成する変量の分布の種類('bin', 'nor', 'poi', ...)を指定する文字列</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>p1, ..., pk</term>
-                <listitem>
-                    <para>
-                        分布<literal>dist_type</literal>を完全に定義するために必要なパラメータ (実数または整数)
+                      次元(つまり<literal>mx n</literal>) のみ使用される行列
                     </para>
                 </listitem>
             </varlistentry>
                 <term>Y</term>
                 <listitem>
                     <para>
-                        <literal>mx n</literal> ランダム出力行列
+                        depending on the input, a matrix or hypermatrix, with random entries.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>action</term>
-                <listitem>
-                    <para>
-                        基底生成器に指定する処理を記述する文字列
-                        (カレントの基底生成器を変更するには'setgen',
-                        カレントの基底生成器の名前を取得するには 'getgen',
-                        カレントの基底生成器の状態(シード)を取得するには
-                        'getsd',など...)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>q1, ..., ql</term>
-                <listitem>
-                    <para>処理を定義するためにひるようなパラメータ (通常は1つの文字列)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>S</term>
                 <listitem>
                     <para>処理の出力 (通常は文字列または実数の列ベクトル)</para>
index d36781d..c07f3b9 100644 (file)
             Y = grand(m, n, "unf", Low, High)
             Y = grand(m, n, "uin", Low, High)
             Y = grand(m, n, "lgi")
-            
+
             Y = grand(m, n, o,..,"..",...)
             Y = grand(X, ...)
-            
+        </synopsis>
+
+        <synopsis>
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
-            
+        </synopsis>
+
+        <synopsis>
             S = grand("getgen")
-            grand("setgen", gen)
-            
+                grand("setgen", gen)
+
             S = grand("getsd")
-            grand("setsd", S)
-            
-            S = grand("phr2sd", phrase)
-            
+                grand("setsd", S)
+
             grand("setcgn", G)
             S = grand("getcgn")
-            
+
+            S = grand("phr2sd", phrase)
+
             grand("initgn", I)
-            
             grand("setall", s1, s2, s3, s4)
-            
             grand("advnst", K)
         </synopsis>
     </refsynopsisdiv>
index 33e9710..cc09da6 100644 (file)
           xmlns:db="http://docbook.org/ns/docbook">
     <refnamediv>
         <refname>csvDefault</refname>
-        
         <refpurpose>Get or set defaults behavior for csv files.</refpurpose>
     </refnamediv>
-    
+
     <refsynopsisdiv>
         <title>Syntax</title>
-        
-        <synopsis>allvalues = csvDefault() </synopsis>
-        
-        <synopsis>value = csvDefault(field) </synopsis>
-        
-        <synopsis>bRes = csvDefault(field, value) </synopsis>
+        <synopsis>
+          allvalues = csvDefault()
+          value = csvDefault(field)
+          bRes = csvDefault(field, value)
+        </synopsis>
     </refsynopsisdiv>
-    
+
     <refsection>
         <title>Parameters</title>
-        
         <variablelist>
             <varlistentry>
                 <term>allvalues</term>
-                
                 <listitem>
                     <para>a 6-by-2 matrix of strings, the values of all the fields. The
                         first column contains the available fields, while the second column
                     </para>
                 </listitem>
             </varlistentry>
-            
             <varlistentry>
                 <term>field</term>
-                
                 <listitem>
                     <para>a 1-by-1 matrix of strings, the name of the field to get or
                         set. The available values of <literal>field</literal> are
                     </para>
                 </listitem>
             </varlistentry>
-            
             <varlistentry>
                 <term>value</term>
-                
                 <listitem>
                     <para>a 1-by-1 matrix of strings, the value of the field to get or
                         set.
                     </para>
                 </listitem>
             </varlistentry>
-            
             <varlistentry>
                 <term>bRes</term>
-                
                 <listitem>
                     <para>a 1-by-1 matrix of booleans, bRes is true if the value was
                         correctly set, bRes is wrong is the value was not correct.
             </varlistentry>
         </variablelist>
     </refsection>
-    
+
     <refsection>
         <title>Description</title>
-        
         <para>This function allows to query or configure the options of the csv
             files. These options are used by the read and write function when the user
             does not specify them in the syntax.
         </para>
-        
         <para>
             The <literal>allvalues = csvDefault()</literal> syntax
             returns the value of all the fields.
         </para>
-        
         <para>
             The <literal>value = csvDefault(field)</literal> syntax
             returns the value corresponding to the given field.
         </para>
-        
         <para>
             The <literal>bRes = csvDefault(field, value)</literal> calling
             sequence allows to set the value of the given field. <itemizedlist>
                         field is unchanged.
                     </para>
                 </listitem>
-                
                 <listitem>
                     <para>If the function is able to change the field to the given
                         value, then <literal>bRes</literal> is true.
                 </listitem>
             </itemizedlist>
         </para>
-        
         <para>The available fields are the following. <itemizedlist>
                 <listitem>
                     <para>field = "separator": the separator of the columns of the csv
                         files. Default separator = ",".
                     </para>
                 </listitem>
-                
                 <listitem>
                     <para>field = "decimal": the decimal point used in the csv files.
                         The available values are "." or ",". Default decimal = ".".
                     </para>
                 </listitem>
-                
                 <listitem>
                     <para>field = "conversion": the type of the output of the
                         <literal>csvRead</literal>function. Possible values are "string" or
                         doubles.
                     </para>
                 </listitem>
-                
                 <listitem>
                     <para>field = "precision": the C format used to create the strings
                         from the doubles in the <literal>csvWrite</literal> function. The
                             <listitem>
                                 <para>type: lf, lg, d, i, e, f, g</para>
                             </listitem>
-                            
                             <listitem>
                                 <para>width: Optional number that specifies the minimum number
                                     of characters output.
                                 </para>
                             </listitem>
-                            
                             <listitem>
                                 <para>precision: Optional number that specifies the maximum
                                     number of characters printed for all or part of the output
                         </itemizedlist>
                     </para>
                 </listitem>
-                
                 <listitem>
                     <para>field = "regexp": regular expression used to extract comments
                         of the <literal>csvRead</literal>function.
                     </para>
-                    
                     <para>by default, this value is '' (no regexp).</para>
                 </listitem>
-                
                 <listitem>
                     <para>field = "eol": end of line used to write lines of the
                         <literal>csvWrite</literal>function.
                     </para>
-                    
                     <para>Possible values are "linux", "windows", "macos9".</para>
-                    
                     <para>by default, this value is platform-dependent.</para>
                 </listitem>
-                
                 <listitem>
                     <para>field = "encoding":</para>
-                    
                     <para>Possible values are "utf-8", "iso-latin".</para>
-                    
                     <para>by default, this value is "utf-8".</para>
                 </listitem>
-                
                 <listitem>
                     <para>field = "blank": remove all blank lines before to parse
                         text
                     </para>
-                    
                     <para>Possible values are "on", "off".</para>
-                    
                     <para>by default, this value is "on".</para>
                 </listitem>
             </itemizedlist>
         </para>
     </refsection>
-    
+
     <refsection>
         <title>Examples</title>
-        
-        <programlisting role="example">// See all the available fields
+        <programlisting role="example">
+            // See all the available fields
             allvalues = csvDefault()
+
             // Get the value of the "precision" field
             value = csvDefault("precision")
+
             // Set the value of the "precision" field
             bRes = csvDefault("precision","%.17e") // Expected = %t
-            // Set the value of the "precision" field to 
-            // an impossible value
-            bRes = csvDefault("precision","Ouch!") // Expected = %f    
+
+            // Set the value of the "precision" field to an impossible value
+            bRes = csvDefault("precision","Ouch!") // Expected = %f
         </programlisting>
     </refsection>
-    
+
     <refsection>
         <title>See also</title>
-        
         <simplelist type="inline">
             <member>
                 <link linkend="csvRead">csvRead</link>
             </member>
-            
             <member>
                 <link linkend="csvWrite">csvWrite</link>
             </member>
         </simplelist>
     </refsection>
+
     <refsection>
         <title>History</title>
         <revhistory>
                 <revnumber>5.4.1</revnumber>
                 <revremark>'blank' is enabled by default.</revremark>
             </revision>
-            
         </revhistory>
     </refsection>
 </refentry>
-
index 247ec0f..66a9644 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>allvalues = csvDefault() </synopsis>
-        <synopsis>value = csvDefault(field) </synopsis>
-        <synopsis>bRes = csvDefault(field, value) </synopsis>
+        <synopsis>
+          allvalues = csvDefault()
+          value = csvDefault(field)
+          bRes = csvDefault(field, value)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>パラメータ</title>
@@ -27,7 +29,7 @@
             <varlistentry>
                 <term>allvalues</term>
                 <listitem>
-                    <para>6行2列の文字列行列で, 全フィールドの値です. 
+                    <para>6行2列の文字列行列で, 全フィールドの値です.
                         最初の列には利用可能なフィールドが含まれ,
                         2番目の列には現在の値が含まれます.
                     </para>