gschur() was declared obsolete in Scilab 4, now removed 46/18246/7
Nicolas [Wed, 15 Jun 2016 07:20:44 +0000 (09:20 +0200)]
Change-Id: I722938a59c498b459bd17b4c1cefeb159f2a0056

19 files changed:
scilab/CHANGES.md
scilab/modules/compatibility_functions/macros/mtlb_qz.sci
scilab/modules/functions/help/en_US/built_in/external.xml
scilab/modules/functions/help/fr_FR/built_in/external.xml
scilab/modules/functions/help/ja_JP/built_in/external.xml
scilab/modules/functions/help/pt_BR/built_in/external.xml
scilab/modules/functions/help/ru_RU/built_in/external.xml
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/linear_algebra/help/en_US/eigen/gschur.xml [deleted file]
scilab/modules/linear_algebra/help/en_US/pencil/kroneck.xml
scilab/modules/linear_algebra/help/en_US/pencil/quaskro.xml
scilab/modules/linear_algebra/help/ja_JP/eigen/gschur.xml [deleted file]
scilab/modules/linear_algebra/help/ja_JP/pencil/kroneck.xml
scilab/modules/linear_algebra/help/ja_JP/pencil/quaskro.xml
scilab/modules/linear_algebra/help/pt_BR/eigen/gschur.xml [deleted file]
scilab/modules/linear_algebra/help/pt_BR/pencil/kroneck.xml
scilab/modules/linear_algebra/help/pt_BR/pencil/quaskro.xml
scilab/modules/linear_algebra/locales/linear_algebra.pot
scilab/modules/linear_algebra/macros/gschur.sci [deleted file]

index c5165c6..393bea1 100644 (file)
@@ -206,6 +206,7 @@ Removed Functions
 * `plot2d1` has been removed. Please use `plot2d` instead.
 * `lex_sort` has been removed. Please use `gsort(..,"lr")` instead
 * `gspec` was obsolete already in Scilab 4 and is now removed. Please use `spec` instead.
+* `gschur` was obsolete already in Scilab 4 and is now removed. Please use `schur` instead.
 
 * Symbolic module functions have been removed: `addf`, `cmb_lin`, `ldivf`, `mulf`, `rdivf`, `solve`, `subf`, `trianfml`, `trisolve` and `block2exp`.
 * Functionnalities based on former Scilab stack have been removed:
index 698f690..a60b43b 100644 (file)
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-function [AA, BB, Q, Z, V]=mtlb_qz(A,B)
-    [lhs,rhs]=argn(0)
-    [AA, BB, Q, Z]=gschur(A,B)
+function [AA, BB, Q, Z, V] = mtlb_qz(A,B)
+    [lhs,rhs] = argn(0)
+    [AA, BB, Q, Z] = schur(A,B)
     if lhs==5 then
-        n=size(A,1)
-        LA=diag(AA)
-        LB=diag(BB)
-        V=zeros(n,n)
-        for k=1:n
-            K=kernel(A*LB(k)-B*LA(k))
+        n  = size(A,1)
+        LA = diag(AA)
+        LB = diag(BB)
+        V  = zeros(n,n)
+        for k = 1:n
+            K = kernel(A*LB(k)-B*LA(k))
             if size(K,2)<>1 then
                 error(msprintf(gettext("%s: pencil is not diagonalizable.\n"),"mtlb_qz"))
             end
index e981127..319ae89 100644 (file)
@@ -4,7 +4,7 @@
         <refname>external</refname>
         <refpurpose>Scilab Object, external function or routine</refpurpose>
     </refnamediv>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             External function or routine for use with specific commands.
