Mercurial > octave

changeset 25164:09e0ddee659c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove internal functions and options deprecated in version 4.0 * __luinc__.cc: Delete file. * error.cc (F__usage__): Remove DEFUN. * spparms.cc (Fspparms): Remove keyword "defaults" alias for "default". * libinterp/corefcn/module.mk: Remove __luinc__.cc from build system.
author Mike Miller <mtmiller@octave.org>
date Sun, 08 Apr 2018 17:26:39 -0700
parents eed5ea70348b
children 7c6fbd6e5a7a
files libinterp/corefcn/__luinc__.cc libinterp/corefcn/error.cc libinterp/corefcn/module.mk libinterp/corefcn/spparms.cc
diffstat 4 files changed, 2 insertions(+), 332 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/__luinc__.cc	Sun Apr 08 17:55:33 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,285 +0,0 @@
-/*
-
-Copyright (C) 2005-2018 David Bateman
-
-This file is part of Octave.
-
-Octave is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Octave is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, see
-<https://www.gnu.org/licenses/>.
-
-*/
-
-#if defined (HAVE_CONFIG_H)
-#  include "config.h"
-#endif
-
-#include "defun.h"
-#include "error.h"
-#include "errwarn.h"
-#include "ovl.h"
-#include "utils.h"
-#include "oct-map.h"
-
-#include "MatrixType.h"
-#include "sparse-lu.h"
-#include "ov-re-sparse.h"
-#include "ov-cx-sparse.h"
-
-// FIXME: Deprecated in 4.0 and should be removed in 4.4.
-DEFUN (__luinc__, args, nargout,
-       doc: /* -*- texinfo -*-
-@deftypefn  {} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} __luinc__ (@var{A}, '0')
-@deftypefnx {} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} __luinc__ (@var{A}, @var{droptol})
-@deftypefnx {} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} __luinc__ (@var{A}, @var{opts})
-Internal implementation of @code{luinc}.
-
-See documentation for @code{luinc}.
-@seealso{luinc}
-@end deftypefn */)
-{
-  int nargin = args.length ();
-
-  if (nargin < 2 || nargin > 3)
-    print_usage ();
-
-  if (! args(0).issparse ())
-    error ("luinc: matrix A must be sparse");
-
-  bool zero_level = false;
-  bool milu = false;
-  bool udiag = false;
-  Matrix thresh;
-  double droptol = -1.0;
-  bool vecout = false;
-
-  if (args(1).is_string ())
-    {
-      if (args(1).string_value () == "0")
-        zero_level = true;
-      else
-        error ("luinc: unrecognized string argument");
-    }
-  else if (args(1).isstruct ())
-    {
-      octave_scalar_map map
-        = args(1).xscalar_map_value ("luinc: OPTS must be a scalar structure");
-
-      octave_value tmp;
-
-      tmp = map.getfield ("droptol");
-      if (tmp.is_defined ())
-        droptol = tmp.double_value ();
-
-      tmp = map.getfield ("milu");
-      if (tmp.is_defined ())
-        {
-          double val = tmp.double_value ();
-
-          milu = (val == 0.0 ? false : true);
-        }
-
-      tmp = map.getfield ("udiag");
-      if (tmp.is_defined ())
-        {
-          double val = tmp.double_value ();
-
-          udiag = (val == 0.0 ? false : true);
-        }
-
-      tmp = map.getfield ("thresh");
-      if (tmp.is_defined ())
-        {
-          thresh = tmp.matrix_value ();
-
-          if (thresh.numel () == 1)
-            {
-              thresh.resize (1, 2);
-              thresh(1) = thresh(0);
-            }
-          else if (thresh.numel () != 2)
-            error ("luinc: THRESH must be a 1 or 2-element vector");
-        }
-    }
-  else
-    droptol = args(1).double_value ();
-
-  if (nargin == 3)
-    {
-      std::string tmp = args(2).string_value ();
-
-      if (tmp == "vector")
-        vecout = true;
-      else
-        error ("luinc: unrecognized string argument");
-    }
-
-  // FIXME: Add code for zero-level factorization
-  if (zero_level)
-    error ("luinc: zero-level factorization not implemented");
-
-  octave_value_list retval;
-
-  if (args(0).isreal ())
-    {
-      SparseMatrix sm = args(0).sparse_matrix_value ();
-      octave_idx_type sm_nr = sm.rows ();
-      octave_idx_type sm_nc = sm.cols ();
-      ColumnVector Qinit (sm_nc);
-
-      for (octave_idx_type i = 0; i < sm_nc; i++)
-        Qinit(i) = i;
-
-      switch (nargout)
-        {
-        case 0:
-        case 1:
-        case 2:
-          {
-            octave::math::sparse_lu<SparseMatrix> fact
-              (sm, Qinit, thresh, false, true, droptol, milu, udiag);
-
-            SparseMatrix P = fact.Pr ();
-            SparseMatrix L = P.transpose () * fact.L ();
-
-            retval(1)
-              = octave_value (fact.U (), MatrixType (MatrixType::Upper));
-
-            retval(0)
-              = octave_value (L, MatrixType (MatrixType::Permuted_Lower,
-                                             sm_nr, fact.row_perm ()));
-          }
-          break;
-
-        case 3:
-          {
-            octave::math::sparse_lu<SparseMatrix> fact
-              (sm, Qinit, thresh, false, true, droptol, milu, udiag);
-
-            if (vecout)
-              retval(2) = fact.Pr_vec ();
-            else
-              retval(2) = fact.Pr_mat ();
-
-            retval(1)
-              = octave_value (fact.U (), MatrixType (MatrixType::Upper));
-
-            retval(0)
-              = octave_value (fact.L (), MatrixType (MatrixType::Lower));
-          }
-          break;
-
-        case 4:
-        default:
-          {
-            octave::math::sparse_lu<SparseMatrix> fact
-              (sm, Qinit, thresh, false, false, droptol, milu, udiag);
-
-            if (vecout)
-              {
-                retval(3) = fact.Pc_vec ();
-                retval(2) = fact.Pr_vec ();
-              }
-            else
-              {
-                retval(3) = fact.Pc_mat ();
-                retval(2) = fact.Pr_mat ();
-              }
-
-            retval(1)
-              = octave_value (fact.U (), MatrixType (MatrixType::Upper));
-
-            retval(0)
-              = octave_value (fact.L (), MatrixType (MatrixType::Lower));
-          }
-          break;
-        }
-    }
-  else
-    {
-      SparseComplexMatrix sm = args(0).sparse_complex_matrix_value ();
-      octave_idx_type sm_nr = sm.rows ();
-      octave_idx_type sm_nc = sm.cols ();
-      ColumnVector Qinit (sm_nc);
-
-      for (octave_idx_type i = 0; i < sm_nc; i++)
-        Qinit(i) = i;
-
-      switch (nargout)
-        {
-        case 0:
-        case 1:
-        case 2:
-          {
-            octave::math::sparse_lu<SparseComplexMatrix> fact
-              (sm, Qinit, thresh, false, true, droptol, milu, udiag);
-
-            SparseMatrix P = fact.Pr ();
-            SparseComplexMatrix L = P.transpose () * fact.L ();
-
-            retval(1)
-              = octave_value (fact.U (), MatrixType (MatrixType::Upper));
-
-            retval(0)
-              = octave_value (L, MatrixType (MatrixType::Permuted_Lower,
-                                             sm_nr, fact.row_perm ()));
-          }
-          break;
-
-        case 3:
-          {
-            octave::math::sparse_lu<SparseComplexMatrix> fact
-              (sm, Qinit, thresh, false, true, droptol, milu, udiag);
-
-            if (vecout)
-              retval(2) = fact.Pr_vec ();
-            else
-              retval(2) = fact.Pr_mat ();
-
-            retval(1)
-              = octave_value (fact.U (), MatrixType (MatrixType::Upper));
-
-            retval(0)
-              = octave_value (fact.L (), MatrixType (MatrixType::Lower));
-          }
-          break;
-
-        case 4:
-        default:
-          {
-            octave::math::sparse_lu<SparseComplexMatrix> fact
-              (sm, Qinit, thresh, false, false, droptol, milu, udiag);
-
-            if (vecout)
-              {
-                retval(3) = fact.Pc_vec ();
-                retval(2) = fact.Pr_vec ();
-              }
-            else
-              {
-                retval(3) = fact.Pc_mat ();
-                retval(2) = fact.Pr_mat ();
-              }
-
-            retval(1)
-              = octave_value (fact.U (), MatrixType (MatrixType::Upper));
-
-            retval(0)
-              = octave_value (fact.L (), MatrixType (MatrixType::Lower));
-          }
-          break;
-        }
-    }
-
-  return retval;
-}
--- a/libinterp/corefcn/error.cc	Sun Apr 08 17:55:33 2018 -0700
+++ b/libinterp/corefcn/error.cc	Sun Apr 08 17:26:39 2018 -0700
@@ -2155,41 +2155,6 @@
     return ovl ();
 }
 
