[Obsolete] nfreq 43/15343/2
Bruno JOFRET [Tue, 7 Oct 2014 12:37:39 +0000 (14:37 +0200)]
Change-Id: Ice2cbb451ded23a91e0813b24efeea1a39023b86

scilab/CHANGES_5.5.X
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/statistics/help/en_US/summaries/nfreq.xml [deleted file]
scilab/modules/statistics/help/ja_JP/summaries/nfreq.xml [deleted file]
scilab/modules/statistics/macros/nfreq.sci [deleted file]

index 401233a..307d402 100644 (file)
@@ -24,6 +24,8 @@ Removed Functions
 
 * chart removed. Please use nicholschart instead.
 
+* nfreq removed. Please use tabul instead.
+
 
 Compilation
 ===========
diff --git a/scilab/modules/statistics/help/en_US/summaries/nfreq.xml b/scilab/modules/statistics/help/en_US/summaries/nfreq.xml
deleted file mode 100644 (file)
index 7ff3c13..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2000 - INRIA - Carlos Klimann
- *
- * 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="nfreq">
-    <refnamediv>
-        <refname>nfreq</refname>
-        <refpurpose>
-            frequency of the values in a vector or matrix. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>m=nfreq(x)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>real or complex vector or matrix</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Frequency of the  values in a real or  complex vector or a
-            real or complex matrix <literal>x</literal>.
-        </para>
-        <para>
-            For a real  or complex vector or a  real or complex matrix
-            <literal>x</literal>,  <literal>m=freq(x)</literal> returns in  the first  column of
-            the  <literal>size(x,'*')x2</literal>  matrix  <literal>m</literal>  the  values  of
-            <literal>x</literal>  and  in the  second  column  of  this matrix  the
-            frequencies of the corresponding values.
-        </para>
-        <para>
-            Note that the  <link linkend="tabul">tabul</link> function is more efficient, applies
-            also to vector of strings and returns a sorted <literal>m</literal>.
-            <warning>This function is obsolete.</warning>
-            It is better to use <link linkend="tabul">tabul</link> instead of <literal>nfreq</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-x=[2 8 0 3 7 6 8 7 9 1]
-m=nfreq(x)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="tabul">tabul</link>
-            </member>
-            <member>
-                <link linkend="dsearch">dsearch</link>
-            </member>
-            <member>
-                <link linkend="histplot">histplot</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. Please use <link linkend="tabul">tabul</link> instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/statistics/help/ja_JP/summaries/nfreq.xml b/scilab/modules/statistics/help/ja_JP/summaries/nfreq.xml
deleted file mode 100644 (file)
index 12b7714..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2000 - INRIA - Carlos Klimann
- * 
- * 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="nfreq">
-    <refnamediv>
-        <refname>nfreq</refname>
-        <refpurpose>ベクトルまたは行列における値の頻度</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>m=nfreq(x)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>実数または複素数のベクトルまたは行列</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            実数または複素数のベクトル,もしくは
-            実数または複素数の行列<literal>x</literal>における値の頻度.
-        </para>
-        <para>
-            ある実数または複素数のベクトルまたは行列
-            <literal>x</literal>について,  <literal>m=freq(x)</literal> は
-            <literal>size(x,'*')x2</literal>の行列<literal>m</literal>の最初の列に
-            <literal>x</literal>の値,
-            この行列の2番目の列に対応する値の頻度を返します.
-        </para>
-        <para>
-            <link linkend="tabul">tabul</link>関数が
-            より効率的で,
-            文字列のベクトルにも適用でき,
-            ソートされた<literal>m</literal>を返すことに注意してください.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-x=[2 8 0 3 7 6 8 7 9 1]
-m=nfreq(x)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="tabul">tabul</link>
-            </member>
-            <member>
-                <link linkend="dsearch">dsearch</link>
-            </member>
-            <member>
-                <link linkend="histplot">histplot</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/statistics/macros/nfreq.sci b/scilab/modules/statistics/macros/nfreq.sci
deleted file mode 100644 (file)
index 8f90b54..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2000 - INRIA - Carlos Klimann
-//
-// 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 [m]=nfreq(x)
-    //
-    //Frequency of the values in a real or complex vector or a  real
-    //or complex matrix x.
-    //
-    //For a real or complex vector or a  real or complex matrix x,
-    //m=freq(x) returns in the first column of the size(x,'*')x2 matrix
-    //m the values of x and in the second column of this matrix the
-    //frequencies of the corresponding values.
-    //
-    //
-    warnobsolete("tabul", "5.5.1");
-    lxnozero=size(x,"*");
-    xx=matrix(x,lxnozero,1);
-    m=[]
-    while lxnozero>0 do
-        xnozero=find(xx-xx(1)<>0)',
-        l=lxnozero,
-        lxnozero=size(xnozero,"*"),
-        m=[m ; xx(1) l-lxnozero],
-        xx=xx(xnozero),
-    end
-endfunction