@@ -78,9 +78,6 @@ optim(list(costfunc,a1,b1,c1),....
             <member>
                 <link linkend="schur">schur</link>
             </member>
-            <member>
-                <link linkend="gschur">gschur</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
index ab0f602..aaac948 100644 (file)
@@ -4,7 +4,7 @@
         <refname>external</refname>
         <refpurpose>Objet Scilab, fonction externe ou routine  </refpurpose>
     </refnamediv>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             Fonction ou routine externe nécessitée par des commandes particulières.
@@ -76,9 +76,6 @@ optim(list(costfunc,a1,b1,c1),....
             <member>
                 <link linkend="schur">schur</link>
             </member>
-            <member>
-                <link linkend="gschur">gschur</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
index e70abda..79f0ca2 100644 (file)
 <?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="ja" xml:id="external">
-    
     <refnamediv>
-        
         <refname>external</refname>
-        
         <refpurpose>Scilabオブジェクト, 外部関数またはルーチン</refpurpose>
-        
     </refnamediv>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>
-            
             特定のコマンドで使用する外部関数またはルーチン.
-            
         </para>
-        
         <para>
-            
             "external" は,
-            
             (<literal>ode</literal>, <literal>optim</literal>, <literal>schur</literal>...
-            
             のような)
-            
             いくつかの高レベルプリミティブの引数として使用される
-            
             関数またはルーチンです.
-            
         </para>
-        
         <para>
-            
             external (関数またはルーチン)の呼び出し手順は,
-            
             external の引数を設定する高レベルプリミティブにより
-            
             規定されています.
-            
         </para>
-        
         <para>
-            
             例えば, 外部関数 <literal>costfunc</literal> は,
-            
             <literal>optim</literal> プリミティブの引数です.
-            
             その呼出し手順は次のようになります: <literal>[f,g,ind]=costfunc(x,ind)</literal>
-            
             そして <literal>optim</literal> (高レベル最適化プリミティブ)は
-            
             以下のようにコールされます
-            
         </para>
-        
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 optim(costfunc,...)
  ]]></programlisting>
-        
         <para>
-            
             ここで, <literal>costfunc</literal> (評価関数はプリミティブ
-            
             <literal>optim</literal>により最小化されます)は,
-            
             <literal>f=f(x)</literal> および<literal>x</literal>における
-            
             <literal>f</literal>の傾き<literal>g</literal>を評価します
-            
             (<literal>ind</literal> は整数です. その使用法は
-            
             <literal>optim</literal>ヘルプに詳述されています).
-            
         </para>
-        
         <para>
-            
             その他の値が外部関数により必要とされる場合,
-            
             これらの変数をその環境において定義することができます.
-            
             また, 外部関数をリスト内に置くことができます.
-            
             例えば,外部関数
-            
         </para>
