lex_sort() removal 94/18194/5
Samuel GOUGEON [Mon, 30 May 2016 04:35:48 +0000 (06:35 +0200)]
Change-Id: I801097c2da90c7c99da47fbc98e5567f72052fee

18 files changed:
scilab/CHANGES
scilab/modules/core/tests/nonreg_tests/bug_8086.dia.ref
scilab/modules/core/tests/nonreg_tests/bug_8086.tst
scilab/modules/elementary_functions/help/en_US/searchandsort/lex_sort.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/setoperations/unique.xml
scilab/modules/elementary_functions/help/fr_FR/searchandsort/lex_sort.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/setoperations/unique.xml
scilab/modules/elementary_functions/help/ja_JP/searchandsort/lex_sort.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/setoperations/unique.xml
scilab/modules/elementary_functions/help/pt_BR/searchandsort/lex_sort.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/setoperations/unique.xml
scilab/modules/elementary_functions/help/ru_RU/searchandsort/lex_sort.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/setoperations/unique.xml
scilab/modules/elementary_functions/locales/elementary_functions.pot
scilab/modules/elementary_functions/macros/lex_sort.sci [deleted file]
scilab/modules/elementary_functions/tests/nonreg_tests/bug_3520.dia.ref [deleted file]
scilab/modules/elementary_functions/tests/nonreg_tests/bug_3520.tst [deleted file]
scilab/modules/helptools/data/configuration/scilab_macros.txt

index a5331d4..36d2d19 100644 (file)
@@ -99,8 +99,8 @@ Other feature changes
 
 * The graphics entity "Datatip" has its property "z_component = 'on|off'"
   changed to "display_components = 'xyz'", now it is possible to choose which
-  components to display and the order. Loading old *.scg files containing 
-  datatips with "z_component" property may not display the z component. 
+  components to display and the order. Loading old *.scg files containing
+  datatips with "z_component" property may not display the z component.
 
 Other feature additions
 =======================
@@ -305,6 +305,8 @@ Removed Functions
 
 * plot2d1 has been removed. Please use plot2d() instead.
 
+* lex_sort has been removed. Please use gsort(..,"lr") instead
+
 * Symbolic module functions have been removed:
   - addf
   - cmb_lin
index f15e8e9..abb2c5c 100644 (file)
@@ -45,7 +45,6 @@ macros_error_type_1 = ["isscalar"; ..
 "isinf"; ..
 "isnan"; ..
 "isvector"; ..
-"lex_sort"; ..
 "log10"; ..
 "log2"; ..
 "logm"; ..
index f15e8e9..abb2c5c 100644 (file)
@@ -45,7 +45,6 @@ macros_error_type_1 = ["isscalar"; ..
 "isinf"; ..
 "isnan"; ..
 "isvector"; ..
-"lex_sort"; ..
 "log10"; ..
 "log2"; ..
 "logm"; ..
diff --git a/scilab/modules/elementary_functions/help/en_US/searchandsort/lex_sort.xml b/scilab/modules/elementary_functions/help/en_US/searchandsort/lex_sort.xml
deleted file mode 100644 (file)
index 63a3c14..0000000
+++ /dev/null
@@ -1,98 +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) 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="lex_sort" xml:lang="en">
-    <refnamediv>
-        <refname>lex_sort</refname>
-        <refpurpose>lexicographic matrix rows sorting</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[N, [k]]=lex_sort(M [,sel] [,'unique'])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>M</term>
-                <listitem>
-                    <para>real matrix</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>N</term>
-                <listitem>
-                    <para>real matrix</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>k</term>
-                <listitem>
-                    <para>column vector of integers</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            the <literal>lex_sort</literal> function is now obsolete. It can be
-            replaced by functions <link linkend="gsort">gsort</link> and <link linkend="unique">unique</link>.
-        </para>
-        <para>
-            <literal>N=lex_sort(M)</literal> sorts the rows (as a group) of the
-            matrix <literal>M</literal> in ascending order. If required the output
-            argument <literal>k</literal> contains the ordering:
-            <literal>[N,k]=lex_sort(M)</literal> returns <literal>k</literal> such as
-            <literal>N</literal> is equal to <literal>M(k,:)</literal> .
-        </para>
-        <para>
-            <literal>N=lex_sort(M,sel [,'unique'])</literal> produces the same
-            result as the following sequence of instructions:
-        </para>
-        <programlisting><![CDATA[ 
-[N,k]=lex_sort(M(:,sel) [,'unique']);
-N=M(k,:)
- ]]></programlisting>
-        <para>
-            The <literal>'unique'</literal> flag has to be given if one wants to
-            retain only unique rows in the result. Note that
-            <literal>lex_sort(M,sel,'unique')</literal> retains only rows such that
-            M(:,sel) are unique.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,3));
-
-lex_sort(M)
-lex_sort(M,'unique')
-[N,k]=lex_sort(M,[1 3],'unique')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="gsort">gsort</link>
-            </member>
-            <member>
-                <link linkend="unique">unique</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index d1e6d85..66561f4 100644 (file)
@@ -2,7 +2,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="unique" xml:lang="en">
     <refnamediv>
         <refname>unique</refname>
