Mercurial > octave
changeset 25207:2815f3257c9a
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 11 Apr 2018 00:43:54 -0400 |
| parents | 22522ea137b4 (diff) cbe53b5ea5ce (current diff) |
| children | 325145377713 |
| files | |
| diffstat | 77 files changed, 1956 insertions(+), 4026 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Feb 06 07:00:09 2018 +0100 +++ b/.hgtags Wed Apr 11 00:43:54 2018 -0400 @@ -108,3 +108,4 @@ 69ac19073ae630b276ff7788b78f72782f281657 rc-4-2-0-4 708a4fcb73820484a3af94dd4d18453c4d9b29c9 release-4-2-0 1327ea4f5a931a6cc2a6d4790af58cf16de4702b release-4-2-1 +94f8e2b5a88b79974084c0ae541cacbcc62d64f6 release-4-2-2
--- a/NEWS Tue Feb 06 07:00:09 2018 +0100 +++ b/NEWS Wed Apr 11 00:43:54 2018 -0400 @@ -1,3 +1,16 @@ +Summary of important user-visible changes for version 4.6 (yyyy-mm-dd): +---------------------------------------------------------------------- + + ** The following properties or allowed corresponding values were deprecated in + Octave 4.2 and have been removed from Octave 4.6: + + Object | Property | Value + ---------------------|-------------------------|------------------- + axes | xaxislocation | "zero" + | yaxislocation | "zero" + patch | normalmode | + surface | normalmode | + Summary of important user-visible changes for version 4.4 (yyyy-mm-dd): ----------------------------------------------------------------------
--- a/configure.ac Tue Feb 06 07:00:09 2018 +0100 +++ b/configure.ac Wed Apr 11 00:43:54 2018 -0400 @@ -20,7 +20,7 @@ ### Initialize Autoconf AC_PREREQ([2.65]) -AC_INIT([GNU Octave], [4.3.0+], [https://octave.org/bugs.html], [octave], +AC_INIT([GNU Octave], [5.0.0], [https://octave.org/bugs.html], [octave], [https://www.gnu.org/software/octave/]) ### Declare version numbers @@ -28,16 +28,16 @@ dnl Note that the version number is duplicated here and in AC_INIT because dnl AC_INIT requires it to be static, not computed from shell variables. -OCTAVE_MAJOR_VERSION=4 -OCTAVE_MINOR_VERSION=3 -OCTAVE_PATCH_VERSION=0+ +OCTAVE_MAJOR_VERSION=5 +OCTAVE_MINOR_VERSION=0 +OCTAVE_PATCH_VERSION=0 dnl PACKAGE_VERSION is set by the AC_INIT VERSION argument. OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_COPYRIGHT="Copyright (C) 2018 John W. Eaton and others." -OCTAVE_RELEASE_DATE="2016-11-13" +OCTAVE_RELEASE_DATE="2018-04-07" ## The "API version" is used as a way of checking that interfaces in the ## liboctave and libinterp libraries haven't changed in a backwardly @@ -52,7 +52,7 @@ dnl FIXME: Since we also set libtool versions for liboctave and libinterp, dnl perhaps we should be computing the "api version" from those versions numbers dnl in some way instead of setting it independently here. -OCTAVE_API_VERSION="api-v51+" +OCTAVE_API_VERSION="api-v52+" AC_SUBST(OCTAVE_MAJOR_VERSION) AC_SUBST(OCTAVE_MINOR_VERSION)
--- a/libgui/src/documentation.cc Tue Feb 06 07:00:09 2018 +0100 +++ b/libgui/src/documentation.cc Wed Apr 11 00:43:54 2018 -0400 @@ -88,7 +88,7 @@ QMessageBox::warning (this, tr ("Octave Documentation"), tr ("Could not setup the data required for the\n" "documentation viewer. Only help texts in\n" - "the Console Widget will be available.")); + "the Command Window will be available.")); if (m_help_engine) delete m_help_engine; m_help_engine = 0;
--- a/libgui/src/shortcut-manager.cc Tue Feb 06 07:00:09 2018 +0100 +++ b/libgui/src/shortcut-manager.cc Wed Apr 11 00:43:54 2018 -0400 @@ -627,12 +627,12 @@ if (action == OSC_IMPORT) file = QFileDialog::getOpenFileName (this, - tr ("Import shortcuts from file ..."), QString (), + tr ("Import shortcuts from file..."), QString (), tr ("Octave Shortcut Files (*.osc);;All Files (*)"), nullptr, QFileDialog::DontUseNativeDialog); else if (action == OSC_EXPORT) file = QFileDialog::getSaveFileName (this, - tr ("Export shortcuts into file ..."), QString (), + tr ("Export shortcuts to file..."), QString (), tr ("Octave Shortcut Files (*.osc);;All Files (*)"), nullptr, QFileDialog::DontUseNativeDialog); @@ -643,7 +643,7 @@ if (! osc_settings) { - qWarning () << tr ("Failed to open %1 as octave shortcut file") + qWarning () << tr ("Failed to open %1 as Octave shortcut file") .arg (file); return false; }
--- a/libinterp/corefcn/error.cc Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/error.cc Wed Apr 11 00:43:54 2018 -0400 @@ -478,21 +478,6 @@ } void -vusage (const char *fmt, va_list args) -{ - usage_1 ("", fmt, args); -} - -void -usage (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - usage_1 ("", fmt, args); - va_end (args); -} - -void vusage_with_id (const char *id, const char *fmt, va_list args) { usage_1 (id, fmt, args);
--- a/libinterp/corefcn/error.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/error.h Wed Apr 11 00:43:54 2018 -0400 @@ -52,14 +52,6 @@ extern OCTINTERP_API void message (const char *name, const char *fmt, ...); -OCTAVE_DEPRECATED (4.2, "use 'print_usage' or 'verror' instead") -OCTAVE_NORETURN OCTINTERP_API extern -void vusage (const char *fmt, va_list args); - -OCTAVE_DEPRECATED (4.2, "use 'print_usage' or 'error' instead") -OCTAVE_NORETURN OCTINTERP_API extern -void usage (const char *fmt, ...); - extern OCTINTERP_API void vwarning (const char *fmt, va_list args); extern OCTINTERP_API void warning (const char *fmt, ...);
--- a/libinterp/corefcn/gl2ps-print.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/gl2ps-print.h Wed Apr 11 00:43:54 2018 -0400 @@ -36,16 +36,4 @@ const std::string& term); } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::gl2ps_print' instead") -inline void -gl2ps_print (const graphics_object& fig, const std::string& stream, - const std::string& term) -{ - return octave::gl2ps_print (fig, stream, term); -} - #endif - -#endif
--- a/libinterp/corefcn/graphics.in.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/graphics.in.h Wed Apr 11 00:43:54 2018 -0400 @@ -3661,8 +3661,7 @@ // FIXME: uicontextmenu should be moved here. radio_property units SU , "{normalized}|inches|centimeters|points|pixels|characters" array_property view u , default_axes_view () - // FIXME: DEPRECATED: Remove "zero" in version 5. - radio_property xaxislocation u , "{bottom}|top|origin|zero" + radio_property xaxislocation u , "{bottom}|top|origin" color_property xcolor mu , color_values (0.15, 0.15, 0.15) radio_property xcolormode , "{auto}|manual" radio_property xdir u , "{normal}|reverse" @@ -3679,8 +3678,7 @@ radio_property xticklabelmode u , "{auto}|manual" double_property xticklabelrotation , 0.0 radio_property xtickmode u , "{auto}|manual" - // FIXME: DEPRECATED: Remove "zero" in version 5. - radio_property yaxislocation u , "{left}|right|origin|zero" + radio_property yaxislocation u , "{left}|right|origin" color_property ycolor mu , color_values (0.15, 0.15, 0.15) radio_property ycolormode , "{auto}|manual" radio_property ydir u , "{normal}|reverse" @@ -3822,11 +3820,6 @@ } void update_yaxislocation (void) { - // FIXME: DEPRECATED: Remove warning with "zero" in version 5. - if (yaxislocation_is ("zero")) - warning_with_id ("Octave:deprecated-property", - "Setting 'yaxislocation' to 'zero' is deprecated, " - "set to 'origin' instead."); sync_positions (); update_axes_layout (); if (xticklabelmode.is ("auto")) @@ -3847,11 +3840,6 @@ } void update_xaxislocation (void) { - // FIXME: DEPRECATED: Remove warning with "zero" in version 5. - if (xaxislocation_is ("zero")) - warning_with_id ("Octave:deprecated-property", - "Setting 'xaxislocation' to 'zero' is deprecated, " - "set to 'origin' instead."); sync_positions (); update_axes_layout (); if (xticklabelmode.is ("auto")) @@ -4879,7 +4867,6 @@ color_property markeredgecolor , color_property (radio_values ("none|{auto}|flat"), color_values (0, 0, 0)) color_property markerfacecolor , color_property (radio_values ("{none}|auto|flat"), color_values (0, 0, 0)) double_property markersize , 6 - radio_property normalmode hsg , "{auto}|manual" double_property specularcolorreflectance , 1.0 double_property specularexponent , 10.0 double_property specularstrength , 0.9 @@ -4996,22 +4983,6 @@ } void update_data (void); - - void set_normalmode (const octave_value& val) - { - warning_with_id ("Octave:deprecated-property", - "patch: Property 'normalmode' is deprecated and will be removed " - "from a future version of Octave. Use 'vertexnormalsmode' instead."); - set_vertexnormalsmode (val); - } - - std::string get_normalmode (void) const - { - warning_with_id ("Octave:deprecated-property", - "patch: Property 'normalmode' is deprecated and will be removed " - "from a future version of Octave. Use 'vertexnormalsmode' instead."); - return vertexnormalsmode.current_value (); - } }; private: @@ -5091,7 +5062,6 @@ color_property markerfacecolor , color_property (radio_values ("{none}|auto|flat"), color_values (0, 0, 0)) double_property markersize , 6 radio_property meshstyle , "{both}|row|column" - radio_property normalmode hsg , "{auto}|manual" double_property specularcolorreflectance , 1 double_property specularexponent , 10 double_property specularstrength , 0.9 @@ -5187,22 +5157,6 @@ void update_vertexnormalsmode (void) { update_vertex_normals (); } - - void set_normalmode (const octave_value& val) - { - warning_with_id ("Octave:deprecated-property", - "surface: Property 'normalmode' is deprecated and will be removed " - "from a future version of Octave. Use 'vertexnormalsmode' instead."); - set_vertexnormalsmode (val); - } - - std::string get_normalmode (void) const - { - warning_with_id ("Octave:deprecated-property", - "surface: Property 'normalmode' is deprecated and will be removed " - "from a future version of Octave. Use 'vertexnormalsmode' instead."); - return vertexnormalsmode.current_value (); - } }; private:
--- a/libinterp/corefcn/gripes.cc Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,467 +0,0 @@ -/* - -Copyright (C) 1993-2018 John W. Eaton - -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/>. - -*/ - -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in -// version 5. - -#if defined (HAVE_CONFIG_H) -# include "config.h" -#endif - -#include "defun.h" -#include "error.h" -#include "gripes.h" -#include "ovl.h" -#include "utils.h" - -//////////////////////////////////////////////////////////////////////////////// -// Alphabetized list of gripes. -//////////////////////////////////////////////////////////////////////////////// - -void -gripe_2_or_3_dim_plot (void) -{ - error ("plot: can only plot in 2 or 3 dimensions"); -} - -void -gripe_data_conversion (const char *from, const char *to) -{ - error ("unable to convert from %s to %s format", from, to); -} - -void -gripe_data_file_in_path (const std::string& fcn, const std::string& file) -{ - warning_with_id ("Octave:data-file-in-path", - "%s: '%s' found by searching load path", - fcn.c_str (), file.c_str ()); -} - -void -gripe_disabled_feature (const std::string& fcn, const std::string& feature, - const std::string& pkg /*="Octave"*/) -{ - error ("%s: support for %s was unavailable or disabled when %s was built", - fcn.c_str (), feature.c_str (), pkg.c_str ()); -} - -void -gripe_divide_by_zero (void) -{ - warning_with_id ("Octave:divide-by-zero", "division by zero"); -} - -void -gripe_empty_arg (const char *name, bool is_error) -{ - if (is_error) - error ("%s: empty matrix is invalid as an argument", name); - else - warning ("%s: argument is empty matrix", name); -} - -void -gripe_implicit_conversion (const char *id, const char *from, const char *to) -{ - warning_with_id (id, "implicit conversion from %s to %s", from, to); -} - -void -gripe_implicit_conversion (const std::string& id, - const std::string& from, const std::string& to) -{ - warning_with_id (id.c_str (), - "implicit conversion from %s to %s", - from.c_str (), to.c_str ()); -} - -void -gripe_indexed_cs_list (void) -{ - error ("a cs-list cannot be further indexed"); -} - -void -gripe_invalid_conversion (const std::string& from, const std::string& to) -{ - error ("invalid conversion from %s to %s", from.c_str (), to.c_str ()); -} - -void -gripe_invalid_inquiry_subscript (void) -{ - error ("invalid dimension inquiry of a non-existent value"); -} - -void -gripe_invalid_value_specified (const char *name) -{ - warning ("invalid value specified for '%s'", name); -} - -void -gripe_logical_conversion (void) -{ - warning_with_id ("Octave:logical-conversion", - "value not equal to 1 or 0 converted to logical 1"); -} - -void -gripe_nonbraced_cs_list_assignment (void) -{ - error ("invalid assignment to cs-list outside multiple assignment"); -} - -void -gripe_nonconformant (void) -{ - error ("nonconformant matrices"); -} - -void -gripe_nonconformant (octave_idx_type r1, octave_idx_type c1, - octave_idx_type r2, octave_idx_type c2) -{ - error ("nonconformant matrices (op1 is %dx%d, op2 is %dx%d)", - r1, c1, r2, c2); -} - -void -gripe_not_implemented (const char *fcn) -{ - error ("%s: not implemented", fcn); -} - -void -gripe_not_supported (const char *fcn) -{ - error ("%s: not supported on this system", fcn); -} - -void -gripe_range_invalid (void) -{ - error ("range constant used in invalid context"); -} - -void -gripe_square_matrix_required (const char *name) -{ - error ("%s: argument must be a square matrix", name); -} - -void -gripe_string_invalid (void) -{ - error ("std::string constant used in invalid context"); -} - -void -gripe_unrecognized_data_fmt (const char *warn_for) -{ - error ("%s: unrecognized data format requested", warn_for); -} - -void -gripe_unrecognized_float_fmt (void) -{ - error ("unrecognized floating point format requested"); -} - -void -gripe_user_returned_invalid (const char *name) -{ - error ("%s: user-supplied function returned invalid value", name); -} - -void -gripe_user_supplied_eval (const char *name) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_user_supplied_eval (e, name); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_user_supplied_eval (octave::execution_exception& e, - const char *name) -{ - error (e, "%s: evaluation of user-supplied function failed", name); -} - -void -gripe_warn_complex_cmp (void) -{ - warning_with_id ("Octave:language-extension", - "comparing complex numbers is not supported in Matlab"); -} - -void -gripe_wrong_type_arg (const char *name, const char *s, bool is_error) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, name, s, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (octave::execution_exception& e, - const char *name, const char *s, bool is_error) -{ - if (is_error) - error (e, "%s: wrong type argument '%s'", name, s); - else - warning ("%s: wrong type argument '%s'", name, s); -} - -void -gripe_wrong_type_arg (const char *name, const std::string& s, bool is_error) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, name, s.c_str (), is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (octave::execution_exception& e, - const char *name, const std::string& s, bool is_error) -{ -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, name, s.c_str (), is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (const char *name, const octave_value& tc, - bool is_error) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, name, tc, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (octave::execution_exception& e, - const char *name, const octave_value& tc, - bool is_error) -{ - std::string type = tc.type_name (); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, name, type, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (const std::string& name, const octave_value& tc, - bool is_error) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, name, tc, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (octave::execution_exception& e, - const std::string& name, const octave_value& tc, - bool is_error) -{ -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, name.c_str (), tc, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (const char *s, bool is_error) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, s, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (octave::execution_exception& e, - const char *s, bool is_error) -{ - if (is_error) - error (e, "wrong type argument '%s'", s); - else - warning ("wrong type argument '%s'", s); -} - -void -gripe_wrong_type_arg (const std::string& s, bool is_error) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, s, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (octave::execution_exception& e, - const std::string& s, bool is_error) -{ -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, s.c_str (), is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (const octave_value& tc, bool is_error) -{ - octave::execution_exception e; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, tc, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg (octave::execution_exception& e, - const octave_value& tc, bool is_error) -{ - std::string type = tc.type_name (); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_wrong_type_arg (e, type, is_error); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_wrong_type_arg_for_binary_op (const octave_value& op) -{ - std::string type = op.type_name (); - error ("invalid operand '%s' for binary operator", type.c_str ()); -} - -void -gripe_wrong_type_arg_for_unary_op (const octave_value& op) -{ - std::string type = op.type_name (); - error ("invalid operand '%s' for unary operator", type.c_str ()); -}
--- a/libinterp/corefcn/gripes.h Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,237 +0,0 @@ -/* - -Copyright (C) 1993-2018 John W. Eaton - -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/>. - -*/ - -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in -// version 5. - -#if ! defined (octave_gripes_h) -#define octave_gripes_h 1 - -#include "octave-config.h" - -#include <string> - -#include "lo-array-gripes.h" - -class octave_value; -namespace octave -{ - class execution_exception; -} - -//////////////////////////////////////////////////////////////////////////////// -// Alphabetized list of gripes. -//////////////////////////////////////////////////////////////////////////////// - -OCTAVE_DEPRECATED (4.2, "use 'err_2_or_3_dim_plot' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_2_or_3_dim_plot (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_data_conversion' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_data_conversion (const char *from, const char *to); - -OCTAVE_DEPRECATED (4.2, "use 'warn_data_file_in_path' instead") -OCTINTERP_API extern void -gripe_data_file_in_path (const std::string& fcn, const std::string& file); - -OCTAVE_DEPRECATED (4.2, "use 'err_disabled_feature' or 'warn_disabled_feature' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_disabled_feature (const std::string& fcn, - const std::string& feature, - const std::string& pkg="Octave"); - -OCTAVE_DEPRECATED (4.2, "use 'warn_divide_by_zero' instead") -OCTINTERP_API extern void -gripe_divide_by_zero (void); - -OCTAVE_DEPRECATED (4.2, "use 'warn_empty_arg' instead") -OCTINTERP_API extern void -gripe_empty_arg (const char *name, bool is_error); - -OCTAVE_DEPRECATED (4.2, "use 'warn_implicit_conversion' instead") -OCTINTERP_API extern void -gripe_implicit_conversion (const char *id, const char *from, const char *to); - -OCTAVE_DEPRECATED (4.2, "use 'warn_implicit_conversion' instead") -OCTINTERP_API extern void -gripe_implicit_conversion (const std::string& id, const std::string& from, - const std::string& to); - -OCTAVE_DEPRECATED (4.2, "use 'err_indexed_cs_list' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_indexed_cs_list (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_invalid_conversion' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_invalid_conversion (const std::string& from, const std::string& to); - -OCTAVE_DEPRECATED (4.2, "use 'err_invalid_inquiry_subscript' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_invalid_inquiry_subscript (void); - -OCTAVE_DEPRECATED (4.2, "use 'warn_invalid_value_specified' instead") -OCTINTERP_API extern void -gripe_invalid_value_specified (const char *name); - -OCTAVE_DEPRECATED (4.2, "use 'warn_logical_conversion' instead") -OCTINTERP_API extern void -gripe_logical_conversion (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_nonbraced_cs_list_assignment' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_nonbraced_cs_list_assignment (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_nonconformant' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_nonconformant (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_nonconformant' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_nonconformant (octave_idx_type r1, octave_idx_type c1, - octave_idx_type r2, octave_idx_type c2); - -OCTAVE_DEPRECATED (4.2, "use 'err_not_implemented' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_not_implemented (const char *); - -// FIXME: DEPRECATED: Deprecated in 4.2, remove in 5.0 -OCTAVE_DEPRECATED (4.2, "use 'err_disabled_feature' or 'warn_disabled_feature' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_not_supported (const char *); - -OCTAVE_DEPRECATED (4.2, "use 'err_range_invalid' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_range_invalid (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_square_matrix_required' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_square_matrix_required (const char *name); - -OCTAVE_DEPRECATED (4.2, "use 'err_string_invalid' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_string_invalid (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_unrecognized_data_fmt' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_unrecognized_data_fmt (const char *warn_for); - -OCTAVE_DEPRECATED (4.2, "use 'err_unrecognized_float_fmt' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_unrecognized_float_fmt (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_user_returned_invalid' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_user_returned_invalid (const char *name); - -OCTAVE_DEPRECATED (4.2, "use 'err_user_supplied_eval' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_user_supplied_eval (const char *name); - -OCTAVE_DEPRECATED (4.2, "use 'err_user_supplied_eval' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_user_supplied_eval (octave::execution_exception& e, const char *name); - -OCTAVE_DEPRECATED (4.2, "use 'warn_complex_cmp' instead") -OCTINTERP_API extern void -gripe_warn_complex_cmp (void); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (const char *name, const char *s, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (octave::execution_exception& e, - const char *name, const char *s, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (const char *name, const std::string& s, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (octave::execution_exception& e, - const char *name, const std::string& s, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' or 'warn_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (const char *name, const octave_value& tc, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (octave::execution_exception& e, - const char *name, const octave_value& tc, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (const std::string& name, const octave_value& tc, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (octave::execution_exception& e, - const std::string& name, const octave_value& tc, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (const char *s, bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (octave::execution_exception& e, const char *s, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (const std::string& s, bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (octave::execution_exception& e, const std::string& s, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (const octave_value& tc, bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg' instead") -OCTINTERP_API extern void -gripe_wrong_type_arg (octave::execution_exception& e, const octave_value& tc, - bool is_error = true); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg_for_binary_op' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_wrong_type_arg_for_binary_op (const octave_value& op); - -OCTAVE_DEPRECATED (4.2, "use 'err_wrong_type_arg_for_unary_op' instead") -OCTAVE_NORETURN OCTINTERP_API extern void -gripe_wrong_type_arg_for_unary_op (const octave_value& op); - -#endif
--- a/libinterp/corefcn/module.mk Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/module.mk Wed Apr 11 00:43:54 2018 -0400 @@ -41,7 +41,6 @@ %reldir%/gl2ps-print.h \ %reldir%/graphics-handle.h \ %reldir%/graphics-toolkit.h \ - %reldir%/gripes.h \ %reldir%/gtk-manager.h \ %reldir%/help.h \ %reldir%/hook-fcn.h \ @@ -165,7 +164,6 @@ %reldir%/gl2ps-print.cc \ %reldir%/graphics-toolkit.cc \ %reldir%/graphics.cc \ - %reldir%/gripes.cc \ %reldir%/gsvd.cc \ %reldir%/gtk-manager.cc \ %reldir%/hash.cc \
--- a/libinterp/corefcn/mxarray.in.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/mxarray.in.h Wed Apr 11 00:43:54 2018 -0400 @@ -303,12 +303,6 @@ mxArray_base (const mxArray_base&) { } - OCTAVE_DEPRECATED (4.2, "use 'err_invalid_type' instead") - void invalid_type_error (void) const - { - error ("invalid type for operation"); - } - OCTAVE_NORETURN void err_invalid_type (void) const { error ("invalid type for operation");
--- a/libinterp/corefcn/oct.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/oct.h Wed Apr 11 00:43:54 2018 -0400 @@ -32,9 +32,6 @@ #include "defun-dld.h" #include "error.h" #include "errwarn.h" -// FIXME: gripes.h was deprecated in version 4.2 and will be removed -// in version 5. -#include "gripes.h" #include "help.h" #include "ovl.h" #include "pager.h"
--- a/libinterp/corefcn/sighandlers.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/sighandlers.h Wed Apr 11 00:43:54 2018 -0400 @@ -80,60 +80,4 @@ extern OCTINTERP_API bool Vdebug_on_interrupt; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::interrupt_handler' instead") -typedef octave::interrupt_handler octave_interrupt_handler; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sig_handler' instead") -typedef octave::sig_handler octave_sig_handler; - -OCTAVE_DEPRECATED (4.2, "use 'octave::pipe_handler_error_count' instead") -static auto& pipe_handler_error_count = octave::pipe_handler_error_count; - -OCTAVE_DEPRECATED (4.2, "use 'octave::can_interrupt' instead") -static auto& can_interrupt = octave::can_interrupt; - -OCTAVE_DEPRECATED (4.2, "use 'octave::set_signal_handler' instead") -inline octave::sig_handler * -octave_set_signal_handler (int sig, octave::sig_handler *handler, - bool restart_syscalls = true) -{ - return octave::set_signal_handler (sig, handler, restart_syscalls); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::set_signal_handler' instead") -inline octave::sig_handler * -octave_set_signal_handler (const char *signame, octave::sig_handler *handler, - bool restart_syscalls = true) -{ - return octave::set_signal_handler (signame, handler, restart_syscalls); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::set_signal_handler' instead") -const auto install_signal_handlers = octave::install_signal_handlers; - -OCTAVE_DEPRECATED (4.2, "use 'octave::respond_to_pending_signals' instead") -const auto octave_signal_handler = octave::respond_to_pending_signals; - -namespace octave -{ - OCTAVE_DEPRECATED (4.4, "use 'octave::respond_to_pending_signals' instead") - const auto signal_handler = respond_to_pending_signals; -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::interrupt_handler' instead") -const auto octave_catch_interrupts = octave::catch_interrupts; - -OCTAVE_DEPRECATED (4.2, "use 'octave::ignore_interrupts' instead") -const auto octave_ignore_interrupts = octave::ignore_interrupts; - -OCTAVE_DEPRECATED (4.2, "use 'octave::set_interrupt_handler' instead") -const auto octave_set_interrupt_handler = octave::set_interrupt_handler; - -OCTAVE_DEPRECATED (4.2, "use 'octave::Vdebug_on_interrupt' instead") -static auto& Vdebug_on_interrupt = octave::Vdebug_on_interrupt; - #endif - -#endif
--- a/libinterp/corefcn/utils.cc Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/utils.cc Wed Apr 11 00:43:54 2018 -0400 @@ -235,12 +235,6 @@ return status; } -int -empty_arg (const char * /* name */, octave_idx_type nr, octave_idx_type nc) -{ - return (nr == 0 || nc == 0); -} - // See if the given file is in the path. std::string @@ -539,80 +533,6 @@ return retval; } -// Deprecated in 4.2, remove in version 5. -// See if there is a .oct file in the path. -// If so, return the full path to the file. - -std::string -oct_file_in_path (const std::string& name) -{ - std::string retval; - - int len = name.length (); - - if (len > 0) - { - if (octave::sys::env::absolute_pathname (name)) - { - octave::sys::file_stat fs (name); - - if (fs.exists ()) - retval = name; - } - else if (len > 4 && name.find (".oct", len-5)) - { - octave::load_path& lp = octave::__get_load_path__ ("oct_file_in_path"); - - retval = lp.find_oct_file (name.substr (0, len-4)); - } - else - { - octave::load_path& lp = octave::__get_load_path__ ("oct_file_in_path"); - - retval = lp.find_oct_file (name); - } - } - - return retval; -} - -// Deprecated in 4.2, remove in version 5. -// See if there is a .mex file in the path. -// If so, return the full path to the file. - -std::string -mex_file_in_path (const std::string& name) -{ - std::string retval; - - int len = name.length (); - - if (len > 0) - { - if (octave::sys::env::absolute_pathname (name)) - { - octave::sys::file_stat fs (name); - - if (fs.exists ()) - retval = name; - } - else if (len > 4 && name.find (".mex", len-5)) - { - octave::load_path& lp = octave::__get_load_path__ ("mex_file_in_path"); - - retval = lp.find_mex_file (name.substr (0, len-4)); - } - else - { - octave::load_path& lp = octave::__get_load_path__ ("mex_file_in_path"); - - retval = lp.find_mex_file (name); - } - } - - return retval; -} - // Replace backslash escapes in a string with the real values. std::string
--- a/libinterp/corefcn/utils.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/corefcn/utils.h Wed Apr 11 00:43:54 2018 -0400 @@ -54,10 +54,6 @@ const std::string& s, int min_toks_to_match, int max_toks); -OCTAVE_DEPRECATED (4.2, "use 'octave_value::isempty' instead") -extern OCTINTERP_API int empty_arg (const char *name, octave_idx_type nr, - octave_idx_type nc); - extern OCTINTERP_API std::string search_path_for_file (const std::string&, const string_vector&); @@ -76,12 +72,6 @@ extern OCTINTERP_API std::string fcn_file_in_path (const std::string&); -OCTAVE_DEPRECATED (4.2, "use 'load_path::find_oct_file' instead") -extern OCTINTERP_API std::string oct_file_in_path (const std::string&); - -OCTAVE_DEPRECATED (4.2, "use 'load_path::find_mex_file' instead") -extern OCTINTERP_API std::string mex_file_in_path (const std::string&); - extern OCTINTERP_API std::string do_string_escapes (const std::string& s); extern OCTINTERP_API const char * undo_string_escape (char c);
--- a/libinterp/parse-tree/pt-unop.h Tue Feb 06 07:00:09 2018 +0100 +++ b/libinterp/parse-tree/pt-unop.h Wed Apr 11 00:43:54 2018 -0400 @@ -30,6 +30,7 @@ class octave_value; class octave_value_list; +#include "ov.h" #include "pt-exp.h" #include "pt-walk.h"
--- a/liboctave/numeric/lo-mappers.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/numeric/lo-mappers.h Wed Apr 11 00:43:54 2018 -0400 @@ -481,248 +481,6 @@ #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isna' instead") -inline bool octave_is_NA (double x) { return octave::math::isna (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isna' instead") -inline bool octave_is_NA (float x) { return octave::math::isna (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isna' instead") -inline bool octave_is_NA (const Complex& x) { return octave::math::isna (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isna' instead") -inline bool octave_is_NA (const FloatComplex& x) -{ - return octave::math::isna (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::acos' instead") -inline Complex acos (const Complex& x) { return octave::math::acos (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::acos' instead") -inline FloatComplex acos (const FloatComplex& x) -{ - return octave::math::acos (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::asin' instead") -inline Complex asin (const Complex& x) { return octave::math::asin (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::asin' instead") -inline FloatComplex asin (const FloatComplex& x) -{ - return octave::math::asin (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::atan' instead") -inline Complex atan (const Complex& x) { return octave::math::atan (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::atan' instead") -inline FloatComplex atan (const FloatComplex& x) -{ - return octave::math::atan (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'std::arg' instead") -inline double arg (double x) { return std::arg (x); } -OCTAVE_DEPRECATED (4.2, "use 'std::arg' instead") -inline float arg (float x) { return std::arg (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::conj' instead") -inline double conj (double x) { return x; } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::conj' instead") -inline float conj (float x) { return x; } - -OCTAVE_DEPRECATED (4.2, "use 'std::imag' instead") -inline double imag (double x) { return std::imag (x); } -OCTAVE_DEPRECATED (4.2, "use 'std::imag' instead") -inline float imag (float x) { return std::imag (x); } - -OCTAVE_DEPRECATED (4.2, "use 'std::real' instead") -inline double real (double x) { return std::real (x); } -OCTAVE_DEPRECATED (4.2, "use 'std::real' instead") -inline float real (float x) { return std::real (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline double xlog2 (double x) { return octave::math::log2 (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline float xlog2 (float x) { return octave::math::log2 (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline Complex xlog2 (const Complex& x) { return octave::math::log2 (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline FloatComplex xlog2 (const FloatComplex& x) -{ - return octave::math::log2 (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline double xlog2 (double x, int& exp) -{ - return octave::math::log2 (x, exp); -} -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline float xlog2 (float x, int& exp) { return octave::math::log2 (x, exp); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline Complex xlog2 (const Complex& x, int& exp) -{ - return octave::math::log2 (x, exp); -} -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log2' instead") -inline FloatComplex xlog2 (const FloatComplex& x, int& exp) -{ - return octave::math::log2 (x, exp); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::exp2' instead") -inline double xexp2 (double x) { return octave::math::exp2 (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::exp2' instead") -inline float xexp2 (float x) { return octave::math::exp2 (x); } - -OCTAVE_DEPRECATED (4.2, "use 'std::ceil' instead") -inline double xceil (double x) { return std::ceil (x); } -OCTAVE_DEPRECATED (4.2, "use 'std::ceil' instead") -inline float xceil (float x) { return std::ceil (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::ceil' instead") -std::complex<T> -ceil (const std::complex<T>& x) -{ - return octave::math::ceil (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::copysign' instead") -inline double xcopysign (double x, double y) -{ - return octave::math::copysign (x, y); -} -OCTAVE_DEPRECATED (4.2, "use 'octave::math::copysign' instead") -inline float xcopysign (float x, float y) -{ - return octave::math::copysign (x, y); -} - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::signbit' instead") -T -xsignbit (T x) -{ - return octave::math::signbit (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::negative_sign' instead") -inline bool xnegative_sign (double x) -{ - return octave::math::negative_sign (x); -} -OCTAVE_DEPRECATED (4.2, "use 'octave::math::negative_sign' instead") -inline bool xnegative_sign (float x) -{ - return octave::math::negative_sign (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::positive_sign' instead") -inline bool xpositive_sign (double x) -{ - return octave::math::positive_sign (x); -} -OCTAVE_DEPRECATED (4.2, "use 'octave::math::positive_sign' instead") -inline bool xpositive_sign (float x) -{ - return octave::math::positive_sign (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::signum' instead") -inline double signum (double x) { return octave::math::signum (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::signum' instead") -inline float signum (float x) { return octave::math::signum (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::signum' instead") -std::complex<T> -signum (const std::complex<T>& x) -{ - return octave::math::signum (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'std::trunc' instead") -inline double xtrunc (double x) { return std::trunc (x); } -OCTAVE_DEPRECATED (4.2, "use 'std::trunc' instead") -inline float xtrunc (float x) { return std::trunc (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::trunc' instead") -std::complex<T> -xtrunc (const std::complex<T>& x) -{ - return octave::math::trunc (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::fix' instead") -inline double fix (double x) { return octave::math::fix (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::fix' instead") -inline float fix (float x) { return octave::math::fix (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::fix' instead") -std::complex<T> -fix (const std::complex<T>& x) -{ - return octave::math::fix (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'std::floor' instead") -inline double xfloor (double x) { return std::floor (x); } -OCTAVE_DEPRECATED (4.2, "use 'std::floor' instead") -inline float xfloor (float x) { return std::floor (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::floor' instead") -std::complex<T> -floor (const std::complex<T>& x) -{ - return octave::math::floor (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::round' instead") -inline double xround (double x) { return octave::math::round (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::round' instead") -inline float xround (float x) { return octave::math::round (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::round' instead") -std::complex<T> -xround (const std::complex<T>& x) -{ - return octave::math::round (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::roundb' instead") -inline double xroundb (double x) { return octave::math::roundb (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::roundb' instead") -inline float xroundb (float x) { return octave::math::roundb (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::roundb' instead") -std::complex<T> -xroundb (const std::complex<T>& x) -{ - return octave::math::roundb (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isnan' instead") -inline bool xisnan (bool x) { return octave::math::isnan (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isnan' instead") -inline bool xisnan (char x) { return octave::math::isnan (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isnan' instead") -inline bool xisnan (double x) { return octave::math::isnan (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isnan' instead") -inline bool xisnan (float x) { return octave::math::isnan (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isnan' instead") -bool -xisnan (const std::complex<T>& x) -{ - return octave::math::isnan (x); -} - OCTAVE_DEPRECATED (4.4, "use 'octave::math::isfinite' instead") inline bool xfinite (double x) { return octave::math::isfinite (x); } OCTAVE_DEPRECATED (4.4, "use 'octave::math::isfinite' instead") @@ -736,187 +494,6 @@ return octave::math::isfinite (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isinf' instead") -inline bool xisinf (double x) { return octave::math::isinf (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isinf' instead") -inline bool xisinf (float x) { return octave::math::isinf (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isinf' instead") -bool -xisinf (const std::complex<T>& x) -{ - return octave::math::isinf (x); -} - -// Some useful tests, that are commonly repeated. -// Test for a finite integer. - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isinteger' instead") -inline bool -xisinteger (double x) -{ - return octave::math::isinteger (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isinteger' instead") -inline bool -xisinteger (float x) -{ - return octave::math::isinteger (x); -} - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::x_nint' instead") -T -X_NINT (T x) -{ - return octave::math::x_nint (x); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::x_nint (x)' instead") -inline double D_NINT (double x) { return octave::math::x_nint (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::x_nint (x)' instead") -inline float F_NINT (float x) { return octave::math::x_nint (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::nint_big' instead") -inline octave_idx_type NINTbig (double x) { return octave::math::nint_big (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::nint_big' instead") -inline octave_idx_type NINTbig (float x) { return octave::math::nint_big (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::nint' instead") -inline int NINT (double x) { return octave::math::nint (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::nint' instead") -inline int NINT (float x) { return octave::math::nint (x); } - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::mod' instead") -T -xmod (T x, T y) -{ - return octave::math::mod (x, y); -} - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rem' instead") -T -xrem (T x, T y) -{ - return octave::math::rem (x, y); -} - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::min' instead") -T -xmin (T x, T y) -{ - return octave::math::min (x, y); -} - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::max' instead") -T -xmax (T x, T y) -{ - return octave::math::max (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::min' instead") -inline double -xmin (double x, double y) -{ - return octave::math::min (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::max' instead") -inline double -xmax (double x, double y) -{ - return octave::math::max (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::min' instead") -inline float -xmin (float x, float y) -{ - return octave::math::min (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::max' instead") -inline float -xmax (float x, float y) -{ - return octave::math::max (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::min' instead") -inline Complex -xmin (const Complex& x, const Complex& y) -{ - return octave::math::min (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::max' instead") -inline Complex -xmax (const Complex& x, const Complex& y) -{ - return octave::math::max (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::min' instead") -inline OCTAVE_API FloatComplex -xmin (const FloatComplex& x, const FloatComplex& y) -{ - return octave::math::min (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::max' instead") -inline FloatComplex -xmax (const FloatComplex& x, const FloatComplex& y) -{ - return octave::math::max (x, y); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_acos' instead") -inline Complex rc_acos (double x) { return octave::math::rc_acos (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_acos' instead") -inline FloatComplex rc_acos (float x) { return octave::math::rc_acos (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_acosh' instead") -inline Complex rc_acosh (double x) { return octave::math::rc_acosh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_acosh' instead") -inline FloatComplex rc_acosh (float x) { return octave::math::rc_acosh (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_asin' instead") -inline Complex rc_asin (double x) { return octave::math::rc_asin (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_asin' instead") -inline FloatComplex rc_asin (float x) { return octave::math::rc_asin (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_atanh' instead") -inline Complex rc_atanh (double x) { return octave::math::rc_atanh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_atanh' instead") -inline FloatComplex rc_atanh (float x) { return octave::math::rc_atanh (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log' instead") -inline Complex rc_log (double x) { return octave::math::rc_log (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log' instead") -inline FloatComplex rc_log (float x) { return octave::math::rc_log (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log2' instead") -inline Complex rc_log2 (double x) { return octave::math::rc_log2 (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log2' instead") -inline FloatComplex rc_log2 (float x) { return octave::math::rc_log2 (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log10' instead") -inline Complex rc_log10 (double x) { return octave::math::rc_log10 (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log10' instead") -inline FloatComplex rc_log10 (float x) { return octave::math::rc_log10 (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_sqrt' instead") -inline Complex rc_sqrt (double x) { return octave::math::rc_sqrt (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_sqrt' instead") -inline FloatComplex rc_sqrt (float x) { return octave::math::rc_sqrt (x); } - #endif #endif
--- a/liboctave/numeric/lo-specfun.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/numeric/lo-specfun.h Wed Apr 11 00:43:54 2018 -0400 @@ -397,484 +397,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::acosh' instead") -inline double xacosh (double x) { return octave::math::acosh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::acosh' instead") -inline float xacosh (float x) { return octave::math::acosh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::acosh' instead") -inline Complex xacosh (const Complex& x) { return octave::math::acosh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::acosh' instead") -inline FloatComplex xacosh (const FloatComplex& x) { return octave::math::acosh (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::asinh' instead") -inline double xasinh (double x) { return octave::math::asinh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::asinh' instead") -inline float xasinh (float x) { return octave::math::asinh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::asinh' instead") -inline Complex xasinh (const Complex& x) { return octave::math::asinh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::asinh' instead") -inline FloatComplex xasinh (const FloatComplex& x) { return octave::math::asinh (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::atanh' instead") -inline double xatanh (double x) { return octave::math::atanh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::atanh' instead") -inline float xatanh (float x) { return octave::math::atanh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::atanh' instead") -inline Complex xatanh (const Complex& x) { return octave::math::atanh (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::atanh' instead") -inline FloatComplex xatanh (const FloatComplex& x) { return octave::math::atanh (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erf' instead") -inline double xerf (double x) { return octave::math::erf (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erf' instead") -inline float xerf (float x) { return octave::math::erf (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erf' instead") -inline Complex xerf (const Complex& x) { return octave::math::erf (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erf' instead") -inline FloatComplex xerf (const FloatComplex& x) { return octave::math::erf (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfc' instead") -inline double xerfc (double x) { return octave::math::erfc (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfc' instead") -inline float xerfc (float x) { return octave::math::erfc (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfc' instead") -inline Complex xerfc (const Complex& x) { return octave::math::erfc (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfc' instead") -inline FloatComplex xerfc (const FloatComplex& x) { return octave::math::erfc (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::expm1' instead") -inline double xexpm1 (double x) { return octave::math::expm1 (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::expm1' instead") -inline Complex xexpm1 (const Complex& x) { return octave::math::expm1 (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::expm1' instead") -inline float xexpm1 (float x) { return octave::math::expm1 (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::expm1' instead") -inline FloatComplex xexpm1 (const FloatComplex& x) { return octave::math::expm1 (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log1p' instead") -inline double xlog1p (double x) { return octave::math::log1p (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log1p' instead") -inline Complex xlog1p (const Complex& x) { return octave::math::log1p (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log1p' instead") -inline float xlog1p (float x) { return octave::math::log1p (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::log1p' instead") -inline FloatComplex xlog1p (const FloatComplex& x) { return octave::math::log1p (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::cbrt' instead") -inline double xcbrt (double x) { return octave::math::cbrt (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::cbrt' instead") -inline float xcbrt (float x) { return octave::math::cbrt (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gamma' instead") -inline double xgamma (double x) { return octave::math::gamma (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::lgamma' instead") -inline double xlgamma (double x) { return octave::math::lgamma (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_lgamma' instead") -inline Complex rc_lgamma (double x) { return octave::math::rc_lgamma (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gamma' instead") -inline float xgamma (float x) { return octave::math::gamma (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::lgamma' instead") -inline float xlgamma (float x) { return octave::math::lgamma (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_lgamma' instead") -inline FloatComplex rc_lgamma (float x) { return octave::math::rc_lgamma (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -inline Complex besselj (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselj (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -inline Complex bessely (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr) { return octave::math::bessely (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -inline Complex besseli (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besseli (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -inline Complex besselk (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselk (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -inline Complex besselh1 (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselh1 (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -inline Complex besselh2 (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselh2 (alpha, x, scaled, ierr); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API ComplexMatrix besselj (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API ComplexMatrix bessely (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API ComplexMatrix besseli (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API ComplexMatrix besselk (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API ComplexMatrix besselh1 (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API ComplexMatrix besselh2 (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API ComplexMatrix besselj (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API ComplexMatrix bessely (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API ComplexMatrix besseli (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API ComplexMatrix besselk (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API ComplexMatrix besselh1 (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API ComplexMatrix besselh2 (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API ComplexMatrix besselj (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API ComplexMatrix bessely (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API ComplexMatrix besseli (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API ComplexMatrix besselk (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API ComplexMatrix besselh1 (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API ComplexMatrix besselh2 (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API ComplexNDArray besselj (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API ComplexNDArray bessely (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API ComplexNDArray besseli (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API ComplexNDArray besselk (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API ComplexNDArray besselh1 (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API ComplexNDArray besselh2 (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API ComplexMatrix besselj (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API ComplexMatrix bessely (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API ComplexMatrix besseli (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API ComplexMatrix besselk (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API ComplexMatrix besselh1 (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API ComplexMatrix besselh2 (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -inline FloatComplex besselj (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselj (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octavh::bessely' instead") -inline FloatComplex bessely (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr) { return octave::math::bessely (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octavh::besseli' instead") -inline FloatComplex besseli (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besseli (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octavh::besselk' instead") -inline FloatComplex besselk (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselk (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octavh::besselh1' instead") -inline FloatComplex besselh1 (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselh1 (alpha, x, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octavh::besselh2' instead") -inline FloatComplex besselh2 (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr) { return octave::math::besselh2 (alpha, x, scaled, ierr); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API FloatComplexMatrix besselj (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API FloatComplexMatrix bessely (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API FloatComplexMatrix besseli (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API FloatComplexMatrix besselk (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API FloatComplexMatrix besselh1 (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API FloatComplexMatrix besselh2 (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API FloatComplexMatrix besselj (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API FloatComplexMatrix bessely (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API FloatComplexMatrix besseli (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API FloatComplexMatrix besselk (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API FloatComplexMatrix besselj (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API FloatComplexMatrix bessely (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API FloatComplexMatrix besseli (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API FloatComplexMatrix besselk (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API FloatComplexNDArray besselj (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API FloatComplexNDArray bessely (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API FloatComplexNDArray besseli (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API FloatComplexNDArray besselk (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API FloatComplexNDArray besselh1 (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API FloatComplexNDArray besselh2 (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselj' instead") -extern OCTAVE_API FloatComplexMatrix besselj (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::bessely' instead") -extern OCTAVE_API FloatComplexMatrix bessely (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besseli' instead") -extern OCTAVE_API FloatComplexMatrix besseli (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselk' instead") -extern OCTAVE_API FloatComplexMatrix besselk (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh1' instead") -extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::besselh2' instead") -extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::airy' instead") -inline Complex airy (const Complex& z, bool deriv, bool scaled, octave_idx_type& ierr) { return octave::math::airy (z, deriv, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::biry' instead") -inline Complex biry (const Complex& z, bool deriv, bool scaled, octave_idx_type& ierr) { return octave::math::biry (z, deriv, scaled, ierr); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::airy' instead") -extern OCTAVE_API ComplexMatrix airy (const ComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::biry' instead") -extern OCTAVE_API ComplexMatrix biry (const ComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::airy' instead") -extern OCTAVE_API ComplexNDArray airy (const ComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::biry' instead") -extern OCTAVE_API ComplexNDArray biry (const ComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::airy' instead") -inline FloatComplex airy (const FloatComplex& z, bool deriv, bool scaled, octave_idx_type& ierr) { return octave::math::airy (z, deriv, scaled, ierr); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::biry' instead") -inline FloatComplex biry (const FloatComplex& z, bool deriv, bool scaled, octave_idx_type& ierr) { return octave::math::biry (z, deriv, scaled, ierr); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::airy' instead") -extern OCTAVE_API FloatComplexMatrix airy (const FloatComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::biry' instead") -extern OCTAVE_API FloatComplexMatrix biry (const FloatComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::airy' instead") -extern OCTAVE_API FloatComplexNDArray airy (const FloatComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::biry' instead") -extern OCTAVE_API FloatComplexNDArray biry (const FloatComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -inline double gammainc (double x, double a, bool& err) { return octave::math::gammainc (x, a, err); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -inline double gammainc (double x, double a) { return octave::math::gammainc (x, a); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -extern OCTAVE_API Matrix gammainc (double x, const Matrix& a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -extern OCTAVE_API Matrix gammainc (const Matrix& x, double a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -extern OCTAVE_API Matrix gammainc (const Matrix& x, const Matrix& a); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -extern OCTAVE_API NDArray gammainc (double x, const NDArray& a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -extern OCTAVE_API NDArray gammainc (const NDArray& x, double a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -extern OCTAVE_API NDArray gammainc (const NDArray& x, const NDArray& a); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -inline float gammainc (float x, float a, bool& err) { return octave::math::gammainc (x, a, err); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::gammainc' instead") -inline float gammainc (float x, float a) { return octave::math::gammainc (x, a); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -extern OCTAVE_API FloatMatrix gammainc (float x, const FloatMatrix& a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -extern OCTAVE_API FloatMatrix gammainc (const FloatMatrix& x, float a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -extern OCTAVE_API FloatMatrix gammainc (const FloatMatrix& x, const FloatMatrix& a); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -extern OCTAVE_API FloatNDArray gammainc (float x, const FloatNDArray& a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -extern OCTAVE_API FloatNDArray gammainc (const FloatNDArray& x, float a); -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -extern OCTAVE_API FloatNDArray gammainc (const FloatNDArray& x, const FloatNDArray& a); - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -inline Complex rc_log1p (double x) { return octave::math::rc_log1p (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::rc_log1p' instead") -inline FloatComplex rc_log1p (float x) { return octave::math::rc_log1p (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfinv' instead") -inline double erfinv (double x) { return octave::math::erfinv (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfinv' instead") -inline float erfinv (float x) { return octave::math::erfinv (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfcinv' instead") -inline double erfcinv (double x) { return octave::math::erfcinv (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfcinv' instead") -inline float erfcinv (float x) { return octave::math::erfcinv (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfcx' instead") -inline float erfcx (float x) { return octave::math::erfcx (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfcx' instead") -inline double erfcx (double x) { return octave::math::erfcx (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfcx' instead") -inline Complex erfcx (const Complex& x) { return octave::math::erfcx (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfcx' instead") -inline FloatComplex erfcx (const FloatComplex& x) { return octave::math::erfcx (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfi' instead") -inline float erfi (float x) { return octave::math::erfi (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfi' instead") -inline double erfi (double x) { return octave::math::erfi (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfi' instead") -inline Complex erfi (const Complex& x) { return octave::math::erfi (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::erfi' instead") -inline FloatComplex erfi (const FloatComplex& x) { return octave::math::erfi (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::dawson' instead") -inline float dawson (float x) { return octave::math::dawson (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::dawson' instead") -inline double dawson (double x) { return octave::math::dawson (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::dawson' instead") -inline Complex dawson (const Complex& x) { return octave::math::dawson (x); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::dawson' instead") -inline FloatComplex dawson (const FloatComplex& x) { return octave::math::dawson (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::ellipj' instead") -inline void ellipj (double u, double m, double& sn, double& cn, double& dn, double& err) { octave::math::ellipj (u, m, sn, cn, dn, err); } -OCTAVE_DEPRECATED (4.2, "use 'octave::math::ellipj' instead") -inline void ellipj (const Complex& u, double m, Complex& sn, Complex& cn, Complex& dn, double& err) { octave::math::ellipj (u, m, sn, cn, dn, err); } - -//! Digamma function. -//! -//! Only defined for double and float. -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::psi' instead") -T -psi (T z); - -template <> -inline double -psi (double z) -{ - return octave::math::psi (z); -} - -template <> -inline float -psi (float z) -{ - return octave::math::psi (z); -} - -//! Digamma function for complex input. -//! -//! Only defined for double and float. -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::psi' instead") -std::complex<T> -psi (const std::complex<T>& z); - -template <> -inline std::complex<double> -psi (const std::complex<double>& z) -{ - return octave::math::psi (z); -} - -template <> -inline std::complex<float> -psi (const std::complex<float>& z) -{ - return octave::math::psi (z); -} - -//! Polygamma function. -//! -//! Only defined for double and float. -//! @param n must be non-negative. If zero, the digamma function is computed. -//! @param z must be real and non-negative. -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::psi' instead") -T -psi (octave_idx_type n, T z); - -template<> -inline double -psi (octave_idx_type n, double z) -{ - return octave::math::psi (n, z); -} - -template<> -inline float -psi (octave_idx_type n, float z) -{ - return octave::math::psi (n, z); -} - #endif - -#endif
--- a/liboctave/numeric/sparse-chol.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/numeric/sparse-chol.h Wed Apr 11 00:43:54 2018 -0400 @@ -27,6 +27,8 @@ #include "octave-config.h" +#include "CSparse.h" + class RowVector; class SparseMatrix; class SparseComplexMatrix;
--- a/liboctave/numeric/sparse-qr.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/numeric/sparse-qr.h Wed Apr 11 00:43:54 2018 -0400 @@ -26,6 +26,8 @@ #include "octave-config.h" +#include "oct-cmplx.h" + class Matrix; class ComplexMatrix; class SparseComplexMatrix;
--- a/liboctave/system/dir-ops.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/dir-ops.h Wed Apr 11 00:43:54 2018 -0400 @@ -97,11 +97,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::dir_entry' instead") -typedef octave::sys::dir_entry dir_entry; - #endif - -#endif
--- a/liboctave/system/file-ops.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/file-ops.h Wed Apr 11 00:43:54 2018 -0400 @@ -181,172 +181,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::mkdir' instead") -inline int -octave_mkdir (const std::string& nm, mode_t md) -{ - return octave::sys::mkdir (nm, md); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::mkdir' instead") -inline int -octave_mkdir (const std::string& nm, mode_t md, std::string& msg) -{ - return octave::sys::mkdir (nm, md, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::mkfifo' instead") -inline int -octave_mkfifo (const std::string& nm, mode_t md) -{ - return octave::sys::mkfifo (nm, md); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::mkfifo' instead") -inline int -octave_mkfifo (const std::string& nm, mode_t md, std::string& msg) -{ - return octave::sys::mkfifo (nm, md, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::link' instead") -inline int -octave_link (const std::string& old_name, const std::string& new_name) -{ - return octave::sys::link (old_name, new_name); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::link' instead") -inline int -octave_link (const std::string& old_name, const std::string& new_name, - std::string& msg) -{ - return octave::sys::link (old_name, new_name, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::symlink' instead") -inline int -octave_symlink (const std::string& old_name, const std::string& new_name) -{ - return octave::sys::symlink (old_name, new_name); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::symlink' instead") -inline int -octave_symlink (const std::string& old_name, const std::string& new_name, - std::string& msg) -{ - return octave::sys::symlink (old_name, new_name, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::readlink' instead") -inline int -octave_readlink (const std::string& path, std::string& result) -{ - return octave::sys::readlink (path, result); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::readlink' instead") -inline int -octave_readlink (const std::string& path, std::string& result, std::string& msg) -{ - return octave::sys::readlink (path, result, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::rename' instead") -inline int -octave_rename (const std::string& from, const std::string& to) -{ - return octave::sys::rename (from, to); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::rename' instead") -inline int -octave_rename (const std::string& from, const std::string& to, std::string& msg) -{ - return octave::sys::rename (from, to, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::rmdir' instead") -inline int -octave_rmdir (const std::string& nm) -{ - return octave::sys::rmdir (nm); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::rmdir' instead") -inline int -octave_rmdir (const std::string& nm, std::string& msg) -{ - return octave::sys::rmdir (nm, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::recursive_rmdir' instead") -inline int -octave_recursive_rmdir (const std::string& nm) -{ - return octave::sys::recursive_rmdir (nm); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::recursive_rmdir' instead") -inline int -octave_recursive_rmdir (const std::string& nm, std::string& msg) -{ - return octave::sys::recursive_rmdir (nm, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::umask' instead") -inline int -octave_umask (mode_t md) -{ - return octave::sys::umask (md); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::unlink' instead") -inline int -octave_unlink (const std::string& nm) -{ - return octave::sys::unlink (nm); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::unlink' instead") -inline int -octave_unlink (const std::string& nm, std::string& msg) -{ - return octave::sys::unlink (nm, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::tempnam' instead") -inline std::string -octave_tempnam (const std::string& dir, const std::string& pfx) -{ - return octave::sys::tempnam (dir, pfx); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::tempnam' instead") -inline std::string -octave_tempnam (const std::string& dir, const std::string& pfx, - std::string& msg) -{ - return octave::sys::tempnam (dir, pfx, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::canonicalize_file_name' instead") -inline std::string -octave_canonicalize_file_name (const std::string& nm) -{ - return octave::sys::canonicalize_file_name (nm); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::canonicalize_file_name' instead") -inline std::string -octave_canonicalize_file_name (const std::string& nm, std::string& msg) -{ - return octave::sys::canonicalize_file_name (nm, msg); -} - #endif - -#endif
--- a/liboctave/system/file-stat.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/file-stat.h Wed Apr 11 00:43:54 2018 -0400 @@ -322,17 +322,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::base_file_stat' instead") -typedef octave::sys::base_file_stat base_file_stat; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::file_stat' instead") -typedef octave::sys::file_stat file_stat; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::file_fstat' instead") -typedef octave::sys::file_fstat file_fstat; - #endif - -#endif
--- a/liboctave/system/lo-sysdep.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/lo-sysdep.h Wed Apr 11 00:43:54 2018 -0400 @@ -43,14 +43,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::getcwd' instead") -const auto octave_getcwd = octave::sys::getcwd; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::chdir' instead") -const auto octave_chdir = octave::sys::chdir; - #endif - -#endif
--- a/liboctave/system/oct-env.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/oct-env.h Wed Apr 11 00:43:54 2018 -0400 @@ -150,11 +150,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::env' instead") -typedef octave::sys::env octave_env; - #endif - -#endif
--- a/liboctave/system/oct-group.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/oct-group.h Wed Apr 11 00:43:54 2018 -0400 @@ -115,11 +115,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::group' instead") -typedef octave::sys::group octave_group; - #endif - -#endif
--- a/liboctave/system/oct-passwd.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/oct-passwd.h Wed Apr 11 00:43:54 2018 -0400 @@ -135,11 +135,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::password' instead") -typedef octave::sys::password octave_passwd; - #endif - -#endif
--- a/liboctave/system/oct-syscalls.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/oct-syscalls.h Wed Apr 11 00:43:54 2018 -0400 @@ -103,33 +103,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::popen2' instead") -inline pid_t -octave_popen2 (const std::string& cmd, const string_vector& args, - bool sync_mode, int *filedes) -{ - return octave::sys::popen2 (cmd, args, sync_mode, filedes); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::popen2' instead") -inline pid_t -popen2 (const std::string& cmd, const string_vector& args, - bool sync_mode, int *filedes, std::string& msg) -{ - return octave::sys::popen2 (cmd, args, sync_mode, filedes, msg); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::popen2' instead") -inline pid_t -popen2 (const std::string& cmd, const string_vector& args, - bool sync_mode, int *filedes, std::string& msg, - bool &/*interactive*/) -{ - return octave::sys::popen2 (cmd, args, sync_mode, filedes, msg); -} - #endif - -#endif
--- a/liboctave/system/oct-time.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/oct-time.h Wed Apr 11 00:43:54 2018 -0400 @@ -536,23 +536,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::time' instead") -typedef octave::sys::time octave_time; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::base_tm' instead") -typedef octave::sys::base_tm octave_base_tm; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::localtime' instead") -typedef octave::sys::localtime octave_localtime; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::gmtime' instead") -typedef octave::sys::gmtime octave_gmtime; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::strptime' instead") -typedef octave::sys::strptime octave_strptime; - #endif - -#endif
--- a/liboctave/system/oct-uname.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/system/oct-uname.h Wed Apr 11 00:43:54 2018 -0400 @@ -94,11 +94,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::uname' instead") -typedef octave::sys::uname octave_uname; - #endif - -#endif
--- a/liboctave/util/cmd-edit.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/cmd-edit.h Wed Apr 11 00:43:54 2018 -0400 @@ -371,11 +371,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::command_editor' instead") -typedef octave::command_editor command_editor; - #endif - -#endif
--- a/liboctave/util/cmd-hist.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/cmd-hist.h Wed Apr 11 00:43:54 2018 -0400 @@ -233,11 +233,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::command_history' instead") -typedef octave::command_history command_history; - #endif - -#endif
--- a/liboctave/util/lo-array-errwarn.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/lo-array-errwarn.h Wed Apr 11 00:43:54 2018 -0400 @@ -157,111 +157,4 @@ warn_singular_matrix (double rcond = 0.0); } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nan_to_logical_conversion' instead") -OCTAVE_NORETURN inline void -err_nan_to_logical_conversion (void) -{ - octave::err_nan_to_logical_conversion (); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nan_to_character_conversion' instead") -OCTAVE_NORETURN inline void -err_nan_to_character_conversion (void) -{ - octave::err_nan_to_character_conversion (); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nonconformant' instead") -OCTAVE_NORETURN inline void -err_nonconformant (const char *op, octave_idx_type op1_len, - octave_idx_type op2_len) -{ - octave::err_nonconformant (op, op1_len, op2_len); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nonconformant' instead") -OCTAVE_NORETURN inline void -err_nonconformant (const char *op, - octave_idx_type op1_nr, octave_idx_type op1_nc, - octave_idx_type op2_nr, octave_idx_type op2_nc) -{ - octave::err_nonconformant (op, op1_nr, op1_nc, op2_nr, op2_nc); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nonconformant' instead") -OCTAVE_NORETURN inline void -err_nonconformant (const char *op, - const dim_vector& op1_dims, const dim_vector& op2_dims) -{ - octave::err_nonconformant (op, op1_dims, op2_dims); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_index_out_of_range' instead") -OCTAVE_NORETURN inline void -err_index_out_of_range (int nd, int dim, octave_idx_type iext, - octave_idx_type ext, const dim_vector& d) -{ - octave::err_index_out_of_range (nd, dim, iext, ext, d); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_index_out_of_range' instead") -OCTAVE_NORETURN inline void -err_index_out_of_range (int nd, int dim, octave_idx_type iext, - octave_idx_type ext) -{ - octave::err_index_out_of_range (nd, dim, iext, ext); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_del_index_out_of_range' instead") -OCTAVE_NORETURN inline void -err_del_index_out_of_range (bool is1d, octave_idx_type iext, - octave_idx_type ext) -{ - octave::err_del_index_out_of_range (is1d, iext, ext); -} - -OCTAVE_NORETURN inline void -err_invalid_index (double n, octave_idx_type nd = 0, - octave_idx_type dim = 0, - const std::string& var = "") -{ - octave::err_invalid_index (n, nd, dim, var); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_invalid_index' instead") -OCTAVE_NORETURN inline void -err_invalid_index (octave_idx_type n, octave_idx_type nd = 0, - octave_idx_type dim = 0, - const std::string& var = "") -{ - octave::err_invalid_index (n, nd, dim, var); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_invalid_index' instead") -OCTAVE_NORETURN inline void -err_invalid_index (const std::string& idx, octave_idx_type nd = 0, - octave_idx_type dim = 0, - const std::string& var = "") -{ - octave::err_invalid_index (idx, nd, dim, var); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_invalid_resize' instead") -OCTAVE_NORETURN inline void -err_invalid_resize (void) -{ - octave::err_invalid_resize (); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::warn_singular_matrix' instead") -inline void -warn_singular_matrix (double rcond = 0.0) -{ - return octave::warn_singular_matrix (rcond); -} - #endif - -#endif
--- a/liboctave/util/lo-array-gripes.cc Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,299 +0,0 @@ -/* - -Copyright (C) 2003-2018 John W. Eaton -Copyright (C) 2009 VZLU Prague - -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/>. - -*/ - -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in -// version 5. - -#if defined (HAVE_CONFIG_H) -# include "config.h" -#endif - -#include <sstream> - -#include "lo-array-gripes.h" -#include "lo-error.h" - -// Text constants used to shorten code below. -static const char *error_id_nonconformant_args = "Octave:nonconformant-args"; - -static const char *error_id_index_out_of_bounds = "Octave:index-out-of-bounds"; - -static const char *error_id_invalid_index = "Octave:invalid-index"; - -static const char *warning_id_nearly_singular_matrix = - "Octave:nearly-singular-matrix"; - -static const char *warning_id_singular_matrix = "Octave:singular-matrix"; - -void -gripe_nan_to_logical_conversion (void) -{ - (*current_liboctave_error_handler) - ("invalid conversion from NaN to logical"); -} - -void -gripe_nan_to_character_conversion (void) -{ - (*current_liboctave_error_handler) - ("invalid conversion from NaN to character"); -} - -void -gripe_nonconformant (const char *op, octave_idx_type op1_len, - octave_idx_type op2_len) -{ - const char *err_id = error_id_nonconformant_args; - - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 len: %d, op2 len: %d)", - op, op1_len, op2_len); -} - -void -gripe_nonconformant (const char *op, - octave_idx_type op1_nr, octave_idx_type op1_nc, - octave_idx_type op2_nr, octave_idx_type op2_nc) -{ - const char *err_id = error_id_nonconformant_args; - - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 is %dx%d, op2 is %dx%d)", - op, op1_nr, op1_nc, op2_nr, op2_nc); -} - -void -gripe_nonconformant (const char *op, const dim_vector& op1_dims, - const dim_vector& op2_dims) -{ - const char *err_id = error_id_nonconformant_args; - - std::string op1_dims_str = op1_dims.str (); - std::string op2_dims_str = op2_dims.str (); - - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", - op, op1_dims_str.c_str (), op2_dims_str.c_str ()); -} - -void -gripe_del_index_out_of_range (bool is1d, octave_idx_type idx, - octave_idx_type ext) -{ - const char *err_id = error_id_index_out_of_bounds; - - (*current_liboctave_error_with_id_handler) - (err_id, "A(%s) = []: index out of bounds: value %d out of bound %d", - is1d ? "I" : "..,I,..", idx, ext); -} - -namespace octave -{ - class invalid_index : public index_exception - { - public: - - invalid_index (const std::string& value, octave_idx_type ndim, - octave_idx_type dimen) - : index_exception (value, ndim, dimen) - { } - - std::string details (void) const - { -#if defined (OCTAVE_ENABLE_64) - return "subscripts must be either integers 1 to (2^63)-1 or logicals"; -#else - return "subscripts must be either integers 1 to (2^31)-1 or logicals"; -#endif - } - - // ID of error to throw - const char * err_id (void) const - { - return error_id_invalid_index; - } - }; -} - -// Complain if an index is negative, fractional, or too big. - -void -gripe_invalid_index (const std::string& idx, octave_idx_type nd, - octave_idx_type dim, const std::string&) -{ - octave::invalid_index e (idx, nd, dim); - - throw e; -} - -void -gripe_invalid_index (octave_idx_type n, octave_idx_type nd, - octave_idx_type dim, const std::string& var) -{ - std::ostringstream buf; - buf << n + 1; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_invalid_index (buf.str (), nd, dim, var); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -void -gripe_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, - const std::string& var) -{ - std::ostringstream buf; - buf << n + 1; - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - - gripe_invalid_index (buf.str (), nd, dim, var); - -#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -# pragma GCC diagnostic pop -#endif -} - -namespace octave -{ - // Gripe and exception for read access beyond the bounds of an array. - - class out_of_range : public index_exception - { - public: - - out_of_range (const std::string& value, octave_idx_type nd_in, - octave_idx_type dim_in) - : index_exception (value, nd_in, dim_in), extent (0) - { } - - std::string details (void) const - { - std::string expl; - - if (nd >= size.ndims ()) // if not an index slice - { - if (var != "") - expl = "but " + var + " has size "; - else - expl = "but object has size "; - - expl = expl + size.str ('x'); - } - else - { - std::ostringstream buf; - buf << extent; - expl = "out of bound " + buf.str (); - } - - return expl; - } - - // ID of error to throw. - const char * err_id (void) const - { - return error_id_index_out_of_bounds; - } - - void set_size (const dim_vector& size_in) { size = size_in; } - - void set_extent (octave_idx_type ext) { extent = ext; } - - private: - - // Dimension of object being accessed. - dim_vector size; - - // Length of dimension being accessed. - octave_idx_type extent; - }; -} - -// Complain of an index that is out of range, but we don't know matrix size -void -gripe_index_out_of_range (int nd, int dim, octave_idx_type idx, - octave_idx_type ext) -{ - std::ostringstream buf; - buf << idx; - octave::out_of_range e (buf.str (), nd, dim); - - e.set_extent (ext); - // ??? Make details method give extent not size. - e.set_size (dim_vector (1, 1, 1, 1, 1, 1,1)); - - throw e; -} - -// Complain of an index that is out of range -void -gripe_index_out_of_range (int nd, int dim, octave_idx_type idx, - octave_idx_type ext, const dim_vector& d) -{ - std::ostringstream buf; - buf << idx; - octave::out_of_range e (buf.str (), nd, dim); - - e.set_extent (ext); - e.set_size (d); - - throw e; -} - -void -gripe_invalid_resize (void) -{ - (*current_liboctave_error_with_id_handler) - ("Octave:invalid-resize", - "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); -} - -void -gripe_singular_matrix (double rcond) -{ - if (rcond == 0.0) - { - (*current_liboctave_warning_with_id_handler) - (warning_id_singular_matrix, - "matrix singular to machine precision"); - } - else - { - (*current_liboctave_warning_with_id_handler) - (warning_id_nearly_singular_matrix, - "matrix singular to machine precision, rcond = %g", rcond); - } -} - -/* Tests in test/index.tst */
--- a/liboctave/util/lo-array-gripes.h Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/* - -Copyright (C) 2000-2018 John W. Eaton - -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/>. - -*/ - -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in -// version 5. - -#if ! defined (octave_lo_array_gripes_h) -#define octave_lo_array_gripes_h 1 - -#include "octave-config.h" - -#include "lo-array-errwarn.h" -#include "dim-vector.h" -#include "quit.h" - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nan_to_logical_conversion' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_nan_to_logical_conversion (void); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nan_to_character_conversion' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_nan_to_character_conversion (void); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nonconformant' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_nonconformant (const char *op, - octave_idx_type op1_len, - octave_idx_type op2_len); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nonconformant' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_nonconformant (const char *op, - octave_idx_type op1_nr, octave_idx_type op1_nc, - octave_idx_type op2_nr, octave_idx_type op2_nc); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_nonconformant' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_nonconformant (const char *op, const dim_vector& op1_dims, - const dim_vector& op2_dims); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_index_out_of_range' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_index_out_of_range (int nd, int dim, - octave_idx_type iext, octave_idx_type ext, - const dim_vector& d); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_index_out_of_range' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_index_out_of_range (int nd, int dim, - octave_idx_type iext, octave_idx_type ext); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_del_index_out_of_range' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_del_index_out_of_range (bool is1d, octave_idx_type iext, - octave_idx_type ext); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_invalid_index' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_invalid_index (double, octave_idx_type nd = 0, - octave_idx_type dim = 0, - const std::string& var = ""); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_invalid_index' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_invalid_index (octave_idx_type n, octave_idx_type nd = 0, - octave_idx_type dim = 0, - const std::string& var = ""); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_invalid_index' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_invalid_index (const std::string& idx, octave_idx_type nd = 0, - octave_idx_type dim = 0, - const std::string& var = ""); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_invalid_resize' instead") -OCTAVE_NORETURN OCTAVE_API extern void -gripe_invalid_resize (void); - -OCTAVE_DEPRECATED (4.2, "use 'octave::err_singular_matrix' instead") -OCTAVE_API extern void -gripe_singular_matrix (double rcond = 0.0); - -#endif
--- a/liboctave/util/lo-regexp.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/lo-regexp.h Wed Apr 11 00:43:54 2018 -0400 @@ -287,52 +287,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::regexp' instead") -typedef octave::regexp regexp; - -OCTAVE_DEPRECATED (4.2, "use 'octave::regexp::match' instead") -inline regexp::match_data -regexp_match (const std::string& pat, - const std::string& buffer, - const regexp::opts& opt = regexp::opts (), - const std::string& who = "regexp") -{ - return octave::regexp::match (pat, buffer, opt, who); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::regexp::is_match' instead") -inline bool -is_regexp_match (const std::string& pat, - const std::string& buffer, - const regexp::opts& opt = regexp::opts (), - const std::string& who = "regexp") -{ - return octave::regexp::is_match (pat, buffer, opt, who); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::regexp::is_match' instead") -inline Array<bool> -is_regexp_match (const std::string& pat, - const string_vector& buffer, - const regexp::opts& opt = regexp::opts (), - const std::string& who = "regexp") -{ - return octave::regexp::is_match (pat, buffer, opt, who); -} - -OCTAVE_DEPRECATED (4.2, "use 'octave::regexp::replace' instead") -inline std::string -regexp_replace (const std::string& pat, - const std::string& buffer, - const std::string& replacement, - const regexp::opts& opt = regexp::opts (), - const std::string& who = "regexp") -{ - return octave::regexp::replace (pat, buffer, replacement, opt, who); -} - #endif - -#endif
--- a/liboctave/util/module.mk Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/module.mk Wed Apr 11 00:43:54 2018 -0400 @@ -10,7 +10,6 @@ %reldir%/functor.h \ %reldir%/glob-match.h \ %reldir%/lo-array-errwarn.h \ - %reldir%/lo-array-gripes.h \ %reldir%/lo-cutils.h \ %reldir%/lo-hash.h \ %reldir%/lo-ieee.h \ @@ -71,7 +70,6 @@ %reldir%/glob-match.cc \ %reldir%/kpse.cc \ %reldir%/lo-array-errwarn.cc \ - %reldir%/lo-array-gripes.cc \ %reldir%/lo-hash.cc \ %reldir%/lo-ieee.cc \ %reldir%/lo-regexp.cc \
--- a/liboctave/util/oct-glob.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/oct-glob.h Wed Apr 11 00:43:54 2018 -0400 @@ -43,14 +43,4 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::fnmatch' instead") -const auto octave_fnmatch = octave::sys::fnmatch; - -OCTAVE_DEPRECATED (4.2, "use 'octave::sys::glob' instead") -const auto octave_glob = octave::sys::glob; - #endif - -#endif
--- a/liboctave/util/oct-inttypes.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/oct-inttypes.h Wed Apr 11 00:43:54 2018 -0400 @@ -59,16 +59,6 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::round' instead") -inline long double xround (long double x) { return octave::math::round (x); } - -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isnan' instead") -inline bool xisnan (long double x) { return octave::math::isnan (x); } - -#endif - #endif // FIXME: we define this by our own because some compilers, such as @@ -994,18 +984,6 @@ } } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -template <typename T> -OCTAVE_DEPRECATED (4.2, "use 'octave::math::isnan' instead") -bool -xisnan (const octave_int<T>& x) -{ - return octave::math::isnan (x); -} - -#endif - // FIXME: can/should any of these be inline? template <typename T>
--- a/liboctave/util/oct-shlib.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/oct-shlib.h Wed Apr 11 00:43:54 2018 -0400 @@ -202,11 +202,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::dynamic_library' instead") -typedef octave::dynamic_library octave_shlib; - #endif - -#endif
--- a/liboctave/util/pathsearch.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/pathsearch.h Wed Apr 11 00:43:54 2018 -0400 @@ -103,11 +103,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::directory_path' instead") -typedef octave::directory_path dir_path; - #endif - -#endif
--- a/liboctave/util/quit.cc Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/quit.cc Wed Apr 11 00:43:54 2018 -0400 @@ -94,7 +94,7 @@ # pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif - throw octave_exit_exception (exit_status, safe_to_return); + throw octave::exit_exception (exit_status, safe_to_return); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) # pragma GCC diagnostic pop
--- a/liboctave/util/quit.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/quit.h Wed Apr 11 00:43:54 2018 -0400 @@ -121,15 +121,6 @@ }; } -OCTAVE_DEPRECATED (4.2, "use 'octave::execution_exception' instead") -typedef octave::execution_exception octave_execution_exception; - -OCTAVE_DEPRECATED (4.2, "use 'octave::exit_exception' instead") -typedef octave::exit_exception octave_exit_exception; - -OCTAVE_DEPRECATED (4.2, "use 'octave::interrupt_exception' instead") -typedef octave::interrupt_exception octave_interrupt_exception; - #endif enum octave_exception
--- a/liboctave/util/unwind-prot.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/unwind-prot.h Wed Apr 11 00:43:54 2018 -0400 @@ -129,14 +129,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::unwind_protect' instead") -typedef octave::unwind_protect unwind_protect; - -OCTAVE_DEPRECATED (4.2, "use 'octave::unwind_protect_safe' instead") -typedef octave::unwind_protect_safe unwind_protect_safe; - #endif - -#endif
--- a/liboctave/util/url-transfer.h Tue Feb 06 07:00:09 2018 +0100 +++ b/liboctave/util/url-transfer.h Wed Apr 11 00:43:54 2018 -0400 @@ -269,14 +269,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (4.2, "use 'octave::base_url_transfer' instead") -typedef octave::base_url_transfer base_url_transfer; - -OCTAVE_DEPRECATED (4.2, "use 'octave::url_transfer' instead") -typedef octave::url_transfer url_transfer; - #endif - -#endif
--- a/scripts/deprecated/bitmax.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -## Copyright (C) 2004-2018 John W. Eaton -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {@var{r} =} bitmax (@var{precision}) -## -## @code{bitmax} is deprecated and will be removed in Octave version 5. -## Use @code{flintmax (precision) - 1} for the equivalent functionality. -## -## Return the largest integer @var{r} that can be represented within a -## floating point value. -## -## The default class is @qcode{"double"}, but @qcode{"single"} is a valid -## option. On IEEE 754 compatible systems, @code{bitmax} is -## @w{@math{2^{53} - 1}} for @qcode{"double"} and @w{@math{2^{24} - 1}} for -## @qcode{"single"}. -## -## @seealso{flintmax, intmax, realmax, realmin} -## @end deftypefn - -## Deprecated in version 4.2 - -function r = bitmax (precision) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "bitmax is obsolete and will be removed from a future version of Octave, please use flintmax instead"); - endif - - if (nargin == 0) - precision = "double"; - endif - r = flintmax (precision) - 1; - -endfunction
--- a/scripts/deprecated/mahalanobis.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -## Copyright (C) 1996-2018 John W. Eaton -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {} mahalanobis (@var{x}, @var{y}) -## -## @code{mahalanobis} is deprecated and will be removed in Octave version 5. -## See the @code{mahal} function in the statistics package from Octave-Forge -## for equivalent functionality. -## -## Return the Mahalanobis' D-square distance between the multivariate -## samples @var{x} and @var{y}. -## -## The data @var{x} and @var{y} must have the same number of components -## (columns), but may have a different number of observations (rows). -## @end deftypefn - -## Author: Friedrich Leisch <leisch@ci.tuwien.ac.at> -## Created: July 1993 -## Adapted-By: jwe - -function retval = mahalanobis (x, y) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "mahalanobis is obsolete and will be removed from a future version of Octave, please use mahal from the statistics package in Octave-Forge instead"); - endif - - if (nargin != 2) - print_usage (); - endif - - if ( ! (isnumeric (x) || islogical (x)) - || ! (isnumeric (y) || islogical (y))) - error ("mahalanobis: X and Y must be numeric matrices or vectors"); - endif - - if (ndims (x) != 2 || ndims (y) != 2) - error ("mahalanobis: X and Y must be 2-D matrices or vectors"); - endif - - [xr, xc] = size (x); - [yr, yc] = size (y); - - if (xc != yc) - error ("mahalanobis: X and Y must have the same number of columns"); - endif - - if (isinteger (x)) - x = double (x); - endif - - xm = mean (x); - ym = mean (y); - - ## Center data by subtracting means - x = bsxfun (@minus, x, xm); - y = bsxfun (@minus, y, ym); - - w = (x' * x + y' * y) / (xr + yr - 2); - - retval = sumsq ((xm - ym) / chol (w)); - -endfunction - -## Test input validation -%!error mahalanobis () -%!error mahalanobis (1, 2, 3) -%!error mahalanobis ('A', 'B') -%!error mahalanobis ([1, 2], ['A', 'B']) -%!error mahalanobis (ones (2,2,2)) -%!error mahalanobis (ones (2,2), ones (2,2,2)) -%!error mahalanobis (ones (2,2), ones (2,3))
--- a/scripts/deprecated/md5sum.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -## Copyright (C) 2007-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/>. - -## -*- texinfo -*- -## @deftypefn {} {} md5sum (@var{file}) -## @deftypefnx {} {} md5sum (@var{str}, @var{opt}) -## -## @code{md5sum} is deprecated and will be removed in Octave version 5. -## For equivalent functionality replace calls like @code{md5sum (@var{file})} -## with: -## -## @example -## hash ("md5", fileread (@var{file})) -## @end example -## -## And calls like @code{md5sum (@var{str}, true)} with: -## -## @example -## hash ("md5", fileread (@var{str})) -## @end example -## -## Calculate the MD5 sum of the file @var{file}. -## -## If the second parameter @var{opt} exists and is true, then calculate the MD5 -## sum of the string @var{str}. -## -## @seealso{hash, fileread} -## @end deftypefn - -function r = md5sum (str, opt) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "md5sum is obsolete and will be removed from a future version of Octave, please use hash instead"); - endif - - if (nargin == 1) - r = hash ("md5", fileread (str)); - elseif ((nargin == 2) && isbool (opt) && isscalar (opt) && (opt == true)) - r = hash ("md5", str); - else - print_usage (); - endif - -endfunction - - -%!assert (md5sum ("abc\0", true), "147a664a2ca9410911e61986d3f0d52a") - -%!test -%! tfile = tempname (); -%! fid = fopen (tfile, "wb"); -%! fwrite (fid, "abc\0"); -%! fclose (fid); -%! assert (md5sum (tfile), "147a664a2ca9410911e61986d3f0d52a"); -%! unlink (tfile); - -%!error md5sum ()
--- a/scripts/deprecated/module.mk Tue Feb 06 07:00:09 2018 +0100 +++ b/scripts/deprecated/module.mk Wed Apr 11 00:43:54 2018 -0400 @@ -1,24 +1,15 @@ FCN_FILE_DIRS += scripts/deprecated %canon_reldir%_FCN_FILES = \ - %reldir%/bitmax.m \ %reldir%/chop.m \ %reldir%/comma.m \ %reldir%/desktop.m \ %reldir%/isstr.m \ %reldir%/java2mat.m \ - %reldir%/mahalanobis.m \ - %reldir%/md5sum.m \ - %reldir%/octave_config_info.m \ - %reldir%/onenormest.m \ %reldir%/paren.m \ %reldir%/semicolon.m \ - %reldir%/sleep.m \ %reldir%/tmpnam.m \ - %reldir%/toascii.m \ - %reldir%/usleep.m \ - %reldir%/wavread.m \ - %reldir%/wavwrite.m + %reldir%/toascii.m %canon_reldir%dir = $(fcnfiledir)/deprecated
--- a/scripts/deprecated/octave_config_info.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -## Copyright (C) 2016-2018 John W. Eaton -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {} octave_config_info () -## @deftypefnx {} {} octave_config_info (@var{option}) -## -## @code{octave_config_info} is deprecated and will be removed in -## Octave version 5. Use @code{__have_feature__ (@var{option})} or -## @code{__octave_config_info__} as a replacement. -## -## Return a structure containing configuration and installation -## information for Octave. -## -## If @var{option} is a string, return the configuration information for -## the specified option. -## -## @seealso{computer} -## @end deftypefn - -## Deprecated in version 4.2 - -function [retval, build_env_cell] = octave_config_info (option) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "octave_config_info is obsolete and will be removed from a future version of Octave, please use __have_feature__ or __octave_config_info__ instead."); - endif - - if (nargin > 1) - print_usage (); - endif - - if (nargin == 0) - info = __octave_config_info__ (); - ## Structure layout has changed. - - dld = info.dld; - float_format = info.float_format; - words_big_endian = info.words_big_endian; - words_little_endian = info.words_little_endian; - - features = info.build_features; - - env = info.build_environment; - env_fields = fieldnames (env); - env_vals = struct2cell (env); - env_cell = [env_fields, env_vals]'; - - info = rmfield (info, {"dld", "float_format", "words_big_endian", ... - "words_little_endian", "build_features", ... - "build_environment"}); - - other_fields = fieldnames (info); - other_vals = struct2cell (info); - other_cell = [other_fields, other_vals]'; - - retval = struct ("dld", dld, - "float_format", float_format, - "words_big_endian", words_big_endian, - "words_little_endian", words_little_endian, - "features", features, - env_cell{:}, other_cell{:}); - else - if (strcmp (option, "features")) - option = "build_features"; - endif - retval = __octave_config_info__ (option); - endif - -endfunction
--- a/scripts/deprecated/onenormest.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,307 +0,0 @@ -## Copyright (C) 2007-2018 Regents of the University of California -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {[@var{est}, @var{v}, @var{w}, @var{iter}] =} onenormest (@var{A}, @var{t}) -## @deftypefnx {} {[@var{est}, @var{v}, @var{w}, @var{iter}] =} onenormest (@var{apply}, @var{apply_t}, @var{n}, @var{t}) -## -## @code{onenormest} is deprecated and will be removed in Octave version 5. -## Use @code{normest1} for the equivalent functionality. -## -## Apply @nospell{Higham and Tisseur's} randomized block 1-norm estimator to -## matrix @var{A} using @var{t} test vectors. -## -## If @var{t} exceeds 5, then only 5 test vectors are used. -## -## If the matrix is not explicit, e.g., when estimating the norm of -## @code{inv (@var{A})} given an LU@tie{}factorization, @code{onenormest} -## applies @var{A} and its conjugate transpose through a pair of functions -## @var{apply} and @var{apply_t}, respectively, to a dense matrix of size -## @var{n} by @var{t}. The implicit version requires an explicit dimension -## @var{n}. -## -## Returns the norm estimate @var{est}, two vectors @var{v} and @var{w} related -## by norm @code{(@var{w}, 1) = @var{est} * norm (@var{v}, 1)}, and the number -## of iterations @var{iter}. The number of iterations is limited to 10 and is -## at least 2. -## -## References: -## -## @itemize -## @item -## @nospell{N.J. Higham and F. Tisseur}, @cite{A Block Algorithm -## for Matrix 1-Norm Estimation, with an Application to 1-Norm -## Pseudospectra}. SIMAX vol 21, no 4, pp 1185-1201. -## @url{http://dx.doi.org/10.1137/S0895479899356080} -## -## @item -## @nospell{N.J. Higham and F. Tisseur}, @cite{A Block Algorithm -## for Matrix 1-Norm Estimation, with an Application to 1-Norm -## Pseudospectra}. @url{http://citeseer.ist.psu.edu/223007.html} -## @end itemize -## -## @seealso{condest, norm, cond} -## @end deftypefn - -## Code originally licensed under: -## -## Copyright (c) 2007, Regents of the University of California -## All rights reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## -## * Redistributions in binary form must reproduce the above -## copyright notice, this list of conditions and the following -## disclaimer in the documentation and/or other materials provided -## with the distribution. -## -## * Neither the name of the University of California, Berkeley nor -## the names of its contributors may be used to endorse or promote -## products derived from this software without specific prior -## written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' -## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -## TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -## PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND -## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. - -## Author: Jason Riedy <ejr@cs.berkeley.edu> -## Keywords: linear-algebra norm estimation -## Version: 0.2 - -function [est, v, w, iter] = onenormest (varargin) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "onenormest is obsolete and will be removed from a future version of Octave, please use normest1 instead"); - endif - - - if (nargin < 1 || nargin > 4) - print_usage (); - endif - - default_t = 5; - itmax = 10; - - if (isnumeric (varargin{1})) - [n, nc] = size (varargin{1}); - if (n != nc) - error ("onenormest: matrix must be square"); - endif - apply = @(x) varargin{1} * x; - apply_t = @(x) varargin{1}' * x; - if (nargin > 1) - t = varargin{2}; - else - t = min (n, default_t); - endif - issing = isa (varargin{1}, "single"); - else - if (nargin < 3) - print_usage (); - endif - apply = varargin{1}; - apply_t = varargin{2}; - n = varargin{3}; - if (nargin > 3) - t = varargin{4}; - else - t = default_t; - endif - issing = isa (n, "single"); - endif - - ## Initial test vectors X. - X = rand (n, t); - X ./= ones (n,1) * sum (abs (X), 1); - - ## Track if a vertex has been visited. - been_there = zeros (n, 1); - - ## To check if the estimate has increased. - est_old = 0; - - ## Normalized vector of signs. - S = zeros (n, t); - - if (issing) - myeps = eps ("single"); - X = single (X); - else - myeps = eps; - endif - - for iter = 1 : itmax + 1 - Y = feval (apply, X); - - ## Find the initial estimate as the largest A*x. - [est, ind_best] = max (sum (abs (Y), 1)); - if (est > est_old || iter == 2) - w = Y(:,ind_best); - endif - if (iter >= 2 && est < est_old) - ## No improvement, so stop. - est = est_old; - break; - endif - - est_old = est; - S_old = S; - if (iter > itmax), - ## Gone too far. Stop. - break; - endif - - S = sign (Y); - - ## Test if any of S are approximately parallel to previous S - ## vectors or current S vectors. If everything is parallel, - ## stop. Otherwise, replace any parallel vectors with - ## rand{-1,+1}. - partest = any (abs (S_old' * S - n) < 4*eps*n); - if (all (partest)) - ## All the current vectors are parallel to old vectors. - ## We've hit a cycle, so stop. - break; - endif - if (any (partest)) - ## Some vectors are parallel to old ones and are cycling, - ## but not all of them. Replace the parallel vectors with - ## rand{-1,+1}. - numpar = sum (partest); - replacements = 2*(rand (n,numpar) < 0.5) - 1; - S(:,partest) = replacements; - endif - ## Now test for parallel vectors within S. - partest = any ((S' * S - eye (t)) == n); - if (any (partest)) - numpar = sum (partest); - replacements = 2*(rand (n,numpar) < 0.5) - 1; - S(:,partest) = replacements; - endif - - Z = feval (apply_t, S); - - ## Now find the largest non-previously-visted index per vector. - h = max (abs (Z),2); - [mh, mhi] = max (h); - if (iter >= 2 && mhi == ind_best) - ## Hit a cycle, stop. - break; - endif - [h, ind] = sort (h, 'descend'); - if (t > 1) - firstind = ind(1:t); - if (all (been_there(firstind))) - ## Visited all these before, so stop. - break; - endif - ind = ind(! been_there(ind)); - if (length (ind) < t) - ## There aren't enough new vectors, so we're practically - ## in a cycle. Stop. - break; - endif - endif - - ## Visit the new indices. - X = zeros (n, t); - for zz = 1 : t - X(ind(zz),zz) = 1; - endfor - been_there(ind(1 : t)) = 1; - endfor - - ## The estimate est and vector w are set in the loop above. - ## The vector v selects the ind_best column of A. - v = zeros (n, 1); - v(ind_best) = 1; - -endfunction - - -%!demo -%! N = 100; -%! A = randn (N) + eye (N); -%! [L,U,P] = lu (A); -%! nm1inv = onenormest (@(x) U\(L\(P*x)), @(x) P'*(L'\(U'\x)), N, 30) -%! norm (inv (A), 1) - -%!test -%! warning ("off", "Octave:deprecated-function", "local"); -%! N = 10; -%! A = ones (N); -%! [nm1, v1, w1] = onenormest (A); -%! [nminf, vinf, winf] = onenormest (A', 6); -%! assert (nm1, N, -2*eps); -%! assert (nminf, N, -2*eps); -%! assert (norm (w1, 1), nm1 * norm (v1, 1), -2*eps); -%! assert (norm (winf, 1), nminf * norm (vinf, 1), -2*eps); - -%!test -%! warning ("off", "Octave:deprecated-function", "local"); -%! N = 10; -%! A = ones (N); -%! [nm1, v1, w1] = onenormest (@(x) A*x, @(x) A'*x, N, 3); -%! [nminf, vinf, winf] = onenormest (@(x) A'*x, @(x) A*x, N, 3); -%! assert (nm1, N, -2*eps); -%! assert (nminf, N, -2*eps); -%! assert (norm (w1, 1), nm1 * norm (v1, 1), -2*eps); -%! assert (norm (winf, 1), nminf * norm (vinf, 1), -2*eps); - -%!test -%! warning ("off", "Octave:deprecated-function", "local"); -%! N = 5; -%! A = hilb (N); -%! [nm1, v1, w1] = onenormest (A); -%! [nminf, vinf, winf] = onenormest (A', 6); -%! assert (nm1, norm (A, 1), -2*eps); -%! assert (nminf, norm (A, inf), -2*eps); -%! assert (norm (w1, 1), nm1 * norm (v1, 1), -2*eps); -%! assert (norm (winf, 1), nminf * norm (vinf, 1), -2*eps); - -## Only likely to be within a factor of 10. -%!test -%! warning ("off", "Octave:deprecated-function", "local"); -%! old_state = rand ("state"); -%! restore_state = onCleanup (@() rand ("state", old_state)); -%! rand ("state", 42); # Initialize to guarantee reproducible results -%! N = 100; -%! A = rand (N); -%! [nm1, v1, w1] = onenormest (A); -%! [nminf, vinf, winf] = onenormest (A', 6); -%! assert (nm1, norm (A, 1), -.1); -%! assert (nminf, norm (A, inf), -.1); -%! assert (norm (w1, 1), nm1 * norm (v1, 1), -2*eps); -%! assert (norm (winf, 1), nminf * norm (vinf, 1), -2*eps);
--- a/scripts/deprecated/sleep.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -## Copyright (C) 1993-2018 John W. Eaton -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {} sleep (@var{seconds}) -## -## @code{sleep} is deprecated and will be removed in Octave version 5. -## Use @code{pause} instead. -## -## Suspend the execution of the program for the given number of seconds. -## -## @seealso{pause} -## @end deftypefn - -function sleep (seconds) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "sleep is obsolete and will be removed from a future version of Octave, please use pause instead"); - endif - - if (nargin == 1) - pause (seconds); - else - print_usage (); - endif - -endfunction - - -%!test -%! sleep (1); - -%!error (sleep ()) -%!error (sleep (1, 2))
--- a/scripts/deprecated/usleep.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -## Copyright (C) 1993-2018 John W. Eaton -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {} usleep (@var{microseconds}) -## -## @code{usleep} is deprecated and will be removed in Octave version 5. -## Use @code{pause} instead. -## -## Suspend the execution of the program for the given number of -## microseconds (1e-6 seconds). -## -## @seealso{pause} -## @end deftypefn - -function usleep (microseconds) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "usleep is obsolete and will be removed from a future version of Octave, please use pause instead"); - endif - - if (nargin == 1) - pause (microseconds / 1e6); - else - print_usage (); - endif - -endfunction - - -%!test -%! usleep (1000); - -%!error (usleep ()) -%!error (usleep (1, 2))
--- a/scripts/deprecated/wavread.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ -## Copyright (C) 2016-2018 Mike Miller -## Copyright (C) 2005-2018 Michael Zeising -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {@var{y} =} wavread (@var{filename}) -## @deftypefnx {} {[@var{y}, @var{fs}, @var{nbits}] =} wavread (@var{filename}) -## @deftypefnx {} {[@dots{}] =} wavread (@var{filename}, @var{n}) -## @deftypefnx {} {[@dots{}] =} wavread (@var{filename}, [@var{n1} @var{n2}]) -## @deftypefnx {} {[@dots{}] =} wavread (@dots{}, @var{datatype}) -## @deftypefnx {} {@var{sz} =} wavread (@var{filename}, "size") -## @deftypefnx {} {[@var{n_samp}, @var{n_chan}] =} wavread (@var{filename}, "size") -## -## @code{wavread} is deprecated and will be removed in Octave version 5. -## Use @code{audioread} for the equivalent functionality. -## -## Read the audio signal @var{y} from the RIFF/WAVE sound file @var{filename}. -## -## If the file contains multichannel data, then @var{y} is a matrix with the -## channels represented as columns. -## -## If @var{n} is specified, only the first @var{n} samples of the file are -## returned. If [@var{n1} @var{n2}] is specified, only the range of samples -## from @var{n1} to @var{n2} is returned. A value of @code{Inf} can be used -## to represent the total number of samples in the file. -## -## If the option @qcode{"size"} is given, then the size of the audio signal -## is returned instead of the data. The size is returned in a row vector of -## the form [@var{samples} @var{channels}]. If there are two output arguments, -## the number of samples is assigned to the first and the number of channels -## is assigned to the second. -## -## The optional return value @var{fs} is the sample rate of the audio file in -## Hz. The optional return value @var{nbits} is the number of bits per sample -## as encoded in the file. -## -## @seealso{audioread, audiowrite, wavwrite} -## @end deftypefn - -## Deprecated in 4.2 - -function [y, fs, nbits] = wavread (filename, varargin) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "wavread is obsolete and will be removed from a future version of Octave, please use audioread instead"); - endif - - if (nargin < 1 || nargin > 3) - print_usage (); - endif - - if (! ischar (filename)) - error ("wavread: FILENAME must be a character string"); - endif - - datatype = "double"; - samples = [1, Inf]; - do_file_size = false; - - if (nargin == 3) - samples = varargin{1}; - datatype = varargin{2}; - elseif (nargin == 2) - if (strcmp (varargin{1}, "size")) - do_file_size = true; - elseif (ischar (varargin{1})) - datatype = varargin{1}; - else - samples = varargin{1}; - endif - endif - - if (isscalar (samples)) - samples = [1, samples]; - endif - - if (! (isrow (samples) && numel (samples) == 2 && all (samples > 0) - && all (fix (samples) == samples))) - error ("wavread: SAMPLES must be a 1- or 2-element integer row vector"); - endif - - if (! (ischar (datatype) && any (strcmp (datatype, {"double", "native"})))) - error ('wavread: DATATYPE must be either "double" or "native"'); - endif - - info = audioinfo (filename); - - if (do_file_size) - if (nargout > 1) - [y, fs] = deal (info.TotalSamples, info.NumChannels); - else - y = [info.TotalSamples, info.NumChannels]; - endif - else - [y, fs] = audioread (filename, samples, datatype); - nbits = info.BitsPerSample; - endif - -endfunction - - -## Functional tests for wavread/wavwrite pair are in wavwrite.m. - -## Test input validation -%!error wavread () -%!error wavread (1) -%!error wavread ("foo.wav", 2, 3, 4) -%!error wavread ("foo.wav", "foo") -%!error wavread ("foo.wav", -1) -%!error wavread ("foo.wav", [1, Inf], "foo")
--- a/scripts/deprecated/wavwrite.m Tue Feb 06 07:00:09 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ -## Copyright (C) 2016-2018 Mike Miller -## Copyright (C) 2005-2018 Michael Zeising -## -## 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/>. - -## -*- texinfo -*- -## @deftypefn {} {} wavwrite (@var{y}, @var{filename}) -## @deftypefnx {} {} wavwrite (@var{y}, @var{fs}, @var{filename}) -## @deftypefnx {} {} wavwrite (@var{y}, @var{fs}, @var{nbits}, @var{filename}) -## -## @code{wavwrite} is deprecated and will be removed in Octave version 5. -## Use @code{audiowrite} for the equivalent functionality. -## -## Write the audio signal @var{y} to the RIFF/WAVE sound file @var{filename}. -## -## If @var{y} is a matrix, the columns represent multiple audio channels. -## -## The optional argument @var{fs} specifies the sample rate of the audio signal -## in Hz. -## -## The optional argument @var{nbits} specifies the number of bits per sample -## to write to @var{filename}. -## -## The default sample rate is 8000 Hz and the default bit depth is 16 bits -## per sample. -## -## @seealso{audiowrite, audioread, wavread} -## @end deftypefn - -## Deprecated in 4.2 - -function wavwrite (y, varargin) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "wavwrite is obsolete and will be removed from a future version of Octave, please use audiowrite instead"); - endif - - if (nargin < 2 || nargin > 4) - print_usage (); - endif - - ## Defaults. - fs = 8000; - nbits = 16; - - filename = varargin{end}; - if (nargin > 2) - fs = varargin{1}; - if (nargin > 3) - nbits = varargin{2}; - endif - endif - - ## calculate filesize - [n, channels] = size (y); - - ## allow y to be a row vector - if (n == 1) - y = y(:); - n = channels; - channels = 1; - endif - - ## test arguments - if (channels < 1) - error ("wavwrite: Y must have at least one column"); - endif - - if (channels > 0x7FFF) - error ("wavwrite: Y must have no more than 32767 columns"); - endif - - if (! (isscalar (fs) && (fs > 0))) - error ("wavwrite: sample rate FS must be a positive number"); - endif - - if (! isscalar (nbits) || isempty (find (nbits == [8, 16, 24, 32]))) - error ("wavwrite: bit depth NBITS must be 8, 16, 24, or 32"); - endif - - audiowrite (filename, y, fs, "BitsPerSample", nbits); - -endfunction - - -%!shared fname -%! fname = [tempname() ".wav"]; - -%!testif HAVE_SNDFILE -%! A = [-1:0.1:1; -1:0.1:1]'; -%! unwind_protect -%! wavwrite (A, fname); -%! [B, samples_per_sec, bits_per_sample] = wavread (fname); -%! assert (B, A, 2^-14); -%! assert (samples_per_sec, 8000); -%! assert (bits_per_sample, 16); -%! unwind_protect_cleanup -%! unlink (fname); -%! end_unwind_protect - -%!testif HAVE_SNDFILE -%! A = [-1:0.1:1; -1:0.1:1]'; -%! unwind_protect -%! wavwrite (A, 4000, fname); -%! [B, samples_per_sec, bits_per_sample] = wavread (fname); -%! assert (B, A, 2^-14); -%! assert (samples_per_sec, 4000); -%! assert (bits_per_sample, 16); -%! unwind_protect_cleanup -%! unlink (fname); -%! end_unwind_protect - -%!testif HAVE_SNDFILE -%! A = [-1:0.1:1; -1:0.1:1]'; -%! unwind_protect -%! wavwrite (A, 4000, 8, fname); -%! [B, samples_per_sec, bits_per_sample] = wavread (fname); -%! assert (B, A, 2^-6); -%! assert (samples_per_sec, 4000); -%! assert (bits_per_sample, 8); -%! unwind_protect_cleanup -%! unlink (fname); -%! end_unwind_protect - -%!testif HAVE_SNDFILE -%! A = [-2:2]'; -%! unwind_protect -%! wavwrite (A, fname); -%! B = wavread (fname); -%! B *= 32768; -%! assert (B, [-32767 -32767 0 32767 32767]'); -%! unwind_protect_cleanup -%! unlink (fname); -%! end_unwind_protect - -%!testif HAVE_SNDFILE -%! A = [-1:0.1:1]; -%! unwind_protect -%! wavwrite (A, fname); -%! [B, samples_per_sec, bits_per_sample] = wavread (fname); -%! assert (B, A', 2^-14); -%! assert (samples_per_sec, 8000); -%! assert (bits_per_sample, 16); -%! unwind_protect_cleanup -%! unlink (fname); -%! end_unwind_protect - -%!testif HAVE_SNDFILE -%! A = [-1:0.1:1; -1:0.1:1]'; -%! unwind_protect -%! wavwrite (A, fname); -%! B = wavread (fname, 15); -%! assert (B, A(1:15,:), 2^-14); -%! wavwrite (A, fname); -%! B = wavread (fname, [10, 20]); -%! assert (B, A(10:20,:), 2^-14); -%! unwind_protect_cleanup -%! unlink (fname); -%! end_unwind_protect - -%!testif HAVE_SNDFILE -%! A = [-1:0.1:1; -1:0.1:1]'; -%! unwind_protect -%! wavwrite (A, fname); -%! [nsamp, nchan] = wavread (fname, "size"); -%! assert (nsamp, 21); -%! assert (nchan, 2); -%! unwind_protect_cleanup -%! unlink (fname); -%! end_unwind_protect - -## Test input validation -%!error wavwrite () -%!error wavwrite (1) -%!error wavwrite (1,2,3,4,5) -%!error wavwrite ([], "foo.wav")
--- a/scripts/linear-algebra/condest.m Tue Feb 06 07:00:09 2018 +0100 +++ b/scripts/linear-algebra/condest.m Wed Apr 11 00:43:54 2018 -0400 @@ -146,18 +146,6 @@ print_usage (); endif - if ((nargin == 3 && is_function_handle (varargin{3})) - || (nargin == 4 && is_function_handle (varargin{3}) - && isnumeric (varargin{4}))) - ## onenormest syntax, deprecated in 4.2 - [cest, v] = condest_legacy (varargin{:}); - return; - elseif ((nargin >= 5) && is_function_handle (varargin{4})) - ## onenormest syntax, deprecated in 4.2 - [cest, v] = condest_legacy (varargin{:}); - return; - endif - have_A = false; have_t = false; have_apply_normest1 = false; @@ -254,97 +242,6 @@ endswitch endfunction -## FIXME: remove after 4.4 -function [cest, v] = condest_legacy (varargin) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "condest: this syntax is deprecated, call condest (A, SOLVEFUN, T, P1, P2, ...) instead."); - endif - - default_t = 5; - - have_A = false; - have_t = false; - have_solve = false; - if (isnumeric (varargin{1})) - A = varargin{1}; - if (! issquare (A)) - error ("condest: matrix must be square"); - endif - n = rows (A); - have_A = true; - - if (nargin > 1) - if (! is_function_handle (varargin{2})) - t = varargin{2}; - have_t = true; - elseif (nargin > 2) - solve = varargin{2}; - solve_t = varargin{3}; - have_solve = true; - if (nargin > 3) - t = varargin{4}; - have_t = true; - endif - else - error ("condest: must supply both SOLVE and SOLVE_T"); - endif - endif - elseif (nargin > 4) - apply = varargin{1}; - apply_t = varargin{2}; - solve = varargin{3}; - solve_t = varargin{4}; - have_solve = true; - n = varargin{5}; - if (! isscalar (n)) - error ("condest: dimension argument of implicit form must be scalar"); - endif - if (nargin > 5) - t = varargin{6}; - have_t = true; - endif - else - error ("condest: implicit form of condest requires at least 5 arguments"); - endif - - if (! have_t) - t = min (n, default_t); - endif - - if (! have_solve) - if (issparse (A)) - [L, U, P, Pc] = lu (A); - solve = @(x) Pc' * (U \ (L \ (P * x))); - solve_t = @(x) P' * (L' \ (U' \ (Pc * x))); - else - [L, U, P] = lu (A); - solve = @(x) U \ (L \ (P*x)); - solve_t = @(x) P' * (L' \ (U' \ x)); - endif - endif - - ## We already warned about this usage being deprecated. - ## Don't warn again about onenormest. - warning ("off", "Octave:deprecated-function", "local"); - - if (have_A) - Anorm = norm (A, 1); - else - Anorm = onenormest (apply, apply_t, n, t); - endif - - [Ainv_norm, v, w] = onenormest (solve, solve_t, n, t); - - cest = Anorm * Ainv_norm; - v = w / norm (w, 1); - -endfunction - - ## Note: These test bounds are very loose. There is enough randomization to ## trigger odd cases with hilb(). @@ -386,35 +283,6 @@ %! cA_test = norm (inv (A), 1) * norm (A, 1); %! assert (cA, cA_test, -2^-8); -%!test # to be removed after 4.4 -%! warning ("off", "Octave:deprecated-function", "local"); -%! N = 6; -%! A = hilb (N); -%! solve = @(x) A\x; solve_t = @(x) A'\x; -%! cA = condest (A, solve, solve_t); -%! cA_test = norm (inv (A), 1) * norm (A, 1); -%! assert (cA, cA_test, -2^-8); - -%!test # to be removed after 4.4 -%! warning ("off", "Octave:deprecated-function", "local"); -%! N = 6; -%! A = hilb (N); -%! apply = @(x) A*x; apply_t = @(x) A'*x; -%! solve = @(x) A\x; solve_t = @(x) A'\x; -%! cA = condest (apply, apply_t, solve, solve_t, N); -%! cA_test = norm (inv (A), 1) * norm (A, 1); -%! assert (cA, cA_test, -2^-6); - -%!test # to be removed after 4.4 -%! warning ("off", "Octave:deprecated-function", "local"); -%! N = 6; -%! A = hilb (N); -%! apply = @(x) A*x; apply_t = @(x) A'*x; -%! solve = @(x) A\x; solve_t = @(x) A'\x; -%! cA = condest (apply, apply_t, solve, solve_t, N, 2); -%! cA_test = norm (inv (A), 1) * norm (A, 1); -%! assert (cA, cA_test, -2^-6); - %!test %! warning ("off", "Octave:nearly-singular-matrix", "local"); %! N = 12;
--- a/scripts/pkg/pkg.m Tue Feb 06 07:00:09 2018 +0100 +++ b/scripts/pkg/pkg.m Wed Apr 11 00:43:54 2018 -0400 @@ -102,6 +102,9 @@ ## pkg update ## @end example ## +## @noindent +## To update a single package use @code{pkg install -forge} +## ## @item uninstall ## Uninstall named packages. For example, ## @@ -309,10 +312,10 @@ confirm_recursive_rmdir (false, "local"); - available_actions = {"list", "install", "uninstall", "load", ... - "unload", "prefix", "local_list", ... - "global_list", "rebuild", "build", ... - "describe", "update"}; + # valid actions in alphabetical order + available_actions = {"build", "describe", "global_list", "install", ... + "list", "load", "local_list", "prefix", "rebuild", ... + "uninstall", "unload", "update"}; ## Parse input arguments if (isempty (varargin) || ! iscellstr (varargin)) @@ -570,19 +573,15 @@ case "update" installed_pkgs_lst = installed_packages (local_list, global_list); + if (numel (files) > 0) - update_lst = {}; - installed_names = {installed_pkgs_lst.name}'; - for i = 1:numel (files) - idx = find (strcmp (files{i}, installed_names), 1); - if (isempty (idx)) - warning ("pkg: package %s is not installed - skipping update", files{i}); - else - update_lst = { update_lst, installed_pkgs_lst{idx} }; - endif - endfor - installed_pkgs_lst = update_lst; + ## This was option was broken during two releases and no one + ## notice so we are guessing no one actually uses it. If the + ## user knows the names of the packages to be installed, it + ## might as well call install (which is what update is doing) + error ("pkg: to update individual packages, use 'pkg install -forge'"); endif + for i = 1:numel (installed_pkgs_lst) installed_pkg_name = installed_pkgs_lst{i}.name; installed_pkg_version = installed_pkgs_lst{i}.version;
--- a/scripts/pkg/private/install.m Tue Feb 06 07:00:09 2018 +0100 +++ b/scripts/pkg/private/install.m Wed Apr 11 00:43:54 2018 -0400 @@ -288,7 +288,8 @@ ## without creating it such as giving an invalid filename for the package if (exist ("desc", "var") && exist (fullfile (desc.dir, "packinfo", "NEWS"), "file")) - printf ("For information about changes from previous versions of the %s package, run 'news %s'.\n", + printf (["For information about changes from previous versions " ... + "of the %s package, run 'news %s'.\n"], desc.name, desc.name); endif
--- a/scripts/plot/draw/private/__pie__.m Tue Feb 06 07:00:09 2018 +0100 +++ b/scripts/plot/draw/private/__pie__.m Wed Apr 11 00:43:54 2018 -0400 @@ -131,8 +131,10 @@ elseif (strcmp (caller, "pie")) if (xt > 0) align = "left"; + elseif (xt < 0) + align = "right"; else - align = "right"; + align = "center"; endif hlist = [hlist; patch(xoff + [0, -sind(xn)], yoff + [0, cosd(xn)], i);
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m Tue Feb 06 07:00:09 2018 +0100 +++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m Wed Apr 11 00:43:54 2018 -0400 @@ -247,8 +247,7 @@ else xaxisloc = "x"; xaxisloc_using = "x1"; -### FIXME: DEPRECATED: Remove "zero" in version 5. - if (any (strcmp (axis_obj.xaxislocation, {"origin", "zero"}))) + if (strcmp (axis_obj.xaxislocation, "origin")) fputs (plot_stream, "set xzeroaxis;\n"); endif endif @@ -258,8 +257,7 @@ else yaxisloc = "y"; yaxisloc_using = "y1"; -### FIXME: DEPRECATED: Remove "zero" in version 5. - if (any (strcmp (axis_obj.yaxislocation, {"origin", "zero"}))) + if (strcmp (axis_obj.yaxislocation, "origin")) fputs (plot_stream, "set yzeroaxis;\n"); endif endif @@ -1498,13 +1496,13 @@ if (isempty (axis_obj.xtick)) elseif (strcmp (axis_obj.xaxislocation, "top")) fprintf (plot_stream, "set x2tics %s nomirror\n", axis_obj.tickdir); - else # xaxislocation == "bottom", "origin" or "zero" + else # xaxislocation == "bottom" or "origin" fprintf (plot_stream, "set xtics %s nomirror\n", axis_obj.tickdir); endif if (isempty (axis_obj.ytick)) elseif (strcmp (axis_obj.yaxislocation, "right")) fprintf (plot_stream, "set y2tics %s nomirror\n", axis_obj.tickdir); - else # yaxislocation == "left", "origin" or "zero" + else # yaxislocation == "left" or "origin" fprintf (plot_stream, "set ytics %s nomirror\n", axis_obj.tickdir); endif endif @@ -1809,12 +1807,10 @@ arrow (4, obj.ycolor, obj.linewidth, [1,0,0], [1,1,0]); endif -### FIXME: DEPRECATED: Remove "zero" in version 5. - if (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) + if (strcmp (obj.xaxislocation, "origin")) idx = zeroaxis (idx, obj.xcolor, "x"); endif -### FIXME: DEPRECATED: Remove "zero" in version 5. - if (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) + if (strcmp (obj.yaxislocation, "origin")) idx = zeroaxis (idx, obj.ycolor, "y"); endif @@ -2180,8 +2176,7 @@ obj.xcolor, "x", plot_stream, true, "border", "", "", fontname, fontspec, obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); -### FIXME: DEPRECATED: Remove "zero" in version 5. - elseif (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) + elseif (strcmp (obj.xaxislocation, "origin")) do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, obj.xticklabel, obj.xcolor, "x", plot_stream, true, "axis", obj.tickdir, ticklength, fontname, fontspec, @@ -2209,8 +2204,7 @@ obj.ycolor, "y", plot_stream, ymirror, "border", "", "", fontname, fontspec, obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); -### FIXME: DEPRECATED: Remove "zero" in version 5. - elseif (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) + elseif (strcmp (obj.yaxislocation, "origin")) do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, "axis", obj.tickdir, ticklength, fontname, fontspec,
--- a/scripts/sparse/nonzeros.m Tue Feb 06 07:00:09 2018 +0100 +++ b/scripts/sparse/nonzeros.m Wed Apr 11 00:43:54 2018 -0400 @@ -17,20 +17,24 @@ ## <https://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {} {} nonzeros (@var{s}) -## Return a vector of the nonzero values of the sparse matrix @var{s}. +## @deftypefn {} {@var{v} =} nonzeros (@var{A}) +## Return a column vector of the nonzero values of the matrix @var{A}. ## @seealso{find, nnz} ## @end deftypefn -function t = nonzeros (s) +function v = nonzeros (A) if (nargin != 1) print_usage (); endif - [~, ~, t] = find (s); - - t = t(:); + if (issparse (A)) + [~, ~, v] = find (A); + v = v(:); + else + v = A(find (A)); + v = v(:); + endif endfunction @@ -39,3 +43,7 @@ %!assert (nonzeros ([1,2,3,0]), [1;2;3]) %!assert (nonzeros (sparse ([1,2;3,0])), [1;3;2]) %!assert (nonzeros (sparse ([1,2,3,0])), [1;2;3]) + +## Test input validation +%!error nonzeros () +%!error nonzeros (1, 2)
--- a/test/deprecate-props.tst Tue Feb 06 07:00:09 2018 +0100 +++ b/test/deprecate-props.tst Wed Apr 11 00:43:54 2018 -0400 @@ -31,36 +31,6 @@ %! endif %!endfunction -## patch/surface "normalmode" deprecated in 4.2, remove from version 5. -%!test -%! hf = figure ("visible", "off"); -%! unwind_protect -%! hp = patch (); -%! testprop (hp, "normalmode", "5.0"); -%! unwind_protect_cleanup -%! close (hf); -%! end_unwind_protect - -%! hf = figure ("visible", "off"); -%! unwind_protect -%! hs = surface (); -%! testprop (hs, "normalmode", "5.0"); -%! unwind_protect_cleanup -%! close (hf); -%! end_unwind_protect - -## axes, "zero" value for "x/yaxislocation" deprecated in 4.2, remove -## from version 5. -%!test -%! hf = figure ("visible", "off"); -%! unwind_protect -%! ha = axes (); -%! testprop (ha, "xaxislocation", "5.0", "zero"); -%! testprop (ha, "yaxislocation", "5.0", "zero"); -%! unwind_protect_cleanup -%! close (hf); -%! end_unwind_protect - ## annotation rectangle "edgecolor" deprecated in 4.4, remove from version 6. %!test %! hf = figure ("visible", "off");
--- a/test/module.mk Tue Feb 06 07:00:09 2018 +0100 +++ b/test/module.mk Wed Apr 11 00:43:54 2018 -0400 @@ -77,6 +77,7 @@ include %reldir%/local-functions/module.mk include %reldir%/nest/module.mk include %reldir%/publish/module.mk +include %reldir%/pkg/module.mk define run-octave-tests ( cd %reldir% && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) $(1) --norc --silent --no-history $(abs_top_srcdir)/%reldir%/fntests.m $(abs_top_srcdir)/%reldir% ); \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_basic_test/COPYING Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,719 @@ +Appendix G GNU GENERAL PUBLIC LICENSE +************************************* + + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. `http://fsf.org/' + + Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. + +Preamble +======== + +The GNU General Public License is a free, copyleft license for software +and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains +free software for all its users. We, the Free Software Foundation, use +the GNU General Public License for most of our software; it applies +also to any other work released this way by its authors. You can apply +it to your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you +have certain responsibilities if you distribute copies of the software, +or if you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the +manufacturer can do so. This is fundamentally incompatible with the +aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for +individuals to use, which is precisely where it is most unacceptable. +Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in +other domains, we stand ready to extend this provision to those domains +in future versions of the GPL, as needed to protect the freedom of +users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS +==================== + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public + License. + + "Copyright" also means copyright-like laws that apply to other + kinds of works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this + License. Each licensee is addressed as "you". "Licensees" and + "recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the + work in a fashion requiring copyright permission, other than the + making of an exact copy. The resulting work is called a "modified + version" of the earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work + based on the Program. + + To "propagate" a work means to do anything with it that, without + permission, would make you directly or secondarily liable for + infringement under applicable copyright law, except executing it + on a computer or modifying a private copy. Propagation includes + copying, distribution (with or without modification), making + available to the public, and in some countries other activities as + well. + + To "convey" a work means any kind of propagation that enables other + parties to make or receive copies. Mere interaction with a user + through a computer network, with no transfer of a copy, is not + conveying. + + An interactive user interface displays "Appropriate Legal Notices" + to the extent that it includes a convenient and prominently visible + feature that (1) displays an appropriate copyright notice, and (2) + tells the user that there is no warranty for the work (except to + the extent that warranties are provided), that licensees may + convey the work under this License, and how to view a copy of this + License. If the interface presents a list of user commands or + options, such as a menu, a prominent item in the list meets this + criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work + for making modifications to it. "Object code" means any + non-source form of a work. + + A "Standard Interface" means an interface that either is an + official standard defined by a recognized standards body, or, in + the case of interfaces specified for a particular programming + language, one that is widely used among developers working in that + language. + + The "System Libraries" of an executable work include anything, + other than the work as a whole, that (a) is included in the normal + form of packaging a Major Component, but which is not part of that + Major Component, and (b) serves only to enable use of the work + with that Major Component, or to implement a Standard Interface + for which an implementation is available to the public in source + code form. A "Major Component", in this context, means a major + essential component (kernel, window system, and so on) of the + specific operating system (if any) on which the executable work + runs, or a compiler used to produce the work, or an object code + interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all + the source code needed to generate, install, and (for an executable + work) run the object code and to modify the work, including + scripts to control those activities. However, it does not include + the work's System Libraries, or general-purpose tools or generally + available free programs which are used unmodified in performing + those activities but which are not part of the work. For example, + Corresponding Source includes interface definition files + associated with source files for the work, and the source code for + shared libraries and dynamically linked subprograms that the work + is specifically designed to require, such as by intimate data + communication or control flow between those subprograms and other + parts of the work. + + The Corresponding Source need not include anything that users can + regenerate automatically from other parts of the Corresponding + Source. + + The Corresponding Source for a work in source code form is that + same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of + copyright on the Program, and are irrevocable provided the stated + conditions are met. This License explicitly affirms your unlimited + permission to run the unmodified Program. The output from running + a covered work is covered by this License only if the output, + given its content, constitutes a covered work. This License + acknowledges your rights of fair use or other equivalent, as + provided by copyright law. + + You may make, run and propagate covered works that you do not + convey, without conditions so long as your license otherwise + remains in force. You may convey covered works to others for the + sole purpose of having them make modifications exclusively for + you, or provide you with facilities for running those works, + provided that you comply with the terms of this License in + conveying all material for which you do not control copyright. + Those thus making or running the covered works for you must do so + exclusively on your behalf, under your direction and control, on + terms that prohibit them from making any copies of your + copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under + the conditions stated below. Sublicensing is not allowed; section + 10 makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological + measure under any applicable law fulfilling obligations under + article 11 of the WIPO copyright treaty adopted on 20 December + 1996, or similar laws prohibiting or restricting circumvention of + such measures. + + When you convey a covered work, you waive any legal power to forbid + circumvention of technological measures to the extent such + circumvention is effected by exercising rights under this License + with respect to the covered work, and you disclaim any intention + to limit operation or modification of the work as a means of + enforcing, against the work's users, your or third parties' legal + rights to forbid circumvention of technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you + receive it, in any medium, provided that you conspicuously and + appropriately publish on each copy an appropriate copyright notice; + keep intact all notices stating that this License and any + non-permissive terms added in accord with section 7 apply to the + code; keep intact all notices of the absence of any warranty; and + give all recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, + and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to + produce it from the Program, in the form of source code under the + terms of section 4, provided that you also meet all of these + conditions: + + a. The work must carry prominent notices stating that you + modified it, and giving a relevant date. + + b. The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in + section 4 to "keep intact all notices". + + c. You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable + section 7 additional terms, to the whole of the work, and all + its parts, regardless of how they are packaged. This License + gives no permission to license the work in any other way, but + it does not invalidate such permission if you have separately + received it. + + d. If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has + interactive interfaces that do not display Appropriate Legal + Notices, your work need not make them do so. + + A compilation of a covered work with other separate and independent + works, which are not by their nature extensions of the covered + work, and which are not combined with it such as to form a larger + program, in or on a volume of a storage or distribution medium, is + called an "aggregate" if the compilation and its resulting + copyright are not used to limit the access or legal rights of the + compilation's users beyond what the individual works permit. + Inclusion of a covered work in an aggregate does not cause this + License to apply to the other parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms + of sections 4 and 5, provided that you also convey the + machine-readable Corresponding Source under the terms of this + License, in one of these ways: + + a. Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b. Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for + as long as you offer spare parts or customer support for that + product model, to give anyone who possesses the object code + either (1) a copy of the Corresponding Source for all the + software in the product that is covered by this License, on a + durable physical medium customarily used for software + interchange, for a price no more than your reasonable cost of + physically performing this conveying of source, or (2) access + to copy the Corresponding Source from a network server at no + charge. + + c. Convey individual copies of the object code with a copy of + the written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, + and only if you received the object code with such an offer, + in accord with subsection 6b. + + d. Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access + to the Corresponding Source in the same way through the same + place at no further charge. You need not require recipients + to copy the Corresponding Source along with the object code. + If the place to copy the object code is a network server, the + Corresponding Source may be on a different server (operated + by you or a third party) that supports equivalent copying + facilities, provided you maintain clear directions next to + the object code saying where to find the Corresponding Source. + Regardless of what server hosts the Corresponding Source, you + remain obligated to ensure that it is available for as long + as needed to satisfy these requirements. + + e. Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the + general public at no charge under subsection 6d. + + + A separable portion of the object code, whose source code is + excluded from the Corresponding Source as a System Library, need + not be included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means + any tangible personal property which is normally used for personal, + family, or household purposes, or (2) anything designed or sold for + incorporation into a dwelling. In determining whether a product + is a consumer product, doubtful cases shall be resolved in favor of + coverage. For a particular product received by a particular user, + "normally used" refers to a typical or common use of that class of + product, regardless of the status of the particular user or of the + way in which the particular user actually uses, or expects or is + expected to use, the product. A product is a consumer product + regardless of whether the product has substantial commercial, + industrial or non-consumer uses, unless such uses represent the + only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, + procedures, authorization keys, or other information required to + install and execute modified versions of a covered work in that + User Product from a modified version of its Corresponding Source. + The information must suffice to ensure that the continued + functioning of the modified object code is in no case prevented or + interfered with solely because modification has been made. + + If you convey an object code work under this section in, or with, + or specifically for use in, a User Product, and the conveying + occurs as part of a transaction in which the right of possession + and use of the User Product is transferred to the recipient in + perpetuity or for a fixed term (regardless of how the transaction + is characterized), the Corresponding Source conveyed under this + section must be accompanied by the Installation Information. But + this requirement does not apply if neither you nor any third party + retains the ability to install modified object code on the User + Product (for example, the work has been installed in ROM). + + The requirement to provide Installation Information does not + include a requirement to continue to provide support service, + warranty, or updates for a work that has been modified or + installed by the recipient, or for the User Product in which it + has been modified or installed. Access to a network may be denied + when the modification itself materially and adversely affects the + operation of the network or violates the rules and protocols for + communication across the network. + + Corresponding Source conveyed, and Installation Information + provided, in accord with this section must be in a format that is + publicly documented (and with an implementation available to the + public in source code form), and must require no special password + or key for unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of + this License by making exceptions from one or more of its + conditions. Additional permissions that are applicable to the + entire Program shall be treated as though they were included in + this License, to the extent that they are valid under applicable + law. If additional permissions apply only to part of the Program, + that part may be used separately under those permissions, but the + entire Program remains governed by this License without regard to + the additional permissions. + + When you convey a copy of a covered work, you may at your option + remove any additional permissions from that copy, or from any part + of it. (Additional permissions may be written to require their own + removal in certain cases when you modify the work.) You may place + additional permissions on material, added by you to a covered work, + for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material + you add to a covered work, you may (if authorized by the copyright + holders of that material) supplement the terms of this License + with terms: + + a. Disclaiming warranty or limiting liability differently from + the terms of sections 15 and 16 of this License; or + + b. Requiring preservation of specified reasonable legal notices + or author attributions in that material or in the Appropriate + Legal Notices displayed by works containing it; or + + c. Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be + marked in reasonable ways as different from the original + version; or + + d. Limiting the use for publicity purposes of names of licensors + or authors of the material; or + + e. Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f. Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified + versions of it) with contractual assumptions of liability to + the recipient, for any liability that these contractual + assumptions directly impose on those licensors and authors. + + All other non-permissive additional terms are considered "further + restrictions" within the meaning of section 10. If the Program as + you received it, or any part of it, contains a notice stating that + it is governed by this License along with a term that is a further + restriction, you may remove that term. If a license document + contains a further restriction but permits relicensing or + conveying under this License, you may add to a covered work + material governed by the terms of that license document, provided + that the further restriction does not survive such relicensing or + conveying. + + If you add terms to a covered work in accord with this section, you + must place, in the relevant source files, a statement of the + additional terms that apply to those files, or a notice indicating + where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in + the form of a separately written license, or stated as exceptions; + the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly + provided under this License. Any attempt otherwise to propagate or + modify it is void, and will automatically terminate your rights + under this License (including any patent licenses granted under + the third paragraph of section 11). + + However, if you cease all violation of this License, then your + license from a particular copyright holder is reinstated (a) + provisionally, unless and until the copyright holder explicitly + and finally terminates your license, and (b) permanently, if the + copyright holder fails to notify you of the violation by some + reasonable means prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is + reinstated permanently if the copyright holder notifies you of the + violation by some reasonable means, this is the first time you have + received notice of violation of this License (for any work) from + that copyright holder, and you cure the violation prior to 30 days + after your receipt of the notice. + + Termination of your rights under this section does not terminate + the licenses of parties who have received copies or rights from + you under this License. If your rights have been terminated and + not permanently reinstated, you do not qualify to receive new + licenses for the same material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or + run a copy of the Program. Ancillary propagation of a covered work + occurring solely as a consequence of using peer-to-peer + transmission to receive a copy likewise does not require + acceptance. However, nothing other than this License grants you + permission to propagate or modify any covered work. These actions + infringe copyright if you do not accept this License. Therefore, + by modifying or propagating a covered work, you indicate your + acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically + receives a license from the original licensors, to run, modify and + propagate that work, subject to this License. You are not + responsible for enforcing compliance by third parties with this + License. + + An "entity transaction" is a transaction transferring control of an + organization, or substantially all assets of one, or subdividing an + organization, or merging organizations. If propagation of a + covered work results from an entity transaction, each party to that + transaction who receives a copy of the work also receives whatever + licenses to the work the party's predecessor in interest had or + could give under the previous paragraph, plus a right to + possession of the Corresponding Source of the work from the + predecessor in interest, if the predecessor has it or can get it + with reasonable efforts. + + You may not impose any further restrictions on the exercise of the + rights granted or affirmed under this License. For example, you + may not impose a license fee, royalty, or other charge for + exercise of rights granted under this License, and you may not + initiate litigation (including a cross-claim or counterclaim in a + lawsuit) alleging that any patent claim is infringed by making, + using, selling, offering for sale, or importing the Program or any + portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this + License of the Program or a work on which the Program is based. + The work thus licensed is called the contributor's "contributor + version". + + A contributor's "essential patent claims" are all patent claims + owned or controlled by the contributor, whether already acquired or + hereafter acquired, that would be infringed by some manner, + permitted by this License, of making, using, or selling its + contributor version, but do not include claims that would be + infringed only as a consequence of further modification of the + contributor version. For purposes of this definition, "control" + includes the right to grant patent sublicenses in a manner + consistent with the requirements of this License. + + Each contributor grants you a non-exclusive, worldwide, + royalty-free patent license under the contributor's essential + patent claims, to make, use, sell, offer for sale, import and + otherwise run, modify and propagate the contents of its + contributor version. + + In the following three paragraphs, a "patent license" is any + express agreement or commitment, however denominated, not to + enforce a patent (such as an express permission to practice a + patent or covenant not to sue for patent infringement). To + "grant" such a patent license to a party means to make such an + agreement or commitment not to enforce a patent against the party. + + If you convey a covered work, knowingly relying on a patent + license, and the Corresponding Source of the work is not available + for anyone to copy, free of charge and under the terms of this + License, through a publicly available network server or other + readily accessible means, then you must either (1) cause the + Corresponding Source to be so available, or (2) arrange to deprive + yourself of the benefit of the patent license for this particular + work, or (3) arrange, in a manner consistent with the requirements + of this License, to extend the patent license to downstream + recipients. "Knowingly relying" means you have actual knowledge + that, but for the patent license, your conveying the covered work + in a country, or your recipient's use of the covered work in a + country, would infringe one or more identifiable patents in that + country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or + arrangement, you convey, or propagate by procuring conveyance of, a + covered work, and grant a patent license to some of the parties + receiving the covered work authorizing them to use, propagate, + modify or convey a specific copy of the covered work, then the + patent license you grant is automatically extended to all + recipients of the covered work and works based on it. + + A patent license is "discriminatory" if it does not include within + the scope of its coverage, prohibits the exercise of, or is + conditioned on the non-exercise of one or more of the rights that + are specifically granted under this License. You may not convey a + covered work if you are a party to an arrangement with a third + party that is in the business of distributing software, under + which you make payment to the third party based on the extent of + your activity of conveying the work, and under which the third + party grants, to any of the parties who would receive the covered + work from you, a discriminatory patent license (a) in connection + with copies of the covered work conveyed by you (or copies made + from those copies), or (b) primarily for and in connection with + specific products or compilations that contain the covered work, + unless you entered into that arrangement, or that patent license + was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting + any implied license or other defenses to infringement that may + otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, + agreement or otherwise) that contradict the conditions of this + License, they do not excuse you from the conditions of this + License. If you cannot convey a covered work so as to satisfy + simultaneously your obligations under this License and any other + pertinent obligations, then as a consequence you may not convey it + at all. For example, if you agree to terms that obligate you to + collect a royalty for further conveying from those to whom you + convey the Program, the only way you could satisfy both those + terms and this License would be to refrain entirely from conveying + the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have + permission to link or combine any covered work with a work licensed + under version 3 of the GNU Affero General Public License into a + single combined work, and to convey the resulting work. The terms + of this License will continue to apply to the part which is the + covered work, but the special requirements of the GNU Affero + General Public License, section 13, concerning interaction through + a network will apply to the combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new + versions of the GNU General Public License from time to time. + Such new versions will be similar in spirit to the present + version, but may differ in detail to address new problems or + concerns. + + Each version is given a distinguishing version number. If the + Program specifies that a certain numbered version of the GNU + General Public License "or any later version" applies to it, you + have the option of following the terms and conditions either of + that numbered version or of any later version published by the + Free Software Foundation. If the Program does not specify a + version number of the GNU General Public License, you may choose + any version ever published by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future + versions of the GNU General Public License can be used, that + proxy's public statement of acceptance of a version permanently + authorizes you to choose that version for the Program. + + Later license versions may give you additional or different + permissions. However, no additional obligations are imposed on any + author or copyright holder as a result of your choosing to follow a + later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY + APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE + COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE + RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. + SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL + NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES + AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU + FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE + THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA + BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF + THE POSSIBILITY OF SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided + above cannot be given local legal effect according to their terms, + reviewing courts shall apply local law that most closely + approximates an absolute waiver of all civil liability in + connection with the Program, unless a warranty or assumption of + liability accompanies a copy of the Program in return for a fee. + + +END OF TERMS AND CONDITIONS +=========================== + +How to Apply These Terms to Your New Programs +============================================= + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES. + Copyright (C) YEAR NAME OF AUTHOR + + This program 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. + + This program 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 this program. If not, see `http://www.gnu.org/licenses/'. + + Also add information on how to contact you by electronic and paper +mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + PROGRAM Copyright (C) YEAR NAME OF AUTHOR + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, your +program's commands might be different; for a GUI interface, you would +use an "about box". + + You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU GPL, see `http://www.gnu.org/licenses/'. + + The GNU General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the +GNU Lesser General Public License instead of this License. But first, +please read `http://www.gnu.org/philosophy/why-not-lgpl.html'.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_basic_test/DESCRIPTION Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,12 @@ +Name: mfile_basic_test +Version: 0.1.0 +Date: 2017-12-07 +Author: hopefully various authors +Maintainer: hopefully some of those authors. +Title: Basic Example Package +Description: Basic package structure with only m-files. +Depends: octave (>= 4.2.1) +License: GPLv3+ +# BuildRequires: +# SystemRequirements: +# Url: external homepage
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_basic_test/INDEX Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,3 @@ +mfile-basic-example-package >> Basic Example Package. +Example m-file + example_mfile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_basic_test/NEWS Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,4 @@ +mfile-basic-example-package 0.1.0 +--------------------------------- + +* Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_basic_test/doc/example-package.txi Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,89 @@ +\input texinfo +@c %**start of header +@setfilename example-package.info +@settitle example-package_doc +@c %**end of header + +@c Nowadays the predined function index has entries for each @deftypefn +@c in additiont to each @findex. +@defcodeindex mfn + +@copying +Manual for the example-package for Octave. + +Copyright @copyright{} 2017-2018 @email{Olaf Till <i7tiol@@t-online.de>} + +You can redistribute this documentation 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. + +This documentation 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 this documentation; if not, see <http://www.gnu.org/licenses/>. +@end copying + +@include macros.texi + +@titlepage +@title Manual for the example-package for Octave +@page +@vskip 0pt plus 1filll +@insertcopying +@end titlepage + +@c No table of contents. The table would occupy most of the top node in +@c html and IMHO misleads the user to use the table instead of the menu +@c structure of the nodes, which would let some information unused. +@c +@c @contents + +@c ------------------------------------------------------------------ + +@node Top +@top Manual for the example-package for Octave + +This documentation applies to version @PACKAGEVERSION of the +example-package. + +This is a template simple m-file based package for users. + +Normally, a package manual should be structured and should contain more +than just the helptexts of the functions. + +@menu +Functions +* example_mfile:: Placeholder for an mfile. +Indices +* Function index:: Index of functions. +* Concept index:: Concept index. +@end menu + +@c ------------------------------------------------------------------ + +@node example_mfile +@chapter Placeholder for an mfile +@mfnindex example_mfile + +@c include function helptext here +@DOCSTRING(example_mfile) + +@c ------------------------------------------------------------------ + +@node Function index +@unnumbered Index of functions in example-package + +@printindex mfn + +@c ------------------------------------------------------------------ + +@node Concept index +@unnumbered Concept index + +@printindex cp + +@bye
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_basic_test/doc/macros.texi Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,88 @@ +@c Copyright (C) 2012-2018 John W. Eaton +@c +@c This file is part of Octave. +@c +@c Octave is free software; you can redistribute it and/or modify it +@c under the terms of the GNU General Public License as published by the +@c Free Software Foundation; either version 3 of the License, or (at +@c your option) any later version. +@c +@c Octave is distributed in the hope that it will be useful, but WITHOUT +@c ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +@c FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +@c for more details. +@c +@c You should have received a copy of the GNU General Public License +@c along with Octave; see the file COPYING. If not, see +@c <http://www.gnu.org/licenses/>. + +@c The following macro marks words that aspell should ignore during +@c spellchecking. Within Texinfo it has no effect as it merely replaces +@c the macro call with the argument itself. + +@macro nospell {arg} +\arg\ +@end macro + +@c The following macro works around the Info/plain text expansion of @code{XXX} +@c which is `XXX'. This looks particularly bad when the macro body is +@c single or double-quoted text, such as a property value `"position"' +@ifinfo +@rmacro qcode{arg} +\arg\ +@end rmacro +@end ifinfo +@ifnotinfo +@rmacro qcode{arg} +@code{\arg\} +@end rmacro +@end ifnotinfo + +@c The following macro is used for the on-line help system, but we don't +@c want lots of `See also: foo, bar, and baz' strings cluttering the +@c printed manual (that information should be in the supporting text for +@c each group of functions and variables). +@c +@c Implementation Note: +@c For TeX, @vskip produces a nice separation. +@c For Texinfo, '@sp 1' should work, but in practice produces ugly results +@c for HTML. We use a simple blank line to produce the correct behavior. + +@macro seealso {args} +@iftex +@vskip 2pt +@end iftex +@ifnottex + +@end ifnottex +@ifnotinfo +@noindent +@strong{See also:} \args\. +@end ifnotinfo +@ifinfo +@noindent +See also: \args\. +@end ifinfo +@end macro + +@c The following macro works around a situation where the Info/plain text +@c expansion of the @code{XXX} macro is `XXX'. The use of the apostrophe +@c can be confusing if the code segment itself ends with a transpose operator. +@ifinfo +@macro tcode{arg} +\arg\ +@end macro +@end ifinfo +@ifnotinfo +@macro tcode{arg} +@code{\arg\} +@end macro +@end ifnotinfo + +@c FIXME: someday, when Texinfo 5.X is standard, we might replace this with +@c @backslashchar, which is a new addition to Texinfo. + +@macro xbackslashchar +\\ +@end macro +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_basic_test/inst/example_mfile.m Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,36 @@ +## Copyright (C) 2017-2018 Olaf Till <i7tiol@t-online.de> +## +## This program 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. +## +## This program 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 this program; if not, see <http://www.gnu.org/licenses/>. + +## -*- texinfo -*- +## @deftypefn {Function File} {@var{ret} =} example_mfile (@var{arg}) +## Placeholder for an mfile function. +## +## @var{arg}: argument. @var{ret}: returned value. +## +## Although this file is so short, a license text is contained as an +## example. +## +## @seealso{example_open, example_close, example_do_something} +## @end deftypefn + +function ret = example_mfile (arg) + + if (nargin () != 1) + print_usage (); + endif + + ret = arg; + +endfunction
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_minimal_test/COPYING Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,719 @@ +Appendix G GNU GENERAL PUBLIC LICENSE +************************************* + + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. `http://fsf.org/' + + Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. + +Preamble +======== + +The GNU General Public License is a free, copyleft license for software +and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains +free software for all its users. We, the Free Software Foundation, use +the GNU General Public License for most of our software; it applies +also to any other work released this way by its authors. You can apply +it to your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you +have certain responsibilities if you distribute copies of the software, +or if you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the +manufacturer can do so. This is fundamentally incompatible with the +aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for +individuals to use, which is precisely where it is most unacceptable. +Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in +other domains, we stand ready to extend this provision to those domains +in future versions of the GPL, as needed to protect the freedom of +users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS +==================== + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public + License. + + "Copyright" also means copyright-like laws that apply to other + kinds of works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this + License. Each licensee is addressed as "you". "Licensees" and + "recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the + work in a fashion requiring copyright permission, other than the + making of an exact copy. The resulting work is called a "modified + version" of the earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work + based on the Program. + + To "propagate" a work means to do anything with it that, without + permission, would make you directly or secondarily liable for + infringement under applicable copyright law, except executing it + on a computer or modifying a private copy. Propagation includes + copying, distribution (with or without modification), making + available to the public, and in some countries other activities as + well. + + To "convey" a work means any kind of propagation that enables other + parties to make or receive copies. Mere interaction with a user + through a computer network, with no transfer of a copy, is not + conveying. + + An interactive user interface displays "Appropriate Legal Notices" + to the extent that it includes a convenient and prominently visible + feature that (1) displays an appropriate copyright notice, and (2) + tells the user that there is no warranty for the work (except to + the extent that warranties are provided), that licensees may + convey the work under this License, and how to view a copy of this + License. If the interface presents a list of user commands or + options, such as a menu, a prominent item in the list meets this + criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work + for making modifications to it. "Object code" means any + non-source form of a work. + + A "Standard Interface" means an interface that either is an + official standard defined by a recognized standards body, or, in + the case of interfaces specified for a particular programming + language, one that is widely used among developers working in that + language. + + The "System Libraries" of an executable work include anything, + other than the work as a whole, that (a) is included in the normal + form of packaging a Major Component, but which is not part of that + Major Component, and (b) serves only to enable use of the work + with that Major Component, or to implement a Standard Interface + for which an implementation is available to the public in source + code form. A "Major Component", in this context, means a major + essential component (kernel, window system, and so on) of the + specific operating system (if any) on which the executable work + runs, or a compiler used to produce the work, or an object code + interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all + the source code needed to generate, install, and (for an executable + work) run the object code and to modify the work, including + scripts to control those activities. However, it does not include + the work's System Libraries, or general-purpose tools or generally + available free programs which are used unmodified in performing + those activities but which are not part of the work. For example, + Corresponding Source includes interface definition files + associated with source files for the work, and the source code for + shared libraries and dynamically linked subprograms that the work + is specifically designed to require, such as by intimate data + communication or control flow between those subprograms and other + parts of the work. + + The Corresponding Source need not include anything that users can + regenerate automatically from other parts of the Corresponding + Source. + + The Corresponding Source for a work in source code form is that + same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of + copyright on the Program, and are irrevocable provided the stated + conditions are met. This License explicitly affirms your unlimited + permission to run the unmodified Program. The output from running + a covered work is covered by this License only if the output, + given its content, constitutes a covered work. This License + acknowledges your rights of fair use or other equivalent, as + provided by copyright law. + + You may make, run and propagate covered works that you do not + convey, without conditions so long as your license otherwise + remains in force. You may convey covered works to others for the + sole purpose of having them make modifications exclusively for + you, or provide you with facilities for running those works, + provided that you comply with the terms of this License in + conveying all material for which you do not control copyright. + Those thus making or running the covered works for you must do so + exclusively on your behalf, under your direction and control, on + terms that prohibit them from making any copies of your + copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under + the conditions stated below. Sublicensing is not allowed; section + 10 makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological + measure under any applicable law fulfilling obligations under + article 11 of the WIPO copyright treaty adopted on 20 December + 1996, or similar laws prohibiting or restricting circumvention of + such measures. + + When you convey a covered work, you waive any legal power to forbid + circumvention of technological measures to the extent such + circumvention is effected by exercising rights under this License + with respect to the covered work, and you disclaim any intention + to limit operation or modification of the work as a means of + enforcing, against the work's users, your or third parties' legal + rights to forbid circumvention of technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you + receive it, in any medium, provided that you conspicuously and + appropriately publish on each copy an appropriate copyright notice; + keep intact all notices stating that this License and any + non-permissive terms added in accord with section 7 apply to the + code; keep intact all notices of the absence of any warranty; and + give all recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, + and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to + produce it from the Program, in the form of source code under the + terms of section 4, provided that you also meet all of these + conditions: + + a. The work must carry prominent notices stating that you + modified it, and giving a relevant date. + + b. The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in + section 4 to "keep intact all notices". + + c. You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable + section 7 additional terms, to the whole of the work, and all + its parts, regardless of how they are packaged. This License + gives no permission to license the work in any other way, but + it does not invalidate such permission if you have separately + received it. + + d. If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has + interactive interfaces that do not display Appropriate Legal + Notices, your work need not make them do so. + + A compilation of a covered work with other separate and independent + works, which are not by their nature extensions of the covered + work, and which are not combined with it such as to form a larger + program, in or on a volume of a storage or distribution medium, is + called an "aggregate" if the compilation and its resulting + copyright are not used to limit the access or legal rights of the + compilation's users beyond what the individual works permit. + Inclusion of a covered work in an aggregate does not cause this + License to apply to the other parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms + of sections 4 and 5, provided that you also convey the + machine-readable Corresponding Source under the terms of this + License, in one of these ways: + + a. Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b. Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for + as long as you offer spare parts or customer support for that + product model, to give anyone who possesses the object code + either (1) a copy of the Corresponding Source for all the + software in the product that is covered by this License, on a + durable physical medium customarily used for software + interchange, for a price no more than your reasonable cost of + physically performing this conveying of source, or (2) access + to copy the Corresponding Source from a network server at no + charge. + + c. Convey individual copies of the object code with a copy of + the written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, + and only if you received the object code with such an offer, + in accord with subsection 6b. + + d. Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access + to the Corresponding Source in the same way through the same + place at no further charge. You need not require recipients + to copy the Corresponding Source along with the object code. + If the place to copy the object code is a network server, the + Corresponding Source may be on a different server (operated + by you or a third party) that supports equivalent copying + facilities, provided you maintain clear directions next to + the object code saying where to find the Corresponding Source. + Regardless of what server hosts the Corresponding Source, you + remain obligated to ensure that it is available for as long + as needed to satisfy these requirements. + + e. Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the + general public at no charge under subsection 6d. + + + A separable portion of the object code, whose source code is + excluded from the Corresponding Source as a System Library, need + not be included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means + any tangible personal property which is normally used for personal, + family, or household purposes, or (2) anything designed or sold for + incorporation into a dwelling. In determining whether a product + is a consumer product, doubtful cases shall be resolved in favor of + coverage. For a particular product received by a particular user, + "normally used" refers to a typical or common use of that class of + product, regardless of the status of the particular user or of the + way in which the particular user actually uses, or expects or is + expected to use, the product. A product is a consumer product + regardless of whether the product has substantial commercial, + industrial or non-consumer uses, unless such uses represent the + only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, + procedures, authorization keys, or other information required to + install and execute modified versions of a covered work in that + User Product from a modified version of its Corresponding Source. + The information must suffice to ensure that the continued + functioning of the modified object code is in no case prevented or + interfered with solely because modification has been made. + + If you convey an object code work under this section in, or with, + or specifically for use in, a User Product, and the conveying + occurs as part of a transaction in which the right of possession + and use of the User Product is transferred to the recipient in + perpetuity or for a fixed term (regardless of how the transaction + is characterized), the Corresponding Source conveyed under this + section must be accompanied by the Installation Information. But + this requirement does not apply if neither you nor any third party + retains the ability to install modified object code on the User + Product (for example, the work has been installed in ROM). + + The requirement to provide Installation Information does not + include a requirement to continue to provide support service, + warranty, or updates for a work that has been modified or + installed by the recipient, or for the User Product in which it + has been modified or installed. Access to a network may be denied + when the modification itself materially and adversely affects the + operation of the network or violates the rules and protocols for + communication across the network. + + Corresponding Source conveyed, and Installation Information + provided, in accord with this section must be in a format that is + publicly documented (and with an implementation available to the + public in source code form), and must require no special password + or key for unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of + this License by making exceptions from one or more of its + conditions. Additional permissions that are applicable to the + entire Program shall be treated as though they were included in + this License, to the extent that they are valid under applicable + law. If additional permissions apply only to part of the Program, + that part may be used separately under those permissions, but the + entire Program remains governed by this License without regard to + the additional permissions. + + When you convey a copy of a covered work, you may at your option + remove any additional permissions from that copy, or from any part + of it. (Additional permissions may be written to require their own + removal in certain cases when you modify the work.) You may place + additional permissions on material, added by you to a covered work, + for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material + you add to a covered work, you may (if authorized by the copyright + holders of that material) supplement the terms of this License + with terms: + + a. Disclaiming warranty or limiting liability differently from + the terms of sections 15 and 16 of this License; or + + b. Requiring preservation of specified reasonable legal notices + or author attributions in that material or in the Appropriate + Legal Notices displayed by works containing it; or + + c. Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be + marked in reasonable ways as different from the original + version; or + + d. Limiting the use for publicity purposes of names of licensors + or authors of the material; or + + e. Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f. Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified + versions of it) with contractual assumptions of liability to + the recipient, for any liability that these contractual + assumptions directly impose on those licensors and authors. + + All other non-permissive additional terms are considered "further + restrictions" within the meaning of section 10. If the Program as + you received it, or any part of it, contains a notice stating that + it is governed by this License along with a term that is a further + restriction, you may remove that term. If a license document + contains a further restriction but permits relicensing or + conveying under this License, you may add to a covered work + material governed by the terms of that license document, provided + that the further restriction does not survive such relicensing or + conveying. + + If you add terms to a covered work in accord with this section, you + must place, in the relevant source files, a statement of the + additional terms that apply to those files, or a notice indicating + where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in + the form of a separately written license, or stated as exceptions; + the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly + provided under this License. Any attempt otherwise to propagate or + modify it is void, and will automatically terminate your rights + under this License (including any patent licenses granted under + the third paragraph of section 11). + + However, if you cease all violation of this License, then your + license from a particular copyright holder is reinstated (a) + provisionally, unless and until the copyright holder explicitly + and finally terminates your license, and (b) permanently, if the + copyright holder fails to notify you of the violation by some + reasonable means prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is + reinstated permanently if the copyright holder notifies you of the + violation by some reasonable means, this is the first time you have + received notice of violation of this License (for any work) from + that copyright holder, and you cure the violation prior to 30 days + after your receipt of the notice. + + Termination of your rights under this section does not terminate + the licenses of parties who have received copies or rights from + you under this License. If your rights have been terminated and + not permanently reinstated, you do not qualify to receive new + licenses for the same material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or + run a copy of the Program. Ancillary propagation of a covered work + occurring solely as a consequence of using peer-to-peer + transmission to receive a copy likewise does not require + acceptance. However, nothing other than this License grants you + permission to propagate or modify any covered work. These actions + infringe copyright if you do not accept this License. Therefore, + by modifying or propagating a covered work, you indicate your + acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically + receives a license from the original licensors, to run, modify and + propagate that work, subject to this License. You are not + responsible for enforcing compliance by third parties with this + License. + + An "entity transaction" is a transaction transferring control of an + organization, or substantially all assets of one, or subdividing an + organization, or merging organizations. If propagation of a + covered work results from an entity transaction, each party to that + transaction who receives a copy of the work also receives whatever + licenses to the work the party's predecessor in interest had or + could give under the previous paragraph, plus a right to + possession of the Corresponding Source of the work from the + predecessor in interest, if the predecessor has it or can get it + with reasonable efforts. + + You may not impose any further restrictions on the exercise of the + rights granted or affirmed under this License. For example, you + may not impose a license fee, royalty, or other charge for + exercise of rights granted under this License, and you may not + initiate litigation (including a cross-claim or counterclaim in a + lawsuit) alleging that any patent claim is infringed by making, + using, selling, offering for sale, or importing the Program or any + portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this + License of the Program or a work on which the Program is based. + The work thus licensed is called the contributor's "contributor + version". + + A contributor's "essential patent claims" are all patent claims + owned or controlled by the contributor, whether already acquired or + hereafter acquired, that would be infringed by some manner, + permitted by this License, of making, using, or selling its + contributor version, but do not include claims that would be + infringed only as a consequence of further modification of the + contributor version. For purposes of this definition, "control" + includes the right to grant patent sublicenses in a manner + consistent with the requirements of this License. + + Each contributor grants you a non-exclusive, worldwide, + royalty-free patent license under the contributor's essential + patent claims, to make, use, sell, offer for sale, import and + otherwise run, modify and propagate the contents of its + contributor version. + + In the following three paragraphs, a "patent license" is any + express agreement or commitment, however denominated, not to + enforce a patent (such as an express permission to practice a + patent or covenant not to sue for patent infringement). To + "grant" such a patent license to a party means to make such an + agreement or commitment not to enforce a patent against the party. + + If you convey a covered work, knowingly relying on a patent + license, and the Corresponding Source of the work is not available + for anyone to copy, free of charge and under the terms of this + License, through a publicly available network server or other + readily accessible means, then you must either (1) cause the + Corresponding Source to be so available, or (2) arrange to deprive + yourself of the benefit of the patent license for this particular + work, or (3) arrange, in a manner consistent with the requirements + of this License, to extend the patent license to downstream + recipients. "Knowingly relying" means you have actual knowledge + that, but for the patent license, your conveying the covered work + in a country, or your recipient's use of the covered work in a + country, would infringe one or more identifiable patents in that + country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or + arrangement, you convey, or propagate by procuring conveyance of, a + covered work, and grant a patent license to some of the parties + receiving the covered work authorizing them to use, propagate, + modify or convey a specific copy of the covered work, then the + patent license you grant is automatically extended to all + recipients of the covered work and works based on it. + + A patent license is "discriminatory" if it does not include within + the scope of its coverage, prohibits the exercise of, or is + conditioned on the non-exercise of one or more of the rights that + are specifically granted under this License. You may not convey a + covered work if you are a party to an arrangement with a third + party that is in the business of distributing software, under + which you make payment to the third party based on the extent of + your activity of conveying the work, and under which the third + party grants, to any of the parties who would receive the covered + work from you, a discriminatory patent license (a) in connection + with copies of the covered work conveyed by you (or copies made + from those copies), or (b) primarily for and in connection with + specific products or compilations that contain the covered work, + unless you entered into that arrangement, or that patent license + was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting + any implied license or other defenses to infringement that may + otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, + agreement or otherwise) that contradict the conditions of this + License, they do not excuse you from the conditions of this + License. If you cannot convey a covered work so as to satisfy + simultaneously your obligations under this License and any other + pertinent obligations, then as a consequence you may not convey it + at all. For example, if you agree to terms that obligate you to + collect a royalty for further conveying from those to whom you + convey the Program, the only way you could satisfy both those + terms and this License would be to refrain entirely from conveying + the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have + permission to link or combine any covered work with a work licensed + under version 3 of the GNU Affero General Public License into a + single combined work, and to convey the resulting work. The terms + of this License will continue to apply to the part which is the + covered work, but the special requirements of the GNU Affero + General Public License, section 13, concerning interaction through + a network will apply to the combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new + versions of the GNU General Public License from time to time. + Such new versions will be similar in spirit to the present + version, but may differ in detail to address new problems or + concerns. + + Each version is given a distinguishing version number. If the + Program specifies that a certain numbered version of the GNU + General Public License "or any later version" applies to it, you + have the option of following the terms and conditions either of + that numbered version or of any later version published by the + Free Software Foundation. If the Program does not specify a + version number of the GNU General Public License, you may choose + any version ever published by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future + versions of the GNU General Public License can be used, that + proxy's public statement of acceptance of a version permanently + authorizes you to choose that version for the Program. + + Later license versions may give you additional or different + permissions. However, no additional obligations are imposed on any + author or copyright holder as a result of your choosing to follow a + later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY + APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE + COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE + RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. + SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL + NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES + AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU + FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE + THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA + BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF + THE POSSIBILITY OF SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided + above cannot be given local legal effect according to their terms, + reviewing courts shall apply local law that most closely + approximates an absolute waiver of all civil liability in + connection with the Program, unless a warranty or assumption of + liability accompanies a copy of the Program in return for a fee. + + +END OF TERMS AND CONDITIONS +=========================== + +How to Apply These Terms to Your New Programs +============================================= + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES. + Copyright (C) YEAR NAME OF AUTHOR + + This program 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. + + This program 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 this program. If not, see `http://www.gnu.org/licenses/'. + + Also add information on how to contact you by electronic and paper +mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + PROGRAM Copyright (C) YEAR NAME OF AUTHOR + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, your +program's commands might be different; for a GUI interface, you would +use an "about box". + + You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU GPL, see `http://www.gnu.org/licenses/'. + + The GNU General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the +GNU Lesser General Public License instead of this License. But first, +please read `http://www.gnu.org/philosophy/why-not-lgpl.html'.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_minimal_test/DESCRIPTION Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,13 @@ +Name: mfile_minimal_test +Version: 0.1.0 +Date: 2017-12-08 +Author: hopefully various authors +Maintainer: hopefully some of those authors. +Title: Example Minimal Package +Description: Minimal package structure with only m-files. +Depends: octave (>= 4.2.1) +License: GPLv3+ +Categories: Test +# BuildRequires: +# SystemRequirements: +# Url: external homepage
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/mfile_minimal_test/inst/example_mfile.m Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,36 @@ +## Copyright (C) 2017-2018 Olaf Till <i7tiol@t-online.de> +## +## This program 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. +## +## This program 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 this program; if not, see <http://www.gnu.org/licenses/>. + +## -*- texinfo -*- +## @deftypefn {Function File} {@var{ret} =} example_mfile (@var{arg}) +## Placeholder for an mfile function. +## +## @var{arg}: argument. @var{ret}: returned value. +## +## Although this file is so short, a license text is contained as an +## example. +## +## @seealso{example_open, example_close, example_do_something} +## @end deftypefn + +function ret = example_mfile (arg) + + if (nargin () != 1) + print_usage (); + endif + + ret = arg; + +endfunction
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/module.mk Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,14 @@ +pkg_TEST_FILES = \ + %reldir%/pkg.tst \ + %reldir%/mfile_basic_test/INDEX \ + %reldir%/mfile_basic_test/NEWS \ + %reldir%/mfile_basic_test/DESCRIPTION \ + %reldir%/mfile_basic_test/doc/macros.texi \ + %reldir%/mfile_basic_test/doc/example-package.txi \ + %reldir%/mfile_basic_test/COPYING \ + %reldir%/mfile_basic_test/inst/example_mfile.m \ + %reldir%/mfile_minimal_test/DESCRIPTION \ + %reldir%/mfile_minimal_test/COPYING \ + %reldir%/mfile_minimal_test/inst/example_mfile.m + +TEST_FILES += $(pkg_TEST_FILES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/pkg/pkg.tst Wed Apr 11 00:43:54 2018 -0400 @@ -0,0 +1,148 @@ +## Copyright (C) 2018 JuanPi Carbajal +## +## 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/>. + +############################################################ +## Test suite for pkg.m +## Tests are organized first by action, and then by options. +## All actions should be tested, and ideally all options are tested. +############################################################ + +%!shared old_prefix, old_archprefix, old_local_list, prefix, restorecfg, restorecache, rmtmpdir, mfile_pkg_name, mfile_pkg_zip +%! +%! ## Do all tests in a temporary directory +%! [old_prefix, old_archprefix] = pkg ("prefix"); +%! restorecfg = onCleanup (@() pkg ("prefix", old_prefix, old_archprefix)); +%! old_local_list = pkg ("local_list"); +%! restorecache = onCleanup (@() pkg ("local_list", old_local_list)); +%! prefix = tempname (); +%! [status] = mkdir (prefix); +%! if (! status) +%! error ("pkg.tst: Could not create temporary directory for pkg testing"); +%! return; # abort further testing +%! endif +%! pkg ("prefix", prefix, prefix); +%! pkg ("local_list", fullfile (prefix, "octave_packages")); +%! rmtmpdir = @onCleanup (@() confirm_recursive_rmdir (0, "local") && rmdir (prefix, "s")); +%! +%! ## Create zip file packages of testing directories in prefix directory +%! mfile_pkg_name = {"mfile_basic_test", "mfile_minimal_test"}; +%! mfile_pkg_zip = fullfile (prefix, strcat (mfile_pkg_name, ".zip")); +%! for i = 1:numel (mfile_pkg_name) +%! zip (mfile_pkg_zip{i}, mfile_pkg_name{i}); +%! endfor + +## Avoids printing to stdout when installing +%!function silent_pkg_install (varargin) +%! evalc (["pkg install", sprintf(" %s", varargin{:})]); +%!endfunction + +## Action install/uninstall +%!test +%! for i = 1:numel (mfile_pkg_name) +%! silent_pkg_install (mfile_pkg_zip{i}); +%! pkg ("uninstall", mfile_pkg_name{i}); +%! endfor +%! +%!error pkg ("install", "nonexistent.zip") + +# -local +%!test +%! for i = 1:numel (mfile_pkg_name) +%! silent_pkg_install ("-local", mfile_pkg_zip{i}); +%! pkg ("uninstall", mfile_pkg_name{i}); +%! endfor + +# -forge (need check for options?) +## FIXME: Need test +# We do not test this yet ... fails if no internet connection +# use dataframe which is an mfile only package +#%!test +#%! silent_pkg_install ("-forge", "dataframe"); +#%! pkg ("uninstall", "dataframe"); + +# -nodeps +## FIXME: Need test + +# -verbose +## FIXME: Need test + +## Action load/unload (within install/uninstall) +%!test +%! for i = 1:numel (mfile_pkg_name) +%! name = mfile_pkg_name{i}; +%! silent_pkg_install ("-local", mfile_pkg_zip{i}); +%! unwind_protect +%! pkg ("load", name); +%! pkg ("unload", name); +%! unwind_protect_cleanup +%! pkg ("uninstall", name); +%! end_unwind_protect +%! endfor +%! +%!error <package foobar is not installed> pkg ("load", "foobar"); + +# -nodeps +## FIXME: Need test + +# -verbose +## FIXME: Need test + +## Action list +%!test +%! [user_packages, system_packages] = pkg ("list"); + +# -forge +#%!test +#%! oct_forge_pkgs = pkg ("list", "-forge"); + +## Action describe +%!test +%! silent_pkg_install ("-local", mfile_pkg_zip{1}); +%! [desc, flag] = pkg ("describe", mfile_pkg_name{1}); +%! ## FIXME: this only tests that the describe command runs, +%! ## not that the output is in anyway correct. +%! pkg ("uninstall", mfile_pkg_name{1}); + +# -verbose +## FIXME: Need test + +## Action prefix +%!test +%! pfx_old = pkg ("prefix"); +%! unwind_protect +%! pfx_new = pkg ("prefix", pwd ()); +%! assert (pfx_new, pwd ()); +%! unwind_protect_cleanup +%! pfx = pkg ("prefix", pfx_old); +%! end_unwind_protect + +## Action build +## FIXME: Need test +# pkg build -verbose /tmp image-* + +## Action rebuild +## FIXME: Need test +# pkg rebuild signal + +## Future commands +%!error pkg ("whereis", "myfunc.m") +%!error pkg ("whereis", "-forge", "myfunc.m") + +############################################################ +## End of Tests +############################################################