[Obsolete] milk_drop 34/15334/4
Bruno JOFRET [Tue, 7 Oct 2014 12:15:31 +0000 (14:15 +0200)]
Change-Id: I6b2811747df602c3d5f91d76d7ad726c1be31bbc

12 files changed:
scilab/CHANGES_5.5.X
scilab/modules/graphics/help/en_US/3d_plot/milk_drop.xml [deleted file]
scilab/modules/graphics/help/fr_FR/3d_plot/milk_drop.xml [deleted file]
scilab/modules/graphics/help/ja_JP/3d_plot/milk_drop.xml [deleted file]
scilab/modules/graphics/help/pt_BR/3d_plot/milk_drop.xml [deleted file]
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/milk_drop.sci [deleted file]
scilab/modules/graphics/tests/nonreg_tests/bug_2983.dia.ref
scilab/modules/graphics/tests/nonreg_tests/bug_2983.tst
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/signal_processing/help/en_US/transforms/dct.xml
scilab/modules/signal_processing/help/ja_JP/transforms/dct.xml

index e1fe76d..3c94390 100644 (file)
@@ -14,6 +14,8 @@ Removed Functions
 
 * IsAScalar removed. Please use isscalar instead.
 
+* milk_drop removed.
+
                      Changes between version 5.5.0 and 5.5.1
                      =======================================
 