-        <refpurpose>extract unique components of a vector or matrices</refpurpose>
+        <refpurpose>remove all duplicate components of a vector or a matrix</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [N [,k]]=unique(M)
-            [N [,k]]=unique(M ,orient)
+            [N ,k] = unique(M)
+            [N ,k] = unique(M ,orient)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
@@ -54,7 +54,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>unique(M)</literal> returns a vector which retains the
             position of the first encountered unique entries.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,1));
+        <programlisting role="example"><![CDATA[
+M = round(2*rand(20,1));
 
 unique(M)
-[N,k]=unique(M)
+[N,k] = unique(M)
 
 unique(string(M))
-[N,k]=unique(string(M))
+[N,k] = unique(string(M))
 
 A = [0,0,1,1;
      0,1,1,1;
@@ -92,15 +92,15 @@ A = [0,0,1,1;
      0,2,2,2;
      2,0,1,1;
      0,0,1,1];
-T='x'+string(A);
+T = 'x'+string(A);
 
 //unique rows
 
-[m,k]=unique(A,'r')
+[m,k] = unique(A,'r')
 unique(T,'r')
 
 //unique columns
-[m,k]=unique(T,'c')
+[m,k] = unique(T,'c')
 unique(A,'c')
  ]]></programlisting>
     </refsection>
@@ -111,16 +111,13 @@ unique(A,'c')
                 <link linkend="members">members</link>
             </member>
             <member>
-                <link linkend="union">union</link>
-            </member>
-            <member>
-                <link linkend="intersect">intersect</link>
+                <link linkend="gsort">gsort</link>
             </member>
             <member>
-                <link linkend="gsort">gsort</link>
+                <link linkend="union">union</link>
             </member>
             <member>
-                <link linkend="lex_sort">lex_sort</link>
+                <link linkend="intersect">intersect</link>
             </member>
         </simplelist>
     </refsection>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/searchandsort/lex_sort.xml b/scilab/modules/elementary_functions/help/fr_FR/searchandsort/lex_sort.xml
deleted file mode 100644 (file)
index d3de6e5..0000000
+++ /dev/null
@@ -1,81 +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: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="lex_sort" xml:lang="fr">
-    <refnamediv>
-        <refname>lex_sort</refname>
-        <refpurpose>tri des lignes d'une matrice suivant l'ordre
-            lexicographique.
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>[N, [k]]=lex_sort(M [,sel] [,'unique'])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>M,N</term>
-                <listitem>
-                    <para>matrices réelles</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>k</term>
-                <listitem>
-                    <para>vecteur colonne d'entiers</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            la fonction <literal>lex_sort</literal> est désormais obsolete elle
-            peut être remplacée par les fonctions <link linkend="gsort">gsort</link>
-            et <link linkend="unique">unique</link>.
-        </para>
-        <para>
-            <literal>N=lex_sort(M)</literal> trie les lignes de la matrice
-            <literal>M</literal> dans l'ordre croissant. Si nécessaire l'argument de
-            sortie <literal>k</literal> permet de retrouver l'ordre du tri :
-            <literal>[N,k]=lex_sort(M)</literal> renvoie <literal>k</literal> tel que
-            <literal>N</literal> est égal à <literal>M(k,:)</literal> .
-        </para>
-        <para>
-            <literal>N=lex_sort(M,sel [,'unique'])</literal> produit le même
-            résultat que la suite d'instructions suivante :
-        </para>
-        <programlisting role=""><![CDATA[  
-[N,k]=lex_sort(M(:,sel) [,'unique']);
-N=M(k,:)
- ]]></programlisting>
-        <para>
-            La chaîne de caractères <literal>'unique'</literal> doit être
-            utilisée si on ne veut retenir que les lignes uniques dans le résultat.
-            Noter que <literal>lex_sort(M,sel,'unique')</literal> ne retient que les
-            lignes de M telles que M(:,sel) est unique.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,3));
-
-lex_sort(M)
-lex_sort(M,'unique')
-[N,k]=lex_sort(M,[1 3],'unique')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="gsort">gsort</link>
-            </member>
-            <member>
-                <link linkend="unique">unique</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 15214e5..a6dbeb1 100644 (file)
@@ -2,25 +2,23 @@
 <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="unique" xml:lang="fr">
     <refnamediv>
         <refname>unique</refname>
