[Obsolete] IsAScalar 33/15333/4
Bruno JOFRET [Tue, 7 Oct 2014 12:13:12 +0000 (14:13 +0200)]
Change-Id: I765229dd69dffd2e6aabe12c8c83f3387f21da25

scilab/CHANGES_5.5.X
scilab/modules/elementary_functions/help/en_US/IsAScalar.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/IsAScalar.xml [deleted file]
scilab/modules/elementary_functions/locales/elementary_functions.pot
scilab/modules/elementary_functions/macros/IsAScalar.sci [deleted file]
scilab/modules/elementary_functions/tests/unit_tests/IsAScalar.dia.ref [deleted file]
scilab/modules/elementary_functions/tests/unit_tests/IsAScalar.tst [deleted file]
scilab/modules/elementary_functions/tests/unit_tests/isscalar.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/isscalar.tst
scilab/modules/helptools/data/configuration/scilab_macros.txt

index d22bce2..e1fe76d 100644 (file)
@@ -12,6 +12,7 @@ Removed Functions
 
 * mfft removed. Please use fft instead.
 
+* IsAScalar removed. Please use isscalar instead.
 
                      Changes between version 5.5.0 and 5.5.1
                      =======================================
diff --git a/scilab/modules/elementary_functions/help/en_US/IsAScalar.xml b/scilab/modules/elementary_functions/help/en_US/IsAScalar.xml
deleted file mode 100644 (file)
index 9b66823..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Scilab Enterprises
- * 
- * 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: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="IsAScalar" xml:lang="en">
-    <refnamediv>
-        <refname>IsAScalar</refname>
-        <refpurpose>
-            check if a variable is a scalar. <emphasis role="bold">This function is obsolete.</emphasis> 
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>t=IsAScalar(x)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>vector or matrix</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>t</term>
-                <listitem>
-                    <para>a boolean</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>
-                IsAScalar(<varname>x</varname>)
-            </literal>
-            returns true if <varname>x</varname>
-            is a scalar (if size(<varname>x</varname>) is 1 and type(<varname>x</varname>,1) is 1 too).
-            <warning>This function is obsolete.</warning>
-            It is better to use <link linkend="isscalar">isscalar</link> instead of <code>IsAScalar</code>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-IsAScalar(ones(10,10))
-IsAScalar(1)
-IsAScalar("s")
- ]]></programlisting>
-    </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="isscalar">isscalar</link> instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ja_JP/IsAScalar.xml b/scilab/modules/elementary_functions/help/ja_JP/IsAScalar.xml
deleted file mode 100644 (file)
index c7530bd..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Scilab Enterprises
- * 
- * 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: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="IsAScalar" xml:lang="ja">
-    
-    <refnamediv>
-        
-        <refname>IsAScalar</refname>
-        
-        <refpurpose>
-            
-            変数がスカラーかどうかを確認. <emphasis role="bold">この関数は廃止予定です.</emphasis> 
-            
-        </refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>t=IsAScalar(x)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>x</term>
-                
-                <listitem>
-                    
-                    <para>ベクトルまたは行列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>t</term>
-                
-                <listitem>
-                    
-                    <para>論理値</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <varname>x</varname>がスカラー
-            
-            (size(<varname>x</varname>が1, type(<varname>x</varname>,1) も 1)の場合,
-            
-            <literal>
-                
-                IsAScalar(<varname>x</varname>)
-                
-            </literal>
-            
-            は true を返します.
-            
-            <warning>この関数は廃止予定です.</warning>
-            
-            <code>IsAScalar</code>の代わりに 
-            
-            <link linkend="isscalar">isscalar</link>を推奨します.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-IsAScalar(ones(10,10))
-IsAScalar(1)
-IsAScalar("s")
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>履歴</title>
-        
-        <revhistory>
-            
-            <revision>
-                
-                <revnumber>5.5.0</revnumber>
-                
-                <revdescription>
-                    
-                    この関数は廃止予定です.
-                    
-                    5.5.1では削除されます. 
-                    
-                    代わりに<link linkend="isscalar">isscalar</link>を使用してください.
-                    
-                </revdescription>
-                
-            </revision>
-            
-        </revhistory>
-        
-    </refsection>
-    
-</refentry>
-
index 815bc9c..00fed2e 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:51+0100\n"
 
 # File: sci_gateway/c/sci_base2dec.c, line: 41
 # File: sci_gateway/c/sci_base2dec.c, line: 54
@@ -365,7 +365,6 @@ msgid "%s: Wrong number of output argument: %d expected"
 msgstr ""
 
 #
-# File: macros/IsAScalar.sci, line: 16
 # File: macros/acosd.sci, line: 15
 # File: macros/acosh.sci, line: 30
 # File: macros/acoshm.sci, line: 17
diff --git a/scilab/modules/elementary_functions/macros/IsAScalar.sci b/scilab/modules/elementary_functions/macros/IsAScalar.sci
deleted file mode 100644 (file)
index 6d9230d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2005 - INRIA - Allan CORNET
-// Copyright (C) DIGITEO - 2011 - Allan CORNET
-//
-// 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 bOK = IsAScalar(VarInput)
-
-    warnobsolete("isscalar", "5.5.1");
-    rhs = argn(2);
-    if rhs <> 1 then
-        error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),"IsAScalar", 1));
-    end
-
-    bOK = %F;
-    if ( (length(VarInput)==1) & (type(VarInput)==1) ) then
-        bOK = %T;
-    end
-endfunction
-
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/IsAScalar.dia.ref b/scilab/modules/elementary_functions/tests/unit_tests/IsAScalar.dia.ref
deleted file mode 100644 (file)
index 8403fb7..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-//
-// <-- ENGLISH IMPOSED -->
-// <-- CLI SHELL MODE -->
-//
-// unit tests for IsAScalar function
-// =============================================================================
-// Constants
-assert_checkequal(IsAScalar([1 2 3]), %f);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-assert_checkequal(IsAScalar([1 2 3]'), %f);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-assert_checkequal(IsAScalar([1 2; 1 2]), %f);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-assert_checkequal(IsAScalar(1), %t);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-// Strings
-assert_checkequal(IsAScalar("s"), %f);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-// Polynomials
-s=poly(0,"s");
-assert_checkequal(IsAScalar(1+s), %f);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-// Booleans
-assert_checkequal(IsAScalar(%t), %f);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-// Sparses
-assert_checkequal(IsAScalar(sparse(0)), %f);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-// Error messages
-errmsg1 = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),"IsAScalar", 1);
-assert_checkerror("IsAScalar()", errmsg1);
-WARNING: Feature IsAScalar is obsolete.
-         Please use isscalar instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
-errmsg2 = msprintf(_("Wrong number of input arguments."));
-assert_checkerror("IsAScalar(1,2)", errmsg2);
-errmsg3 = msprintf(_("Wrong number of output arguments.\n"));
-assert_checkerror("[r,b]=IsAScalar([1 2 3]);", errmsg3);
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/IsAScalar.tst b/scilab/modules/elementary_functions/tests/unit_tests/IsAScalar.tst
deleted file mode 100644 (file)
index aa80ac1..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-//
-// <-- ENGLISH IMPOSED -->
-// <-- CLI SHELL MODE -->
-//
-// unit tests for IsAScalar function
-// =============================================================================
-
-// Constants
-assert_checkequal(IsAScalar([1 2 3]), %f);
-assert_checkequal(IsAScalar([1 2 3]'), %f);
-assert_checkequal(IsAScalar([1 2; 1 2]), %f);
-assert_checkequal(IsAScalar(1), %t);
-
-// Strings
-assert_checkequal(IsAScalar("s"), %f);
-
-// Polynomials
-s=poly(0,"s");
-assert_checkequal(IsAScalar(1+s), %f);
-
-// Booleans
-assert_checkequal(IsAScalar(%t), %f);
-
-// Sparses
-assert_checkequal(IsAScalar(sparse(0)), %f);
-
-// Error messages
-errmsg1 = msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),"IsAScalar", 1);
-assert_checkerror("IsAScalar()", errmsg1);
-errmsg2 = msprintf(_("Wrong number of input arguments."));
-assert_checkerror("IsAScalar(1,2)", errmsg2);
-errmsg3 = msprintf(_("Wrong number of output arguments.\n"));
-assert_checkerror("[r,b]=IsAScalar([1 2 3]);", errmsg3);
index fd5ef1f..a0e758d 100644 (file)
@@ -5,6 +5,7 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 //
+// <-- ENGLISH IMPOSED -->
 // <-- CLI SHELL MODE -->
 //
 // unit tests for isscalar function
index 4c358cd..801807a 100644 (file)
@@ -5,6 +5,7 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 //
+// <-- ENGLISH IMPOSED -->
 // <-- CLI SHELL MODE -->
 //
 // unit tests for isscalar function