diff --git a/scilab/modules/graphics/help/en_US/3d_plot/milk_drop.xml b/scilab/modules/graphics/help/en_US/3d_plot/milk_drop.xml
deleted file mode 100644 (file)
index d2e85d1..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Serge Steer
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="milk_drop">
-    <refnamediv>
-        <refname>milk_drop</refname>
-        <refpurpose>
-            Milk drop 3D function. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>z=milk_drop(x,y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y</term>
-                <listitem>
-                    <para>two row vectors of size n1 and n2.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>z</term>
-                <listitem>
-                    <para>matrix of size (n1,n2).</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <warning>
-            This function is obsolete.
-            It will be permanently removed in Scilab 5.5.1
-        </warning>
-        <para>
-            <literal>milk_drop</literal> is a function representing the surface of a milk drop
-            falling down into milk. It can be used to test functions
-            <literal>eval3d</literal> and <literal>plot3d</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-x=-2:0.1:2;
-y=x;
-z=eval3d(milk_drop,x,y);
-plot3d(x,y,z)
- ]]></programlisting>
-        <scilab:image>
-            warning("off")
-            x=-2:0.1:2;
-            y=x;
-            z=eval3d(milk_drop,x,y);
-            plot3d(x,y,z)
-            warning("on")
-        </scilab:image>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="eval3d">eval3d</link>
-            </member>
-            <member>
-                <link linkend="plot3d">plot3d</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revdescription>
-                    Function tagged as obsolete. Will be removed in 5.5.1.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/fr_FR/3d_plot/milk_drop.xml b/scilab/modules/graphics/help/fr_FR/3d_plot/milk_drop.xml
deleted file mode 100644 (file)
index ced2f3f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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="fr" xml:id="milk_drop">
-    <refnamediv>
-        <refname>milk_drop</refname>
-        <refpurpose>représentation d'une goutte de lait  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>z=milk_drop(x,y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y  </term>
-                <listitem>
-                    <para>deux vecteurs lignes de taille n1 et n2.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>z  </term>
-                <listitem>
-                    <para>matrice de taille (n1,n2).
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>milk_drop</literal> est une fonction représentant la surface d'une goutte de lait
-            tombant dans du lait. Elle peut être utilisée pour tester les fonctions <literal>eval3d</literal> et <literal>plot3d</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[
-x=-2:0.1:2; y=x;
-z=eval3d(milk_drop,x,y);
-plot3d(x,y,z)
- ]]></programlisting>
-        <scilab:image>
-            warning("off")
-            x=-2:0.1:2;
-            y=x;
-            z=eval3d(milk_drop,x,y);
-            plot3d(x,y,z)
-            warning("on")
-        </scilab:image>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="eval3d">eval3d</link>
-            </member>
-            <member>
-                <link linkend="plot3d">plot3d</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/ja_JP/3d_plot/milk_drop.xml b/scilab/modules/graphics/help/ja_JP/3d_plot/milk_drop.xml
deleted file mode 100644 (file)
index c52bc54..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) INRIA - Serge Steer
-
- * 
-
- * This file must be used under the terms of the CeCILL.
-
- * This source file is licensed as described in the file COPYING, which
-
- * you should have received as part of this distribution.  The terms
-
- * are also available at    
-
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-
- *
-
- -->
-
-
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="ja" xml:id="milk_drop">
-    
-    
-    
-    <refnamediv>
-        
-        
-        
-        <refname>milk_drop</refname>
-        
-        
-        
-        <refpurpose>ミルクドロップ3次元関数
-            
-            
-            
-            <emphasis role="bold">この関数は廃止されます.</emphasis>
-            
-            
-            
-        </refpurpose>
-        
-        
-        
-    </refnamediv>
-    
-    
-    
-    <refsynopsisdiv>
-        
-        
-        
-        <title>呼び出し手順</title>
-        
-        
-        
-        <synopsis>z=milk_drop(x,y)</synopsis>
-        
-        
-        
-    </refsynopsisdiv>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>引数</title>
-        
-        
-        
-        <variablelist>
-            
-            
-            
-            <varlistentry>
-                
-                
-                
-                <term>x,y</term>
-                
-                
-                
-                <listitem>
-                    
-                    
-                    
-                    <para>大きさ n1 および n2の行ベクトル.</para>
-                    
-                    
-                    
-                </listitem>
-                
-                
-                
-            </varlistentry>
-            
-            
-            
-            <varlistentry>
-                
-                
-                
-                <term>z</term>
-                
-                
-                
-                <listitem>
-                    
-                    
-                    
-                    <para>大きさ (n1,n2)の行列.</para>
-                    
-                    
-                    
-                </listitem>
-                
-                
-                
-            </varlistentry>
-            
-            
-            
-        </variablelist>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>説明</title>
-        
-        
-        
-        <warning>
-            
-            
-            
-            この関数は廃止されます.
-            
-            
-            
-            この関数は Scilab 5.5.1で削除されます.
-            
-            
-            
-        </warning>
-        
-        
-        
-        <para>
-            
-            
-            
-            <literal>milk_drop</literal> はミルクに落ちるミルクドロップの曲面を
-            
-            
-            
-            表す関数です.
-            
-            
-            
-            この関数は<literal>eval3d</literal> および <literal>plot3d</literal>のテスト用の
-            
-            
-            
-            関数として使用できます.
-            
-            
-            
-        </para>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>例</title>
-        
-        
-        
-        <programlisting role="example"><![CDATA[ 
-
-x=-2:0.1:2; y=x;
-
-z=eval3d(milk_drop,x,y);
-
-plot3d(x,y,z)
-
- ]]></programlisting>
-        
-        
-        
-        <scilab:image>
-            
-            
-            
-            warning("off")
-            
-            
-            
-            x=-2:0.1:2;
-            
-            
-            
-            y=x;
-            
-            
-            
-            z=eval3d(milk_drop,x,y);
-            
-            
-            
-            plot3d(x,y,z)
-            
-            
-            
-            warning("on")
-            
-            
-            
-        </scilab:image>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection role="see also">
-        
-        
-        
-        <title>参照</title>
-        
-        
-        
-        <simplelist type="inline">
-            
-            
-            
-            <member>
-                
-                
-                
-                <link linkend="eval3d">eval3d</link>
-                
-                
-                
-            </member>
-            
-            
-            
-            <member>
-                
-                
-                
-                <link linkend="plot3d">plot3d</link>
-                
-                
-                
-            </member>
-            
-            
-            
-        </simplelist>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>履歴</title>
-        
-        
-        
-        <revhistory>
-            
-            
-            
-            <revision>
-                
-                
-                
-                <revnumber>5.5.0</revnumber>
-                
-                
-                
-                <revdescription>
-                    
-                    
-                    
-                    関数が廃止対象となりました. 5.5.1で削除されます.
-                    
-                    
-                    
-                </revdescription>
-                
-                
-                
-            </revision>
-            
-            
-            
-        </revhistory>
-        
-        
-        
-    </refsection>
-    
-    
-    
-</refentry>
-
-
-
diff --git a/scilab/modules/graphics/help/pt_BR/3d_plot/milk_drop.xml b/scilab/modules/graphics/help/pt_BR/3d_plot/milk_drop.xml
deleted file mode 100644 (file)
index 2322a1f..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Serge Steer
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="milk_drop" xml:lang="en">
-    <refnamediv>
-        <refname>milk_drop</refname>
-        <refpurpose>Função 3d gota de leite</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>z=milk_drop(x,y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y</term>
-                <listitem>
-                    <para>dois vetores linhas de tamanhos n1 e n2.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>z</term>
-                <listitem>
-                    <para>matriz de tamanho (n1,n2).</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            <literal>milk_drop</literal> é uma função que representa uma gota de
-            leite caindo no leite. Pode ser usada para testar funções
-            <literal>eval3d</literal> e <literal>plot3d</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-x=-2:0.1:2; y=x;
-z=eval3d(milk_drop,x,y);
-plot3d(x,y,z)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="eval3d">eval3d</link>
-            </member>
-            <member>
-                <link linkend="plot3d">plot3d</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index e9aae6d..49c5922 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-09-18 17:01+0100\n"
+"Revision-Date: 2014-10-08 15:55+0100\n"
 
 # File: sci_gateway/c/gw_graphics.c, line: 134
 # File: src/nographics/nographics.c, line: 83
@@ -3218,7 +3218,6 @@ msgstr ""
 # File: macros/hsvcolormap.sci, line: 13
 # File: macros/isoview.sci, line: 14
 # File: macros/jetcolormap.sci, line: 19
-# File: macros/milk_drop.sci, line: 13
 # File: macros/nf3d.sci, line: 15
 # File: macros/oceancolormap.sci, line: 15
 # File: macros/pinkcolormap.sci, line: 15
diff --git a/scilab/modules/graphics/macros/milk_drop.sci b/scilab/modules/graphics/macros/milk_drop.sci
deleted file mode 100644 (file)
index 5c5ffad..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-
-function [z]=milk_drop(x,y)
-    warnobsolete(scilabRemovedVersion="5.5.1");
-
-    if argn(2)<>2 then
-        error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), "milk_drop", 2));
-    end
-
-    sq=x.^2+y.^2;
-    z= exp( exp(-sq).*(exp(cos(sq).^20)+8*sin(sq).^20+2*sin(2*(sq)).^8) );
-endfunction
index f1618e6..b00b7b4 100644 (file)
 //
 // <-- Short Description -->
 // If figure_size property is modified more than one time, next changes have no effect on the figure.