-        <refpurpose>extrait les composantes distinctes d'un vecteur ou d'une
-            matrice
+        <refpurpose>supprime tous les éléments en doublon dans un vecteur ou une matrice
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
         <synopsis>
-            [N [,k]]=unique(M)
-            [N [,k]]=unique(M,orient)
+            [N [,k]] = unique(M)
+            [N [,k]] = unique(M,orient)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
                 <term>M</term>
                 <listitem>
-                    <para>vecteur ou matrice de nombres ou de chaînes de
-                        caractères
+                    <para>vecteur ou matrice de nombres ou de chaînes de caractères
                     </para>
                 </listitem>
             </varlistentry>
@@ -46,7 +44,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>unique(M)</literal> renvoie un vecteur contenant les
             <literal>M</literal>.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,1));
+        <programlisting role="example"><![CDATA[
+M = round(2*rand(20,1));
 
 unique(M)
-[N,k]=unique(M)
+[N,k] = unique(M)
 
 unique(string(M))
-[N,k]=unique(string(M))
+[N,k] = unique(string(M))
 
 A = [0,0,1,1;
      0,1,1,1;
@@ -86,15 +84,15 @@ A = [0,0,1,1;
      0,2,2,2;
      2,0,1,1;
      0,0,1,1];
-T='x'+string(A);
+T = 'x'+string(A);
 
 //unique rows
 
-[m,k]=unique(A,'r')
+[m,k] = unique(A,'r')
 unique(T,'r')
 
 //unique columns
-[m,k]=unique(T,'c')
+[m,k] = unique(T,'c')
 unique(A,'c')
  ]]></programlisting>
     </refsection>
@@ -105,16 +103,13 @@ unique(A,'c')
                 <link linkend="members">members</link>
             </member>
             <member>
-                <link linkend="union">union</link>
-            </member>
-            <member>
-                <link linkend="intersect">intersect</link>
+                <link linkend="gsort">gsort</link>
             </member>
             <member>
-                <link linkend="gsort">gsort</link>
+                <link linkend="union">union</link>
             </member>
             <member>
-                <link linkend="lex_sort">lex_sort</link>
+                <link linkend="intersect">intersect</link>
             </member>
         </simplelist>
     </refsection>
diff --git a/scilab/modules/elementary_functions/help/ja_JP/searchandsort/lex_sort.xml b/scilab/modules/elementary_functions/help/ja_JP/searchandsort/lex_sort.xml
deleted file mode 100644 (file)
index 38e037c..0000000
+++ /dev/null
@@ -1,179 +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) 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="lex_sort" xml:lang="ja">
-    
-    <refnamediv>
-        
-        <refname>lex_sort</refname>
-        
-        <refpurpose>行列の行の辞書式ソート</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[N, [k]]=lex_sort(M [,sel] [,'unique'])
-            
-        </synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>M</term>
-                
-                <listitem>
-                    
-                    <para>実数行列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>N</term>
-                
-                <listitem>
-                    
-                    <para>実数行列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>k</term>
-                
-                <listitem>
-                    
-                    <para>整数の列ベクトル</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <literal>lex_sort</literal> 関数は現在では廃止されています.
-            
-            関数 <link linkend="gsort">gsort</link> および 
-            
-            <link linkend="unique">unique</link>で置き換えることが可能です.
-            
-        </para>
-        
-        <para>
-            
-            <literal>N=lex_sort(M)</literal> は行列<literal>M</literal>
-            
-            の行(グループとして)を昇順にソートします.
-            
-            以下のように出力引数 <literal>k</literal> を指定した場合
-            
-            順番が含まれます:
-            
-            <literal>[N,k]=lex_sort(M)</literal> は 
-            
-            <literal>N</literal> が <literal>M(k,:)</literal> に等しいような
-            
-            <literal>k</literal> を返します.
-            
-        </para>
-        
-        <para>
-            
-            <literal>N=lex_sort(M,sel [,'unique'])</literal> は
-            
-            以下の一連の命令と同じ結果を出力します:
-            
-        </para>
-        
-        <programlisting role=""><![CDATA[ 
-[N,k]=lex_sort(M(:,sel) [,'unique']);
-N=M(k,:)
- ]]></programlisting>
-        
-        <para>結果にユニークな行のみを保持させたい場合,
-            
-            <literal>'unique'</literal> フラグを指定する必要があります.
-            
-            <literal>lex_sort(M,sel,'unique')</literal> は,
-            
-            M(:,sel) がユニークとなるような行のみを
-            
-            保持することに注意してください.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,3));
-lex_sort(M)
-lex_sort(M,'unique')
-[N,k]=lex_sort(M,[1 3],'unique')
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="gsort">gsort</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="unique">unique</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
index ff9fde6..fa69b05 100644 (file)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  * 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,
  * 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="unique" xml:lang="ja">
