[Obsolete] regress 42/15342/2
Bruno JOFRET [Tue, 7 Oct 2014 12:37:17 +0000 (14:37 +0200)]
Change-Id: I9fd7bf475bbead6582272ae7e45c5a3e98167608

scilab/CHANGES_5.5.X
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/statistics/help/en_US/regression/regress.xml [deleted file]
scilab/modules/statistics/help/ja_JP/regression/regress.xml [deleted file]
scilab/modules/statistics/locales/statistics.pot
scilab/modules/statistics/macros/regress.sci [deleted file]

index 307d402..812bab8 100644 (file)
@@ -26,6 +26,8 @@ Removed Functions
 
 * nfreq removed. Please use tabul instead.
 
+* regress removed. Please use reglin instead.
+
 
 Compilation
 ===========
diff --git a/scilab/modules/statistics/help/en_US/regression/regress.xml b/scilab/modules/statistics/help/en_US/regression/regress.xml
deleted file mode 100644 (file)
index b9ad6aa..0000000
+++ /dev/null
@@ -1,83 +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="regress">
-    <refnamediv>
-        <refname>regress</refname>
-        <refpurpose>
-                regression coefficients of two variables. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>coefs=regress(x,y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y</term>
-                <listitem>
-                    <para>real or complex vector</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            This function  computes the regresion  coefficients of two
-            variables <literal>x</literal>  and <literal>y</literal>, both  numerical vectors of
-            same number  of elements  <literal>n</literal>. <literal>coefs=[a b]</literal>  be a
-            1x2 matrix such that  <literal>Y=a+bX</literal> will be the equation of
-            the ordinary least square approximation to our data.
-        </para>
-        <warning>This function is obsolete.</warning>
-        It is better to use <link linkend="reglin">reglin</link> instead of <function>regress</function>.
-    </refsection>
-    <refsection>
-        <title>References</title>
-        <para>
-            Wonacott, T.H. &amp; Wonacott, R.J.; Introductory Statistics, J.Wiley &amp; Sons, 1990.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-x=[0.5608486 0.6623569 0.7263507 0.1985144 0.5442573 0.2320748 0.2312237]
-y=[0.3616361 0.2922267 0.5664249 0.4826472 0.3321719 0.5935095 0.5015342]
-coefs=regress(x,y)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="reglin">reglin</link>
-            </member>
-            <member>
-                <link linkend="covar">covar</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="reglin">reglin</link> instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/statistics/help/ja_JP/regression/regress.xml b/scilab/modules/statistics/help/ja_JP/regression/regress.xml
deleted file mode 100644 (file)
index e8b4122..0000000
+++ /dev/null
@@ -1,67 +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="regress">
-    <refnamediv>
-        <refname>regress</refname>
-        <refpurpose>2つの変数の回帰係数</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>coefs=regress(x,y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y</term>
-                <listitem>
-                    <para>実数または複素数のベクトル</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            この関数は,共に同じ要素数<literal>n</literal>の数値ベクトルである
-            2つの変数<literal>x</literal> および <literal>y</literal>の
-            回帰係数を計算します.
-            <literal>coefs=[a b]</literal>  は,
-            <literal>Y=a+bX</literal>が
-            データの最小二乗推定近似の方程式となるような
-            1x2行列です.
-        </para>
-    </refsection>
-    <refsection>
-        <title>参考文献</title>
-        <para>
-            Wonacott, T.H. &amp; Wonacott, R.J.; Introductory Statistics, J.Wiley &amp; Sons, 1990.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-x=[0.5608486 0.6623569 0.7263507 0.1985144 0.5442573 0.2320748 0.2312237]
-y=[0.3616361 0.2922267 0.5664249 0.4826472 0.3321719 0.5935095 0.5015342]
-coefs=regress(x,y)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="covar">covar</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 846bbcb..bab4579 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: 2015-02-27 11:39+0100\n"
+"Revision-Date: 2015-03-11 15:49+0100\n"
 
 # File: sci_gateway/c/sci_cdfbet.c, line: 45
 msgid "X,Y,A and B"
@@ -506,7 +506,6 @@ msgstr ""
 # File: macros/ftest.sci, line: 27
 # File: macros/pca.sci, line: 63
 # File: macros/perctl.sci, line: 31
-# File: macros/regress.sci, line: 27
 #, c-format
 msgid "%s: Wrong number of input arguments: %d expected.\n"
 msgstr ""
@@ -753,24 +752,6 @@ msgid "%s: NaNs detected, please use %s() instead.\n"
 msgstr ""
 
 #
-# File: macros/regress.sci, line: 31
-#, c-format
-msgid "%s: Wrong type for input arguments: Numerical expected.\n"
-msgstr ""
-
-#
-# File: macros/regress.sci, line: 33
-#, c-format
-msgid "%s: Wrong size for both input arguments: same size expected.\n"
-msgstr ""
-
-#
-# File: macros/regress.sci, line: 34
-#, c-format
-msgid "%s: Wrong size for input argument #%d: Must be > %d.\n"
-msgstr ""
-
-#
 # File: macros/samplef.sci, line: 46
 #, c-format
 msgid "%s: Wrong value for input argument #%d: Non-negative values expected.\n"
diff --git a/scilab/modules/statistics/macros/regress.sci b/scilab/modules/statistics/macros/regress.sci
deleted file mode 100644 (file)
index 83e5238..0000000
+++ /dev/null
@@ -1,41 +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 [coefs]=regress(x,y)
-    //
-    //This function computes the regresion coefficients of two
-    //variables x and y, both numerical vectors of same number
-    //of elements  n. coefs=[a  b] be a  1x2 matrix  such that
-    //Y=a+bX will be the equation of the ordinary least square
-    //approximation to our data.
-    //
-    //References:   Wonacott,    T.H.    &   Wonacott,   R.J.;
-    //Introductory Statistics, J.Wiley & Sons, 1990.
-    //
-    //
-    
-    warnobsolete("reglin", "5.5.1");
-    [lhs, rhs] = argn(0);
-    if rhs < 2 then
-        error(msprintf(gettext("%s: Wrong number of input arguments: %d expected.\n"),"regress",2))
-    end
-
-    coefs=[]
-    if (type(x) <> 1)|(type(y)<>1) then error(msprintf(gettext("%s: Wrong type for input arguments: Numerical expected.\n"),"regress")), end
-    lx=length(x)
-    if lx<>length(y) then error(msprintf(gettext("%s: Wrong size for both input arguments: same size expected.\n"),"regress")), end
-    if lx==0 then error(msprintf(gettext("%s: Wrong size for input argument #%d: Must be > %d.\n"),"regress", 1, 0)), end
-    x=matrix(x,lx,1)
-    y=matrix(y,lx,1)
-    xbar=sum(x)/lx
-    ybar=sum(y)/lx
-    coefs(2)=sum((x-xbar).*(y-ybar))/sum((x-xbar).^2)
-    coefs(1)=ybar-coefs(2)*xbar
-endfunction