-        
-        <programlisting role=""><![CDATA[ 
-[f,g,ind]=costfunc(x,ind,a,b,c) 
+        <programlisting role=""><![CDATA[
+[f,g,ind]=costfunc(x,ind,a,b,c)
  ]]></programlisting>
-        
         <para>
-            
             は, external が
-            
             <literal>list(costfunc,a,b,c)</literal>の場合,
-            
             <literal>optim</literal>に適用できます.
-            
             そして, <literal>optim</literal>へのコールは
-            
             以下のようになります:
-            
         </para>
-        
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 optim(list(costfunc,a1,b1,c1),....
  ]]></programlisting>
-        
         <para>
-            
-            externalはFortranまたはCルーチンとすることもできます: 
-            
+            externalはFortranまたはCルーチンとすることもできます:
             これは計算を高速化するために有用です.
-            
         </para>
-        
         <para>
-            
             ルーチンの名前は文字列として高レベルプリミティブに
-            
             指定することができます.
-            
             このルーチンの呼び出し手順も規定されています.
-            
         </para>
-        
         <para>
-            
             外部FortranまたはCルーチンも動的にリンクできます
-            
             (<literal>link</literal>参照).
-            
         </para>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="ode">ode</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="optim">optim</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="impl">impl</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="dassl">dassl</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="intg">intg</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="schur">schur</link>
-                
             </member>
-            
-            <member>
-                
-                <link linkend="gschur">gschur</link>
-                
-            </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
index f3f7399..7b5c655 100644 (file)
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="external" 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="external" xml:lang="pt">
     <refnamediv>
         <refname>external</refname>
-        <refpurpose>objeto Scilab, função ou rotina externa</refpurpose>
+        <refpurpose>objeto Scilab, função ou rotina externa</refpurpose>
     </refnamediv>
-    <refsection>
-        <title>Descrição</title>
-        <para>Função ou rotina externa para uso com comandos específicos.</para>
-        <para>Uma "external" é uma função ou rotina que é usada como argumento em
-            algumas primitivas de alto nível (tais como <literal>ode</literal>,
+    <refsection role="description">
+        <title>Descrição</title>
+        <para>Função ou rotina externa para uso com comandos específicos.</para>
+        <para>Uma "external" é uma função ou rotina que é usada como argumento em
+            algumas primitivas de alto nível (tais como <literal>ode</literal>,
             <literal>optim</literal>, <literal>schur</literal>...).
         </para>
-        <para>A seqüência de chamamento da "external" (função ou rotina) é imposta
-            pela primitiva de alto nível que configura os argumentos da
+        <para>A seqüência de chamamento da "external" (função ou rotina) é imposta
+            pela primitiva de alto nível que configura os argumentos da
             external.
         </para>
-        <para>Por exemplo, a função externa costfunc é um argumento da primitiva
-            optim . Sua seqüência de chamamento deve ser:
+        <para>Por exemplo, a função externa costfunc é um argumento da primitiva
+            optim . Sua seqüência de chamamento deve ser:
             <literal>[f,g,ind]=costfunc(x,ind)</literal> e <literal>optim</literal> (a
-            primitiva de otimização de alto nível) é invocada como segue:
+            primitiva de otimização de alto nível) é invocada como segue:
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 optim(costfunc,...)
  ]]></programlisting>
         <para>