-    
     <refnamediv>
-        
         <refname>unique</refname>
-        
         <refpurpose>ベクトルまたは行列のユニークなな要素を展開</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>
-            
-            [N [,k]]=unique(M)
-            
-            [N [,k]]=unique(M ,orient)
-            
+            [N ,k] = unique(M)
+            [N ,k] = unique(M ,orient)
         </synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="parameters">
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>M</term>
-                
                 <listitem>
-                    
                     <para>数値または文字列のベクトルまたは行列</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>orient</term>
-                
                 <listitem>
-                    
                     <para>フラグで以下の値のどれかとなる : 1 または "r", 2 または "c"</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>N</term>
-                
                 <listitem>
-                    
                     <para>数値または文字列のベクトルまたは行列</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>k</term>
-                
                 <listitem>
-                    
                     <para>整数のベクトル</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>
-            
             <literal>unique(M)</literal> は
-            
             <literal>M</literal>のユニークなエントリを昇順に
-            
             したものを保持するベクトルを返します.
-            
         </para>
-        
         <para>
-            
             <literal>unique(M,"r")</literal> または
-            
             <literal>unique(M,1)</literal>は,
-            
             <literal>M</literal>のユニークな行を
-            
             辞書式の昇順にして返します.
-            
         </para>
-        
         <para>
-            
             <literal>unique(M,"c")</literal> または
-            
             <literal>unique(M,2)</literal>は
-            
             <literal>M</literal>のユニークな列を
-            
             辞書式の昇順にして返します.
-            
         </para>
-        
         <para>
-            
             出力引数<literal>k</literal>が指定された場合,
-            
-            ユニークなエントリが最初に現れた最初の位置が 
-            
+            ユニークなエントリが最初に現れた最初の位置が
             代入されます.
-            
         </para>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,1));
+        <programlisting role="example"><![CDATA[
+M = round(2*rand(20,1));
 unique(M)
-[N,k]=unique(M)
+[N,k] = unique(M)
 unique(string(M))
-[N,k]=unique(string(M))
+[N,k] = unique(string(M))
+
 A = [0,0,1,1;
      0,1,1,1;
      2,0,1,1;
      0,2,2,2;
      2,0,1,1;
      0,0,1,1];
-T='x'+string(A);
+T = 'x'+string(A);
+
 //ユニークな行
-[m,k]=unique(A,'r')
+[m,k] = unique(A,'r')
 unique(T,'r')
+
 //ユニークな列
-[m,k]=unique(T,'c')
+[m,k] = unique(T,'c')
 unique(A,'c')
  ]]></programlisting>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
-                <link linkend="union">union</link>
-                
+                <link linkend="members">members</link>
             </member>
-            
             <member>
-                
-                <link linkend="intersect">intersect</link>
-                
+                <link linkend="gsort">gsort</link>
             </member>