+function [z]=__milk_drop(x,y)
+    sq=x.^2+y.^2;
+    z= exp( exp(-sq).*(exp(cos(sq).^20)+8*sin(sq).^20+2*sin(2*(sq)).^8) );
+endfunction
 x=-2:0.1:2; y=x;
-z=eval3d(milk_drop,x,y);
-WARNING: Feature milk_drop is obsolete.
-         This feature will be permanently removed in Scilab 5.5.1
-
+z=eval3d(__milk_drop,x,y);
 plot3d(x,y,z)
 a=gca();
 a.children(1).hiddencolor
index f0089e4..bf7b4a0 100644 (file)
 //
 // <-- Short Description -->
 // If figure_size property is modified more than one time, next changes have no effect on the figure.
+function [z]=__milk_drop(x,y)
+    sq=x.^2+y.^2;
+    z= exp( exp(-sq).*(exp(cos(sq).^20)+8*sin(sq).^20+2*sin(2*(sq)).^8) );
+endfunction
 
 x=-2:0.1:2; y=x;
-z=eval3d(milk_drop,x,y);
+z=eval3d(__milk_drop,x,y);
 plot3d(x,y,z)
 
 
@@ -29,6 +33,3 @@ a.children(1).hiddencolor=5;
 // check that no hidden facets appears.
 // Might be updated when image processing will be integrated in Scilab.
 // Export and check that no hidden color appears on the image