-            Aqui <literal>costfunc</literal> (a função de custo a ser minimizada
+            Aqui <literal>costfunc</literal> (a função de custo a ser minimizada
             pela primitiva <literal>optim</literal>) avalia <literal>f=f(x)</literal>
             e <literal>g=</literal> gradiente de <literal>f</literal> em
-            <literal>x</literal> (<literal>ind</literal> é um inteiro. Seu uso é
+            <literal>x</literal> (<literal>ind</literal> é um inteiro. Seu uso é
             esclarecido na ajuda de <literal>optim</literal>).
         </para>
-        <para>Se a função externa necessita de outros valores, estas variáveis
-            podem ser definidas em seu ambiente. Elas também podem ser colocadas em
-            uma lista. Por exemplo, a função externa
+        <para>Se a função externa necessita de outros valores, estas variáveis
+            podem ser definidas em seu ambiente. Elas também podem ser colocadas em
+            uma lista. Por exemplo, a função externa
         </para>
-        <programlisting role=""><![CDATA[ 
-[f,g,ind]=costfunc(x,ind,a,b,c) 
+        <programlisting role=""><![CDATA[
+[f,g,ind] = costfunc(x,ind,a,b,c)
  ]]></programlisting>
         <para>
-            é válida para <literal>optim</literal> se o external (função
-            externa) é <literal>list(costfunc,a,b,c)</literal> e a chamada a
-            <literal>optim</literal> é, então:
+            é válida para <literal>optim</literal> se o external (função
+            externa) é <literal>list(costfunc,a,b,c)</literal> e a chamada a
+            <literal>optim</literal> é, então:
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 optim(list(costfunc,a1,b1,c1),....
  ]]></programlisting>
-        <para>Um external também pode ser uma rotina FORTRAN ou C: isto é
-            conveniente para acelerar computações.
+        <para>Um external também pode ser uma rotina FORTRAN ou C: isto é
+            conveniente para acelerar computações.
         </para>
-        <para>TO nome da rotina é fornecido para a primitiva de alto nível como um
-            string. A seqüência de chamamento da rotina também é imposta. 
+        <para>TO nome da rotina é fornecido para a primitiva de alto nível como um
+            string. A seqüência de chamamento da rotina também é imposta.
         </para>
         <para>Rotinas FORTRAN ou C podem ser dinamicamente linkadas ("ligadas,
             conectadas") (ver <literal>link</literal>)
         </para>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="ode">ode</link>
@@ -76,9 +76,6 @@ optim(list(costfunc,a1,b1,c1),....
             <member>
                 <link linkend="schur">schur</link>
             </member>
-            <member>
-                <link linkend="gschur">gschur</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
index eff7d19..d127fbb 100644 (file)
@@ -4,61 +4,61 @@
         <refname>external</refname>
         <refpurpose>объект Scilab'а, внешняя функция или подпрограмма</refpurpose>
     </refnamediv>
-    <refsection>
+    <refsection role="description">
         <title>Описание</title>
         <para>
             Внешняя функция или подпрограмма для использования со специальными командами.
         </para>
         <para>
-            "external" -- это функция или подпрограмма, которая используется в качестве 
-            аргумента некоторых примитивов высокого уровня (таких как <literal>ode</literal>, 
+            "external" -- это функция или подпрограмма, которая используется в качестве
+            аргумента некоторых примитивов высокого уровня (таких как <literal>ode</literal>,
             <literal>optim</literal>, <literal>schur</literal>...).
         </para>
         <para>
-            Последовательность вызова внешней функции или подпрограммы предписывается 
+            Последовательность вызова внешней функции или подпрограммы предписывается
             примитивом высокого уровня, который устанавливает аргументы данной внешней
             функции или подпрограммы.
         </para>
         <para>
-            Например, внешняя функция <literal>costfunc</literal> является аргументом примитива 
-            <literal>optim</literal> (примитив оптимизации высокого уровня). Её последовательность 
-            вызова должна быть: 
-            <literal>[f,g,ind]=costfunc(x,ind)</literal> и 
+            Например, внешняя функция <literal>costfunc</literal> является аргументом примитива
+            <literal>optim</literal> (примитив оптимизации высокого уровня). Её последовательность
+            вызова должна быть:
+            <literal>[f,g,ind]=costfunc(x,ind)</literal> и
             <literal>optim</literal> вызывается следующим образом:
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 optim(costfunc,...)
  ]]></programlisting>
         <para>
-            Здесь <literal>costfunc</literal> (функция цены должна быть минимизирована примитивом 
+            Здесь <literal>costfunc</literal> (функция цены должна быть минимизирована примитивом
             <literal>optim</literal>) вычисляет <literal>f=f(x)</literal> и <literal>g</literal> --
-            градиент <literal>f</literal> в <literal>x</literal> (<literal>ind</literal> -- целое 
+            градиент <literal>f</literal> в <literal>x</literal> (<literal>ind</literal> -- целое
             число. Его использование уточняется в справке по  <literal>optim</literal>).
         </para>
         <para>
-            Если необходимы другие значения для внешней функции, то эти переменные могут быть 
-            определены в её окружении. Также они могут быть вложены в список. Например, 
+            Если необходимы другие значения для внешней функции, то эти переменные могут быть
+            определены в её окружении. Также они могут быть вложены в список. Например,
             внешняя функция:
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
-[f,g,ind]=costfunc(x,ind,a,b,c) 
+        <programlisting role="no-scilab-exec"><![CDATA[
+[f,g,ind] = costfunc(x,ind,a,b,c)
  ]]></programlisting>
         <para>
-            является корректной для <literal>optim</literal>, если внешняя функция является списком 
-            <literal>list(costfunc,a,b,c)</literal> и тогда вызов <literal>optim</literal>:      
+            является корректной для <literal>optim</literal>, если внешняя функция является списком
+            <literal>list(costfunc,a,b,c)</literal> и тогда вызов <literal>optim</literal>:
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 optim(list(costfunc,a1,b1,c1),....
  ]]></programlisting>
         <para>
             Внешняя подпрограмма может быть процедурой Fortran или C: это удобно для быстрых вычислений.
         </para>
         <para>
-            Имя подпрограммы указывается примитиву высокого уровня в виде символьной строки. 
+            Имя подпрограммы указывается примитиву высокого уровня в виде символьной строки.
             Последовательность подпрограммы также предписывается.
         </para>
         <para>
-            Внешние процедуры Fortran или C могут быть также динамически связаны (см. 
+            Внешние процедуры Fortran или C могут быть также динамически связаны (см.
             <literal>link</literal>).
         </para>
     </refsection>
@@ -83,9 +83,6 @@ optim(list(costfunc,a1,b1,c1),....
             <member>
                 <link linkend="schur">schur</link>
             </member>
-            <member>
-                <link linkend="gschur">gschur</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
diff --git a/scilab/modules/linear_algebra/help/en_US/eigen/gschur.xml b/scilab/modules/linear_algebra/help/en_US/eigen/gschur.xml
deleted file mode 100644 (file)
index 9a5a759..0000000
+++ /dev/null
@@ -1,102 +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:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" scilab:needs-examples="no" xml:id="gschur">
-    <refnamediv>
-        <refname>gschur</refname>
-        <refpurpose>
-            generalized Schur form. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[As,Es]=gschur(A,E)
-            [As,Es,Q,Z]=gschur(A,E)
-            [As,Es,Z,dim] = gschur(A,E,flag)
-            [As,Es,Z,dim]= gschur(A,E,extern)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            This function is obsolete and is now included in the <literal>schur</literal>
-            function. In most cases the <literal>gschur</literal> function will still work as
-            before, but it will be removed in the future release. 
-        </para>
-        <para>
-            The first three syntaxes can be replaced by
-        </para>
-        <programlisting role=""><![CDATA[ 
-[As,Es]=schur(A,E)
-[As,Es,Q,Z]=schur(A,E);Q=Q' //NOTE THE TRANSPOSITION HERE
-[As,Es,Z,dim] = schur(A,E,flag) 
- ]]></programlisting>
-        <para>
-            The last syntax requires little more adaptations:
-        </para>
-        <variablelist>
-            <varlistentry>
-                <term>if</term>
-                <listitem>
-                    <para>extern is a scilab function  the new syntax
-                        should be <literal>[As,Es,Z,dim]= schur(A,E,Nextern)</literal> with
-                        Nextern defined as follow:
-                    </para>
-                    <programlisting role=""><![CDATA[ 
-function t=Nextern(R)
-if R(2)==0 then
-  t=extern([1,R(1),R(3)])==1
-else
-  c=(R(1)+%i*R(2))/R(3)
-  t=extern([2,real(c+c'),real(c*c')])==1
-end
-endfunction
- ]]></programlisting>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>if</term>
-                <listitem>
-                    <para>extern is the name of an external function coded in Fortran or C
-                        the new syntax should be <literal>[As,Es,Z,dim]=    schur(A,E,'nextern')</literal> with nextern defined as follow:
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <programlisting role=""><![CDATA[ 
-logical function nextern(ar,ai,beta)
-double precision ar,ai,beta
-integer r,extern
-if (ai.eq.0.0d0) then
-  r=extern(1,ar,beta,0.0d0,0.0d0)
-else
-  r=extern(2,0.0d0,0.0d0,2.0d0*ar,ar*ar+ai*ai)
-endif
-nextern=r.eq.1
-end
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="external">external</link>
-            </member>
-            <member>
-                <link linkend="schur">schur</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 7216491..ad5c1c4 100644 (file)
@@ -143,7 +143,7 @@ numbeta
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="gschur">gschur</link>
+                <link linkend="schur">schur</link>
             </member>
             <member>
                 <link linkend="spec">spec</link>
index 1db07d6..5f1c54b 100644 (file)
@@ -128,7 +128,7 @@ Q(sE-A)Z = |=================================|============|
                 <link linkend="kroneck">kroneck</link>
             </member>
             <member>
-                <link linkend="gschur">gschur</link>
+                <link linkend="schur">schur</link>
             </member>
             <member>
                 <link linkend="spec">spec</link>
diff --git a/scilab/modules/linear_algebra/help/ja_JP/eigen/gschur.xml b/scilab/modules/linear_algebra/help/ja_JP/eigen/gschur.xml
deleted file mode 100644 (file)
index c6ac9c7..0000000
+++ /dev/null
@@ -1,183 +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: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="gschur">
-    
-    <refnamediv>
-        
-        <refname>gschur</refname>
-        
-        <refpurpose>
-            
-            一般化Schur分解.
-            
-            <emphasis role="bold">この関数は廃止されました.</emphasis>
-            
-        </refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[As,Es]=gschur(A,E)
-            
-            [As,Es,Q,Z]=gschur(A,E)
-            
-            [As,Es,Z,dim] = gschur(A,E,flag)
-            
-            [As,Es,Z,dim]= gschur(A,E,extern)
-            
-        </synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            この関数は廃止されており, <literal>schur</literal>関数に統合されています.
-            
-            多くの場合, <literal>gschur</literal>関数は以前と同様に動作しますが,
-            
-            将来のリリースでは削除される予定です.
-            
-        </para>
-        
-        <para>
-            
-            最初の3つの構文は以下のように置き換えることができます
-            
-        </para>
-        
-        <programlisting role=""><![CDATA[ 
-[As,Es]=schur(A,E)
-[As,Es,Q,Z]=schur(A,E);Q=Q' //NOTE THE TRANPOSITION HERE
-[As,Es,Z,dim] = schur(A,E,flag) 
- ]]></programlisting>
-        
-        <para>
-            
-            最後の構文はさらに若干の調整が必要です:
-            
-        </para>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>もし,</term>
-                
-                <listitem>
-                    
-                    <para>
-                        
-                        extern が Scilab関数の場合,
-                        
-                        Nextern を以下のように定義すると,
-                        
-                        新しい呼び出し手順は,
-                        
-                        <literal>[As,Es,Z,dim]= schur(A,E,Nextern)</literal>
-                        
-                        となります:
-                        
-                    </para>
-                    
-                    <programlisting role=""><![CDATA[ 
-function t=Nextern(R)
-if R(2)==0 then
-  t=extern([1,R(1),R(3)])==1
-else
-  c=(R(1)+%i*R(2))/R(3)
-  t=extern([2,real(c+c'),real(c*c')])==1
-end
-endfunction
- ]]></programlisting>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>もし,</term>
-                
-                <listitem>
-                    
-                    <para>
-                        
-                        extern は,Fortran または Cで記述された外部関数の名前の場合,
-                        
-                        nextern を以下のように定義すると
-                        
-                        新しい呼び出し手順は,
-                        
-                        <literal>[As,Es,Z,dim]=    schur(A,E,'nextern')</literal> 
-                        
-                        のようになります:
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-        <programlisting role=""><![CDATA[ 
-logical function nextern(ar,ai,beta)
-double precision ar,ai,beta
-integer r,extern
-if (ai.eq.0.0d0) then
-  r=extern(1,ar,beta,0.0d0,0.0d0)
-else
-  r=extern(2,0.0d0,0.0d0,2.0d0*ar,ar*ar+ai*ai)
-endif
-nextern=r.eq.1
-end
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="external">external</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="schur">schur</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
index ee12475..5bf3f9e 100644 (file)
@@ -141,7 +141,7 @@ numbeta
         <title>参照</title>
         <simplelist type="inline">
             <member>
-                <link linkend="gschur">gschur</link>
+                <link linkend="schur">schur</link>
             </member>
             <member>
                 <link linkend="spec">spec</link>
@@ -160,4 +160,4 @@ numbeta
             </member>
         </simplelist>
     </refsection>
-</refentry>
\ No newline at end of file
+</refentry>
index 0faf4ef..6b1f07c 100644 (file)
@@ -127,11 +127,11 @@ Q(sE-A)Z = |=================================|============|
                 <link linkend="kroneck">kroneck</link>
             </member>
             <member>
-                <link linkend="gschur">gschur</link>
+                <link linkend="schur">schur</link>
             </member>
             <member>
                 <link linkend="spec">spec</link>
             </member>
         </simplelist>
     </refsection>
-</refentry>
\ No newline at end of file
+</refentry>
diff --git a/scilab/modules/linear_algebra/help/pt_BR/eigen/gschur.xml b/scilab/modules/linear_algebra/help/pt_BR/eigen/gschur.xml
deleted file mode 100644 (file)
index feee5b2..0000000
+++ /dev/null
@@ -1,100 +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: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="gschur" xml:lang="en">
-    <refnamediv>
-        <refname>gschur</refname>
-        <refpurpose>forma de Schur generalizada (função obsoleta) </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title> Seqüência de Chamamento</title>
-        <synopsis>[As,Es]=gschur(A,E)
-            [As,Es,Q,Z]=gschur(A,E)
-            [As,Es,Z,dim] = gschur(A,E,flag)
-            [As,Es,Z,dim]= gschur(A,E,extern)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>Esta função é obsoleta e agora está inclusa na função
-            <literal>schur</literal> function. Na maior parte dos casos, a função
-            <literal>gschur</literal> irá ainda trabalhar como antes, mas será
-            removida em um lançamento futuro do Scilab.
-        </para>
-        <para>As três sintaxes podem ser substituídas por</para>
-        <programlisting role=""><![CDATA[ 
-[As,Es]=schur(A,E)
-[As,Es,Q,Z]=schur(A,E);Q=Q' //NOTE A TRANSPOSIÇÃO AQUI
-[As,Es,Z,dim] = schur(A,E,flag) 
- ]]></programlisting>
-        <para>A última sintaxe requer algumas adaptações a mais: </para>
-        <variablelist>
-            <varlistentry>
-                <term>if</term>
-                <listitem>
-                    <para>é uma função do Scilab, a nova seqüência de chamamento deve
-                        ser <literal>[As,Es,Z,dim]= schur(A,E,Nextern)</literal> com Nextern
-                        definido como segue:
-                    </para>
-                    <programlisting role=""><![CDATA[ 
-function t=Nextern(R)
-if R(2)==0 then
-  t=extern([1,R(1),R(3)])==1
-else
-  c=(R(1)+%i*R(2))/R(3)
-  t=extern([2,real(c+c'),real(c*c')])==1
-end
-endfunction
- ]]></programlisting>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>if</term>
-                <listitem>
-                    <para>é o nome de uma função externa codificada em FORTRAN ou C, a
-                        nova seqüência de chamamento deve ser <literal>[As,Es,Z,dim]=
-                            schur(A,E,'nextern')
-                        </literal>
-                        com nextern definido como
-                        segue:
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <programlisting role=""><![CDATA[ 
-logical function nextern(ar,ai,beta)
-double precision ar,ai,beta
-integer r,extern
-if (ai.eq.0.0d0) then
-  r=extern(1,ar,beta,0.0d0,0.0d0)
-else
-  r=extern(2,0.0d0,0.0d0,2.0d0*ar,ar*ar+ai*ai)
-endif
-nextern=r.eq.1
-end
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title> Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="external">external</link>
-            </member>
-            <member>
-                <link linkend="schur">schur</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 522f9c0..b88ee7a 100644 (file)
@@ -145,7 +145,7 @@ numbeta
         <title> Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="gschur">gschur</link>
+                <link linkend="schur">schur</link>
             </member>
             <member>
                 <link linkend="spec">spec</link>
index 429b456..e7251e3 100644 (file)
@@ -128,7 +128,7 @@ Q(sE-A)Z = |=================================|============|
                 <link linkend="kroneck">kroneck</link>
             </member>
             <member>
-                <link linkend="gschur">gschur</link>
+                <link linkend="schur">schur</link>
             </member>
             <member>
                 <link linkend="spec">spec</link>
index 8c600f1..7f23925 100644 (file)
@@ -514,35 +514,12 @@ msgid "%s: Wrong size for input argument #%d: A column vector expected.\n"
 msgstr ""
 
 #
-# File: modules/linear_algebra/macros/gschur.sci, line: 24
-# File: modules/linear_algebra/macros/gschur.sci, line: 40
+# File: modules/linear_algebra/macros/gspec.sci, line: 16
 #, c-format
 msgid "%s: Obsolete function. Please replace '%s' by '%s'."
 msgstr ""
 
 #
-# File: modules/linear_algebra/macros/gschur.sci, line: 32
-#, c-format
-msgid ""
-"%s: Obsolete function. Former external functions cannot be used anymore."
-msgstr ""
-
-#
-# File: modules/linear_algebra/macros/householder.sci, line: 35
-# File: modules/linear_algebra/macros/householder.sci, line: 39
-#, c-format
-msgid "%s: Wrong type for argument %d: Decimal or complex numbers expected.\n"
-msgstr ""
-
-#
-# File: modules/linear_algebra/macros/householder.sci, line: 43
-# File: modules/linear_algebra/macros/householder.sci, line: 47
-#, c-format
-msgid "%s: Wrong size for input argument #%d: Column vector expected.\n"
-msgstr ""
-
-#
-# File: modules/linear_algebra/macros/householder.sci, line: 51
 # File: modules/linear_algebra/macros/im_inv.sci, line: 25
 # File: modules/linear_algebra/macros/spaninter.sci, line: 29
 # File: modules/linear_algebra/macros/spanplus.sci, line: 29
diff --git a/scilab/modules/linear_algebra/macros/gschur.sci b/scilab/modules/linear_algebra/macros/gschur.sci
deleted file mode 100644 (file)
index 746e8a3..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-// 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.
-
-function [As,Es,Z,dim]= gschur(A,E,extern)
-
-    if argn(2)<=2 then
-        warning("Obsolete function. Please use schur instead.")
-        if argn(1)==2 then
-            [As,Es]= schur(A,E)
-        else
-            [As,Es,Q,Z]= schur(A,E);Q=Q'
-        end
-    elseif type(extern)==10 then
-        if convstr(extern)=="c"|convstr(extern)=="d" then
-            warning(msprintf(gettext("%s: Obsolete function. Please replace ''%s'' by ''%s''."),"gschur","gschur","schur"));
-            if argn(1)==4 then
-                [As,Es,Z,dim]= schur(A,E,extern)
-            elseif argn(1)==2 then
-                [As,Es,Z,dim]= schur(A,E,extern)
-                Es=dim;As=Z;
-            end
-        else // hard coded
-            warning(msprintf(gettext("%s: Obsolete function. Former external functions cannot be used anymore."),"gschur"));
-            //impossible to redefine
-        end
-    else //coded by a scilab function
-        //---- old------------------
-        //flag=extern(x)
-        //x(1) ==1 ==> x(2:3)=[al,be]
-        //x(1) ==2 ==> x(2:3)=[s,p]
-        warning(msprintf(gettext("%s: Obsolete function. Please replace ''%s'' by ''%s''."),"gschur","gschur","schur"));
-        deff("t=%_rule(Alpha,Beta)",["if imag(Alpha)==0 then"
-        "  t=extern([1,real(Alpha),Beta])==1"
-        "else"
-        "  c=Alpha/Beta"
-        "  t=extern([2,real(c+c''),real(c*c'')])==1"
-        "end;"])
-        [As,Es,Z,dim]= schur(A,E,%_rule)
-    end
-endfunction
-