-            
             <member>
-                
-                <link linkend="gsort">gsort</link>
-                
+                <link linkend="union">union</link>
             </member>
-            
             <member>
-                
-                <link linkend="lex_sort">lex_sort</link>
-                
+                <link linkend="intersect">intersect</link>
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
diff --git a/scilab/modules/elementary_functions/help/pt_BR/searchandsort/lex_sort.xml b/scilab/modules/elementary_functions/help/pt_BR/searchandsort/lex_sort.xml
deleted file mode 100644 (file)
index d7f47c6..0000000
+++ /dev/null
@@ -1,98 +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) 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: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="lex_sort" xml:lang="en">
-    <refnamediv>
-        <refname>lex_sort</refname>
-        <refpurpose>ordenação lexicográfica de linhas de uma matriz</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[N, [k]]=lex_sort(M [,sel] [,'unique'])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>M</term>
-                <listitem>
-                    <para>matriz de reais</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>N</term>
-                <listitem>
-                    <para>matriz de reais </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>k</term>
-                <listitem>
-                    <para>vetor coluna de inteiros</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            A função <literal>lex_sort</literal> está obsoleta gora. Ela pode
-            ser substituída pelas funções <link linkend="gsort">gsort</link> e <link linkend="unique">unique</link>.
-        </para>
-        <para>
-            <literal>N=lex_sort(M)</literal> ordena as linhas (como um grupo) da
-            matriz <literal>M</literal> em ordem ascendente. Se requerido, o argumento
-            de saída <literal>k</literal> contém a ordem:
-            <literal>[N,k]=lex_sort(M)</literal> retorna <literal>k</literal> tal que
-            <literal>N</literal> é igual a <literal>M(k,:)</literal> .
-        </para>
-        <para>
-            <literal>N=lex_sort(M,sel [,'unique'])</literal> produz o mesmo
-            resultado que a seguinte seqüência de instruções:
-        </para>
-        <programlisting role=""><![CDATA[ 
-[N,k]=lex_sort(M(:,sel) [,'unique']);
-N=M(k,:)
- ]]></programlisting>
-        <para>
-            O flag (indicador) <literal>'unique'</literal> deve ser fornecido
-            caso deseje-se reter apenas linhas únicas no resultado. Perceba que
-            <literal>lex_sort(M,sel,'unique')</literal> retém apenas linhas tais que
-            M(:,sel) são únicas.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,3));
-
-lex_sort(M)
-lex_sort(M,'unique')
-[N,k]=lex_sort(M,[1 3],'unique')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="gsort">gsort</link>
-            </member>
-            <member>
-                <link linkend="unique">unique</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 44fd727..dfebdbe 100644 (file)
@@ -2,7 +2,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,
  * 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="unique" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="unique" xml:lang="pt">
     <refnamediv>
         <refname>unique</refname>
-        <refpurpose>extrai componentes únicos de um vetor ou de
-            matrizes
+        <refpurpose>remover todos os componentes duplicados de um vetor ou uma matriz
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>
-            [N [,k]]=unique(M)
-            [N [,k]]=unique(M ,orient)
+            [N ,k] = unique(M)
+            [N ,k] = unique(M ,orient)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>M</term>
                 <listitem>
-                    <para>vetor ou matriz de números ou strings </para>
+                    <para>vetor ou matriz de números ou strings </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>orient</term>
                 <listitem>
-                    <para>flag com valores possíveis : 1 ou "r", 2 ou "c"</para>
+                    <para>flag com valores possíveis : 1 ou "r", 2 ou "c"</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>N</term>
                 <listitem>
-                    <para>vetor ou matriz de números ou strings </para>
+                    <para>vetor ou matriz de números ou strings </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
-            <literal>unique(M)</literal> retorna um vetor que retém as entradas
-            únicas de <literal>M</literal> em ordem ascendente.
+            <literal>unique(M)</literal> retorna um vetor que retém as entradas
+            únicas de <literal>M</literal> em ordem ascendente.
         </para>
         <para>
             <literal>unique(M,"r")</literal> ou
-            <literal>unique(M,1)</literal>retorna as linhas únicas de
-            <literal>M</literal> em ordem lexicográfica ascendente.
+            <literal>unique(M,1)</literal>retorna as linhas únicas de
+            <literal>M</literal> em ordem lexicográfica ascendente.
         </para>
         <para>
             <literal>unique(M,"c")</literal> ou