-// FIXME: Deprecated in 4.0 and scheduled for removal in 4.4.
-
-DEFUN (__usage__, args, ,
-       doc: /* -*- texinfo -*-
-@deftypefn {} {} usage (@var{msg})
-Print the message @var{msg}, prefixed by the string @samp{usage: }, and
-set Octave's internal error state such that control will return to the
-top level without evaluating any more commands.  This is useful for
-aborting from functions.
-
-After @code{usage} is evaluated, Octave will print a traceback of all
-the function calls leading to the usage message.
-
-You should use this function for reporting problems errors that result
-from an improper call to a function, such as calling a function with an
-incorrect number of arguments, or with arguments of the wrong type.  For
-example, most functions distributed with Octave begin with code like
-this
-
-@example
-@group
-if (nargin != 2)
-  usage ("foo (a, b)");
-endif
-@end group
-@end example
-
-@noindent
-to check for the proper number of arguments.
-@end deftypefn */)
-{
-  handle_message (usage_with_id, "", "unknown", args, true);
-  return ovl ();
-}
-
 DEFUN (beep_on_error, args, nargout,
        doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{val} =} beep_on_error ()
--- a/libinterp/corefcn/module.mk	Sun Apr 08 17:55:33 2018 -0700
+++ b/libinterp/corefcn/module.mk	Sun Apr 08 17:26:39 2018 -0700
@@ -115,7 +115,6 @@
   %reldir%/__ichol__.cc \
   %reldir%/__ilu__.cc \
   %reldir%/__lin_interpn__.cc \
-  %reldir%/__luinc__.cc \
   %reldir%/__magick_read__.cc \
   %reldir%/__pchip_deriv__.cc \
   %reldir%/__qp__.cc \
--- a/libinterp/corefcn/spparms.cc	Sun Apr 08 17:55:33 2018 -0700
+++ b/libinterp/corefcn/spparms.cc	Sun Apr 08 17:26:39 2018 -0700
@@ -129,17 +129,8 @@
           for (int i = 0; i < len; i++)
             str[i] = tolower (str[i]);
 
-          if (str == "defaults" || str == "default")
-            {
-              // FIXME: deprecated in 4.0, remove "defaults" for 4.4 release
-              static bool warned = false;
-              if (! warned && str == "defaults")
-                {
-                  warning (R"(spparms: use "default" instead of "defaults")");
-                  warned = true;
-                }
-              octave_sparse_params::defaults ();
-            }
+          if (str == "default")
+            octave_sparse_params::defaults ();
           else if (str == "tight")
             octave_sparse_params::tight ();
           else