-
-
-
index fbb4795..c7bac98 100644 (file)
         
         <para>2-D dct</para>
         <programlisting role="example"><![CDATA[
+  function [z]=__milk_drop(x,y)
+      sq=x.^2+y.^2;
+      z= exp( exp(-sq).*(exp(cos(sq).^20)+8*sin(sq).^20+2*sin(2*(sq)).^8) );
+  endfunction
   x=-2:0.1:2;
-  A=eval3d(milk_drop,x,x);
+  A=eval3d(__milk_drop,x,x);
   d=dct(A);
   d(abs(d)<1)=0;
   size(find(d<>0),'*')
index 40d3c71..a4cc64c 100644 (file)
@@ -3,19 +3,19 @@
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) 1997   - INRIA
 * Copyright (C) 2012 - Serge Steer - INRIA
-* 
+*
 * This file must be used under the terms of the CeCILL.
 * This source file is licensed as described in the file COPYING, which
 * you should have received as part of this distribution.  The terms
-* are also available at    
+* are also available at
 * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 *
 -->
-<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="ja" xml:id="dct">
     <refnamediv>
         <refname>dct</refname>
                     <literal>"dct4"</literal> または <literal>"dct"</literal>,
                     逆変換の場合は <literal>"dct1"</literal>,
                     <literal>"dct3"</literal>, <literal>"dct4"</literal>または
-                    <literal>"idct"</literal> です.  
+                    <literal>"idct"</literal> です.
                     デフォルト値は,順方向変換の場合に<literal>"dct"</literal>,
                     逆変換の場合に<literal>"idct"</literal>です.
                     詳細は説明を参照ください.
         </variablelist>
     </refsection>
     <refsection>
-        <title>説明</title> 
+        <title>説明</title>
         <refsection>
-            <title>変換の説明</title> 
+            <title>変換の説明</title>
             <para>
                 この関数は,
                 パラメータ値<literal>option</literal>で指定したシフト量を用いて
                     \text{with}\\
                     \omega_j(1)=\frac{1}{\sqrt{n_j}}\\
                     \omega_j(k)=\sqrt{\frac{2}{n_j}} , k>1
-                    \end{array}$ 
+                    \end{array}$
                 </latex>
             </para>
             <para>
                                     例えば, <literal>A</literal> が3次元配列の場合,
                                     <literal>X=dct(A,-1,2)</literal> は以下と等価になります:
                                 </para>
-                                <programlisting role=""><![CDATA[ 
+                                <programlisting role=""><![CDATA[
             for i1=1:size(A,1),
               for i3=1:size(A,3),
                 X(i1,:,i3)=dct(A(i1,:,i3),-1);
                                     そして <literal>X=dct(A,-1,[1 3])</literal> は
                                     以下と等価になります:
                                 </para>
-                                <programlisting role=""><![CDATA[ 
+                                <programlisting role=""><![CDATA[
             for i2=1:size(A,2),
               X(:,i2,:)=dct(A(:,i2,:),-1);
             end
         <refsection>
             <title>dctを最適化</title>
             <para>
-                注意: 
+                注意:
                 この関数は直近のパラメータをメモリに保持し,2回目に再利用します.
                 これにより(同じパラメータで)連続的にコールした場合の
                 計算時間が著しく改善されます.
             </para>
-            <para> 
+            <para>
                 <link linkend="get_fftw_wisdom">get_fftw_wisdom</link>, <link
           linkend="set_fftw_wisdom">set_fftw_wisdom</link> 関数により
                 dctを更に最適化することができます.
     <refsection>
         <title>例</title>
         <para>1次元dct</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
   // 信号の周波数要素
   //----------------------------------
   // 50および70Hzの信号を含む1000hzで標本化された信号を構築
   clf;plot(s,'b'),plot(dct(d,1),'r')
   ]]></programlisting>
         <para>2次元 dct</para>
-        <programlisting role="example"><![CDATA[ 
-  ----------------------------------
+        <programlisting role="example"><![CDATA[
+  //----------------------------------
+  function [z]=__milk_drop(x,y)
+      sq=x.^2+y.^2;
+      z= exp( exp(-sq).*(exp(cos(sq).^20)+8*sin(sq).^20+2*sin(2*(sq)).^8) );
+  endfunction
   x=-2:0.1:2;
-  A=eval3d(milk_drop,x,x);
+  A=eval3d(__milk_drop,x,x);
   d=dct(A);
   d(abs(d)<1)=0;
   size(find(d1<>0),'*')