-            <literal>unique(M,2)</literal>retorna as linhas únicas de
-            <literal>M</literal> em ordem lexicográfica ascendente.
+            <literal>unique(M,2)</literal>retorna as linhas únicas de
+            <literal>M</literal> em ordem lexicográfica ascendente.
         </para>
         <para>
-            Se requerido, o argumento de saída, <literal>k</literal> contém a
-            posição das primeiras entradas únicas encontradas.
+            Se requerido, o argumento de saída, <literal>k</literal> contém a
+            posição das primeiras entradas únicas encontradas.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,1));
+        <programlisting role="example"><![CDATA[
+M = round(2*rand(20,1));
 
 unique(M)
-[N,k]=unique(M)
+[N,k] = unique(M)
 
 unique(string(M))
-[N,k]=unique(string(M))
+[N,k] = unique(string(M))
 
 A = [0,0,1,1;
      0,1,1,1;
@@ -94,32 +93,31 @@ A = [0,0,1,1;
      0,2,2,2;
      2,0,1,1;
      0,0,1,1];
-T='x'+string(A);
-
-//linhas únicas
+T = 'x'+string(A);
 
-[m,k]=unique(A,'r')
+//linhas únicas
+[m,k] = unique(A,'r')
 unique(T,'r')
 
-//colunas únicas
-[m,k]=unique(T,'c')
+//colunas únicas
+[m,k] = unique(T,'c')
 unique(A,'c')
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="union">union</link>
+                <link linkend="members">members</link>
             </member>
             <member>
-                <link linkend="intersect">intersect</link>
+                <link linkend="gsort">gsort</link>
             </member>
             <member>
-                <link linkend="gsort">gsort</link>
+                <link linkend="union">union</link>
             </member>
             <member>
-                <link linkend="lex_sort">lex_sort</link>
+                <link linkend="intersect">intersect</link>
             </member>
         </simplelist>
     </refsection>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/searchandsort/lex_sort.xml b/scilab/modules/elementary_functions/help/ru_RU/searchandsort/lex_sort.xml
deleted file mode 100644 (file)
index fdf8c97..0000000
+++ /dev/null
@@ -1,89 +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) 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="lex_sort" xml:lang="ru">
-    <refnamediv>
-        <refname>lex_sort</refname>
-        <refpurpose>лексикографическая сортировка строк матрицы</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[N, [k]]=lex_sort(M [,sel] [,'unique'])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>M</term>
-                <listitem>
-                    <para>вещественная матрица</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>N</term>
-                <listitem>
-                    <para>вещественная матрица</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>k</term>
-                <listitem>
-                    <para>вектор-столбец целочисленных значений</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Функция <literal>lex_sort</literal> сейчас устарела. Она может быть заменена функциями <link linkend="gsort">gsort</link> и <link linkend="unique">unique</link>.
-        </para>
-        <para>
-            <literal>N=lex_sort(M)</literal> сортирует строки матрицы <literal>M</literal> (как группу) в порядке возрастания. Если требуется, то выходной аргумент <literal>k</literal> содержит упорядоченное расположение:     <literal>[N,k]=lex_sort(M)</literal> возвращает такое <literal>k</literal>, что     <literal>N</literal> равно <literal>M(k,:)</literal>.
-        </para>
-        <para>
-            <literal>N=lex_sort(M,sel [,'unique'])</literal> даёт тот же результат, что и следующая последовательность инструкций:
-        </para>
-        <programlisting><![CDATA[ 
-[N,k]=lex_sort(M(:,sel) [,'unique']);
-N=M(k,:)
- ]]></programlisting>
-        <para>
-            Флаг <literal>'unique'</literal> необходимо задавать, если в результате нужно вернуть только уникальные ряды. Заметьте, что <literal>lex_sort(M,sel,'unique')</literal>  возвращает только такие ряды, что M(:,sel) являются уникальными.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,3));
-lex_sort(M)
-lex_sort(M,'unique')
-[N,k]=lex_sort(M,[1 3],'unique')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="gsort">gsort</link>
-            </member>
-            <member>
-                <link linkend="unique">unique</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 70ed0e8..b37d865 100644 (file)
@@ -2,7 +2,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="unique" xml:lang="ru">
     <refnamediv>
         <refname>unique</refname>
-        <refpurpose>выделяет уникальные компоненты вектора или матрицы</refpurpose>
+        <refpurpose>удалить все повторяющиеся компоненты из вектора или матрицы</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Последовательность вызова</title>
         <synopsis>
-            [N [,k]]=unique(M)
-            [N [,k]]=unique(M ,orient)
+            [N ,k] = unique(M)
+            [N ,k] = unique(M ,orient)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Описание</title>
         <para>
-            <literal>unique(M)</literal> возвращает вектор, который содержит уникальные элементы 
+            <literal>unique(M)</literal> возвращает вектор, который содержит уникальные элементы
             <literal>M</literal> в порядке возрастания.
         </para>
         <para>
-            <literal>unique(M,"r")</literal> или <literal>unique(M,1)</literal> возвращает 
+            <literal>unique(M,"r")</literal> или <literal>unique(M,1)</literal> возвращает
             уникальные строки <literal>M</literal> в лексикографическом порядке возрастания.
         </para>
         <para>
-            <literal>unique(M,"c")</literal> или <literal>unique(M,2)</literal> возвращает 
+            <literal>unique(M,"c")</literal> или <literal>unique(M,2)</literal> возвращает
             уникальные столбцы <literal>M</literal> в лексикографическом порядке возрастания.
         </para>
         <para>
             Если нужно, выходной аргумент <literal>k</literal> содержит положение первых из насчитанных уникальных элементов.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-M=round(2*rand(20,1));
+        <programlisting role="example"><![CDATA[
+M = round(2*rand(20,1));
 unique(M)
-[N,k]=unique(M)
+[N,k] = unique(M)
+
 unique(string(M))
-[N,k]=unique(string(M))
+[N,k] = unique(string(M))
+
 A = [0,0,1,1;
      0,1,1,1;
      2,0,1,1;
      0,2,2,2;
      2,0,1,1;
      0,0,1,1];
-T='x'+string(A);
+T = 'x' + string(A);
+
 //уникальные строки
-[m,k]=unique(A,'r')
+[m,k] = unique(A,'r')
 unique(T,'r')
+
 //уникальные столбцы
-[m,k]=unique(T,'c')
+[m,k] = unique(T,'c')
 unique(A,'c')
  ]]></programlisting>
     </refsection>
@@ -105,16 +103,16 @@ unique(A,'c')
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="union">union</link>
+                <link linkend="members">members</link>
             </member>
             <member>
-                <link linkend="intersect">intersect</link>
+                <link linkend="gsort">gsort</link>
             </member>
             <member>
-                <link linkend="gsort">gsort</link>
+                <link linkend="union">union</link>
             </member>
             <member>
-                <link linkend="lex_sort">lex_sort</link>
+                <link linkend="intersect">intersect</link>
             </member>
         </simplelist>
     </refsection>
index 6a62d57..e0e9f5d 100644 (file)
@@ -911,24 +911,11 @@ msgstr ""
 
 #
 # File: modules/elementary_functions/macros/isempty.sci, line: 24
-# File: modules/elementary_functions/macros/lex_sort.sci, line: 43
 #, c-format
 msgid "%s: Wrong type for input argument #%d.\n"
 msgstr ""
 
 #
-# File: modules/elementary_functions/macros/lex_sort.sci, line: 30
-#, c-format
-msgid "%s: Wrong number of input argument(s): At most %d expected.\n"
-msgstr ""
-
-#
-# File: modules/elementary_functions/macros/lex_sort.sci, line: 40
-#, c-format
-msgid "%s: Wrong value for input argument #%d: '%s' expected.\n"
-msgstr ""
-
-#
 # File: modules/elementary_functions/macros/linspace.sci, line: 25
 # File: modules/elementary_functions/macros/logspace.sci, line: 25
 #, c-format
diff --git a/scilab/modules/elementary_functions/macros/lex_sort.sci b/scilab/modules/elementary_functions/macros/lex_sort.sci
deleted file mode 100644 (file)
index cb17657..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA
-// Copyright (C) DIGITEO - 2011 - Allan CORNET
-//
-// 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.
-
-function [x, ind] = lex_sort(x, varargin)
-
-    // lexicographic matrix rows  sorting
-
-    rhs = argn(2);
-    if rhs < 1 then
-        error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), "lex_sort", 1));
-    end
-
-    // default argument values
-    uniqueflag = %f
-    sel = 1:size(x,2)
-
-    // get arguments
-
-    if size(varargin) > 2 then
-        error(msprintf(gettext("%s: Wrong number of input argument(s): At most %d expected.\n"),"lex_sort",3));
-    end
-
-    for k=1:size(varargin)
-        if type(varargin(k))==1 then //sel given
-            sel=varargin(k)
-        elseif type(varargin(k))==10 then // string given is it 'unique'?
-            if varargin(k)==part("unique",1:length(varargin(k))) then
-                uniqueflag=%t
-            else
-                error(msprintf(gettext("%s: Wrong value for input argument #%d: ''%s'' expected.\n"),"lex_sort",k+1,"unique"));
-            end
-        else
-            error(msprintf(gettext("%s: Wrong type for input argument #%d.\n"),"lex_sort",k+1));
-        end
-    end
-
-    // sort rows in lexicographic order
-    ind = 1:size(x,1);
-    for i=size(sel,"*"):-1:1,
-        [s,k] = gsort(x(ind,sel(i)),"g","d");
-        ind = ind(k);
-    end
-    ind=ind(:)
-    ind=ind($:-1:1)
-    x = x(ind,:);
-
-    if uniqueflag then
-        k=find(sum(abs(x(2:$,sel)-x(1:$-1,sel)),2)==0)
-        x(k,:)=[]
-        ind(k)=[]
-    end
-endfunction
diff --git a/scilab/modules/elementary_functions/tests/nonreg_tests/bug_3520.dia.ref b/scilab/modules/elementary_functions/tests/nonreg_tests/bug_3520.dia.ref
deleted file mode 100644 (file)
index dd72f94..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - DIGITEO - Allan CORNET
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-// <-- CLI SHELL MODE -->
-// <-- Non-regression test for bug 3520 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=3520
-//
-// <-- Short Description -->
-// lex_sort() doesn't work anymore in Scilab 5.
-a = [   0.        1608. ; 
-    0.        2014.  ;
-    0.        2322.  ;
-    0.        2332.  ;
-    0.        1600.  ;
-    10.       2332.  ;
-    10.       2322.  ;
-    10.       2014.  ;
-    10.       1600.  ;
-    10.       1608.  ];
-[table,idx] = lex_sort(a,"unique");
-ref_table = [  0.     1600.;
-    0.     1608.;
-    0.     2014.;
-    0.     2322.;
-    0.     2332.;
-    10.    1600.;
-    10.    1608.;
-    10.    2014.;
-    10.    2322.;
-    10.    2332. ];
-ref_idx = [   5.    1.    2.    3.    4.    9.    10.    8.    7.    6. ]';
-if or(ref_table<>table) then bugmes();quit;end
-if or(ref_idx<>idx) then bugmes();quit;end
diff --git a/scilab/modules/elementary_functions/tests/nonreg_tests/bug_3520.tst b/scilab/modules/elementary_functions/tests/nonreg_tests/bug_3520.tst
deleted file mode 100644 (file)
index a7e884b..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - DIGITEO - Allan CORNET
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-
-// <-- CLI SHELL MODE -->
-
-// <-- Non-regression test for bug 3520 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=3520
-//
-// <-- Short Description -->
-// lex_sort() doesn't work anymore in Scilab 5.
-
-a = [   0.        1608. ; 
-    0.        2014.  ;
-    0.        2322.  ;
-    0.        2332.  ;
-    0.        1600.  ;
-    10.       2332.  ;
-    10.       2322.  ;
-    10.       2014.  ;
-    10.       1600.  ;
-    10.       1608.  ];
-
-
-[table,idx] = lex_sort(a,"unique"); 
-
-ref_table = [  0.     1600.;
-    0.     1608.;
-    0.     2014.;
-    0.     2322.;
-    0.     2332.;
-    10.    1600.;
-    10.    1608.;
-    10.    2014.;
-    10.    2322.;
-    10.    2332. ];  
-    
-ref_idx = [   5.    1.    2.    3.    4.    9.    10.    8.    7.    6. ]';
-
-if or(ref_table<>table) then pause,end
-if or(ref_idx<>idx) then pause,end