Mercurial > octave
changeset 24941:cc55705f1f84
maint: merge stable to default.
| author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
|---|---|
| date | Wed, 21 Mar 2018 16:27:11 +0100 |
| parents | ecb5688b875f (current diff) 7edf1fb1d4b2 (diff) |
| children | 13edbb760108 |
| files | configure.ac |
| diffstat | 15 files changed, 56 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Mar 19 14:38:04 2018 -0700 +++ b/configure.ac Wed Mar 21 16:27:11 2018 +0100 @@ -172,9 +172,11 @@ ## Where Octave will search for fallback font files shipped with distribution. OCTAVE_SET_DEFAULT([octfontsdir], '${datadir}/octave/${version}/fonts') + ## Where Octave will look for startup files. OCTAVE_SET_DEFAULT([startupfiledir], '${fcnfiledir}/startup') OCTAVE_SET_DEFAULT([localstartupfiledir], '${localfcnfiledir}/startup') + ## Where Octave will look for man and info files. OCTAVE_SET_DEFAULT([man1dir], '${mandir}/man1') OCTAVE_SET_DEFAULT([man1ext], '.1') @@ -2906,6 +2908,7 @@ AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) ### Determine whether Mercurial ID should be embedded in library binaries. + ENABLE_HG_ID=yes AC_ARG_ENABLE([hg-id], [AS_HELP_STRING([--disable-hg-id],
--- a/doc/interpreter/module.mk Mon Mar 19 14:38:04 2018 -0700 +++ b/doc/interpreter/module.mk Wed Mar 21 16:27:11 2018 +0100 @@ -205,7 +205,7 @@ $(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) $(srcdir)/%reldir%/prepare_qhelp.py $(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \ $(PYTHON) $(srcdir)/%reldir%/prepare_qhelp.py %reldir%/octave_interpreter octave.html && \ - $(QCOLLECTIONGENERATOR) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \ + $(QCOLLECTIONGENERATOR) $(QCOLLECTIONGENERATORFLAGS) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \ rm -f %reldir%/octave_interpreter.qhcp %reldir%/octave_interpreter.qhp ## The Qt help collection generator command produces two output files
--- a/libinterp/corefcn/__gammainc__.cc Mon Mar 19 14:38:04 2018 -0700 +++ b/libinterp/corefcn/__gammainc__.cc Wed Mar 21 16:27:11 2018 +0100 @@ -29,7 +29,7 @@ #include "defun.h" #include "fNDArray.h" -DEFUN (__gammainc__, args, , +DEFUN (__gammainc__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{y} =} __gammainc__ (@var{x}, @var{a}) Continued fraction for incomplete gamma function.
--- a/libinterp/corefcn/file-io.cc Mon Mar 19 14:38:04 2018 -0700 +++ b/libinterp/corefcn/file-io.cc Wed Mar 21 16:27:11 2018 +0100 @@ -2649,7 +2649,7 @@ @deftypefn {} {@var{msg} =} ferror (@var{fid}) @deftypefnx {} {[@var{msg}, @var{err}] =} ferror (@var{fid}) @deftypefnx {} {[@dots{}] =} ferror (@var{fid}, "clear") -Query the error status of the stream specified by file descriptor @var{fid} +Query the error status of the stream specified by file descriptor @var{fid}. If an error condition exists then return a string @var{msg} describing the error. Otherwise, return an empty string @qcode{""}.
--- a/libinterp/corefcn/symscope.h Mon Mar 19 14:38:04 2018 -0700 +++ b/libinterp/corefcn/symscope.h Wed Mar 21 16:27:11 2018 +0100 @@ -531,33 +531,42 @@ private: - // Name for this scope (usually the corresponding filename of the - // function corresponding to the scope). + //! Name for this scope (usually the corresponding filename of the + //! function corresponding to the scope). + std::string m_name; - // Map from symbol names to symbol info. + //! Map from symbol names to symbol info. + std::map<std::string, symbol_record> m_symbols; - // Map from symbol names to subfunctions. + //! Map from symbol names to subfunctions. + std::map<std::string, octave_value> m_subfunctions; - // The list of subfunctions (if any) in the order they appear in - // the function file. + //! The list of subfunctions (if any) in the order they appear in + //! the function file. + std::list<std::string> m_subfunction_names; - // The associated user code (may be null). + //! The associated user code (may be null). + octave_user_function *m_fcn; - // Parent of nested function (may be null). + //! Parent of nested function (may be null). + std::weak_ptr<symbol_scope_rep> m_parent; - // Child nested functions. + //! Child nested functions. + std::vector<symbol_scope> m_children; - // If true, then this scope belongs to a nested function. + //! If true, then this scope belongs to a nested function. + bool m_is_nested; - // If true then no variables can be added. + //! If true then no variables can be added. + bool m_is_static; symbol_record::context_id m_context;
--- a/m4/acinclude.m4 Mon Mar 19 14:38:04 2018 -0700 +++ b/m4/acinclude.m4 Wed Mar 21 16:27:11 2018 +0100 @@ -1955,8 +1955,8 @@ UICFLAGS= RCCFLAGS= LRELEASEFLAGS= + QCOLLECTIONGENERATORFLAGS= QHELPGENERATORFLAGS= - QCOLLECTIONGENERATORFLAGS= $as_unset ac_cv_prog_MOC_QTVER $as_unset ac_cv_prog_ac_ct_MOC_QTVER $as_unset ac_cv_prog_UIC_QTVER @@ -1965,6 +1965,8 @@ $as_unset ac_cv_prog_ac_ct_RCC_QTVER $as_unset ac_cv_prog_LRELEASE_QTVER $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER + $as_unset ac_cv_prog_QCOLLECTIONGENERATOR_QTVER + $as_unset ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER $as_unset ac_cv_prog_QHELPGENERATOR_QTVER $as_unset ac_cv_prog_ac_ct_QHELPGENERATOR_QTVER fi @@ -2057,6 +2059,8 @@ AC_SUBST(UICFLAGS) AC_SUBST(RCCFLAGS) AC_SUBST(LRELEASEFLAGS) + AC_SUBST(QCOLLECTIONGENERATORFLAGS) + AC_SUBST(QHELPGENERATORFLAGS) AC_SUBST(QT_CPPFLAGS) AC_SUBST(QT_LDFLAGS) AC_SUBST(QT_LIBS)
--- a/scripts/help/__unimplemented__.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/help/__unimplemented__.m Wed Mar 21 16:27:11 2018 +0100 @@ -466,15 +466,15 @@ "digits", "dilog", "dirac", "divisors", "dsolve", "ei", ... "ellipticCE", "ellipticCK", "ellipticCPi", "ellipticE", ... "ellipticF", "ellipticK", "ellipticPi", "euler", "eulergamma", ... - "finverse", "formula", "fresnelc", "fresnels", "funtool", ... - "gegenbauerC", "harmonic", "heaviside", "hermiteH", "hypergeom", ... - "igamma", "jacobiP", "kroneckerDelta", "kummerU", "laguerreL", ... - "legendreP", "logint", "minpoly", "pochhammer", "poles", ... - "poly2sym", "polylog", "pretty", "quorem", "rectangularPulse", ... - "signIm", "simplify", "sinhint", "sinint", "solve", "ssinint", ... - "sym", "sym2poly", "symfun", "sympref", "syms", "symvar", ... - "triangularPulse", "vpa", "vpasolve", "whittakerM", "whittakerW", ... - "zeta"} + "expand", "finverse", "formula", "fresnelc", "fresnels", ... + "funtool", "gegenbauerC", "harmonic", "heaviside", "hermiteH", ... + "hypergeom", "igamma", "jacobiP", "kroneckerDelta", "kummerU", ... + "laguerreL", "legendreP", "logint", "minpoly", "pochhammer", ... + "poles", "poly2sym", "polylog", "pretty", "quorem", ... + "rectangularPulse", "signIm", "simplify", "sinhint", "sinint", ... + "solve", "ssinint", "sym", "sym2poly", "symfun", "sympref", ... + "syms", "symvar", "triangularPulse", "vpa", "vpasolve", ... + "whittakerM", "whittakerW", "zeta"} classes = {"sym", "symfun"}; txt = check_package (fcn, "symbolic", classes); @@ -717,7 +717,6 @@ "events", "exceltime", "Execute", - "expand", "export2wsdlg", "exportsetupdlg", "extractAfter", @@ -759,7 +758,6 @@ "FunctionTestCase", "functiontests", "funm", - "gammaincinv", "gather", "gcmr", "geobubble",
--- a/scripts/pkg/pkg.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/pkg/pkg.m Wed Mar 21 16:27:11 2018 +0100 @@ -39,7 +39,7 @@ ## @end example ## ## @noindent -## installs the package found in the file @file{image-1.0.0.tar.gz}. The +## installs the package found in the file @file{image-1.0.0.tar.gz}. The ## file containing the package can be an url, e.g. ## ## @example @@ -48,7 +48,7 @@ ## ## @noindent ## installs the package found in the given url. This -## requires an internet connection and the cURL library. +## requires an internet connection and the cURL library. ## ## @noindent ## @emph{Security risk}: no verification of the package is performed @@ -57,8 +57,8 @@ ## ## @noindent ## @emph{No support}: the GNU Octave community is not responsible for -## packages installed from foreign sites. For support or for -## reporting bugs you need to contact the maintainers of the installed +## packages installed from foreign sites. For support or for +## reporting bugs you need to contact the maintainers of the installed ## package directly (see the @file{DESCRIPTION} file of the package) ## ## The @var{option} variable can contain options that affect the manner @@ -421,7 +421,7 @@ for file_idx = find (external_files_mask) - warning ('Octave:security', + warning ('Octave:security', ['You are installing from an unofficial source.\n' ... 'The GNU Octave community is not responsible' ... ' for the content of this package.\n' ...
--- a/scripts/plot/draw/hist.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/plot/draw/hist.m Wed Mar 21 16:27:11 2018 +0100 @@ -334,7 +334,7 @@ %! hf = figure ("visible", "off"); %! hax = gca; %! unwind_protect -%! fail ("hist (hax, 1, [2 1 0])", "warning", "bin values X not sorted"); +%! fail ("hist (hax, 1, [2 1 0])", "warning", "bin values X not sorted"); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect
--- a/scripts/plot/draw/rectangle.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/plot/draw/rectangle.m Wed Mar 21 16:27:11 2018 +0100 @@ -52,8 +52,8 @@ ## ## The optional return value @var{h} is a graphics handle to the created ## rectangle object. +## @seealso{patch, line, cylinder, ellipsoid, sphere} ## @end deftypefn -## @seealso{patch, line, cylinder, ellipsoid, sphere} function h = rectangle (varargin)
--- a/scripts/set/intersect.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/set/intersect.m Wed Mar 21 16:27:11 2018 +0100 @@ -35,8 +35,8 @@ ## If requested, return index vectors @var{ia} and @var{ib} such that ## @code{@var{c} = @var{a}(@var{ia})} and @code{@var{c} = @var{b}(@var{ib})}. ## +## @seealso{unique, union, setdiff, setxor, ismember} ## @end deftypefn -## @seealso{unique, union, setdiff, setxor, ismember} function [c, ia, ib] = intersect (a, b, varargin)
--- a/scripts/sparse/svds.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/sparse/svds.m Wed Mar 21 16:27:11 2018 +0100 @@ -88,8 +88,8 @@ ## @code{svds} is best for finding only a few singular values from a large ## sparse matrix. Otherwise, @code{svd (full (@var{A}))} will likely be more ## efficient. +## @seealso{svd, eigs} ## @end deftypefn -## @seealso{svd, eigs} function [u, s, v, flag] = svds (A, k, sigma, opts)
--- a/scripts/specfun/gammainc.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/specfun/gammainc.m Wed Mar 21 16:27:11 2018 +0100 @@ -68,7 +68,7 @@ ## @math{gamma(a+1)*exp(x)/(x^a)}. ## @end ifnottex ## If @var{tail} is @qcode{"scaledupper"}, then the upper incomplete gamma -## function is divided by the same quantity. +## function is multiplied by the same quantity. ## ## References: ## @@ -77,7 +77,7 @@ ## @nospell{Dover publications, Inc.}, 1972. ## ## @nospell{W. Gautschi}, -## @cite{A computational procedure for incomplete gamma functions}, +## @cite{A computational procedure for incomplete gamma functions}, ## @nospell{ACM Trans. Math Software}, pp. 466--481, Vol 5, No. 4, 2012. ## ## @nospell{W. H. Press, S. A. Teukolsky, W. T. Vetterling, and B. P. Flannery}, @@ -100,7 +100,7 @@ error ("gammainc: X and A must be of common size or scalars"); endif - if (iscomplex (x) || iscomplex (a)) + if (iscomplex (x) || iscomplex (a)) error ("gammainc: all inputs must be real"); endif @@ -242,7 +242,7 @@ ## x == 0, a == 0. function y = gammainc_00 (tail) - if ((strcmp (tail, "upper")) || (strcmp (tail, "scaledupper"))) + if (strcmp (tail, "upper") || strcmp (tail, "scaledupper")) y = 0; else y = 1; @@ -464,7 +464,7 @@ ## Test: case 8 %!assert (gammainc (-10, 10), 3.112658265341493126871617e7, -2*eps) -## Matlab fails this next one%! %! +## Matlab fails this next one%! %! %!assert (isreal (gammainc (-10, 10)), true) %!assert (gammainc (-10, 10.1, "upper"), ... %! -2.9582761911890713293e7-1i * 9.612022339061679758e6, -30*eps) @@ -473,7 +473,7 @@ %!assert (gammainc (-10, 10, "scaledlower"), 0.5128019364747265, -1e-14); %!assert (gammainc (-10, 10, "scaledupper"), -0.5128019200000000, -1e-14); %!assert (gammainc (200, 201, "upper"), 0.518794309678684497, -2 * eps); -%!assert (gammainc (200, 201, "scaledupper"), +%!assert (gammainc (200, 201, "scaledupper"), %! 18.4904360746560462660798514, -eps) ## Here we are very good (no D (x,a)) involved %!assert (gammainc(1000, 1000.5, "scaledlower"), 39.48467539583672271, -2*eps)
--- a/scripts/statistics/corrcoef.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/statistics/corrcoef.m Wed Mar 21 16:27:11 2018 +0100 @@ -292,4 +292,3 @@ %!error <"alpha" must be a number between 0 and 1> corrcoef (1,2, "alpha", 2) %!error <"rows" must be "all"...> corrcoef (1,2, "rows", "foobar") %!error <Unknown option "foobar"> corrcoef (1,2, "foobar", 1) -%!error <Unknown option "foobar"> corrcoef (1,2, "foobar", 1)
--- a/scripts/statistics/zscore.m Mon Mar 19 14:38:04 2018 -0700 +++ b/scripts/statistics/zscore.m Wed Mar 21 16:27:11 2018 +0100 @@ -21,7 +21,7 @@ ## @deftypefnx {} {@var{z} =} zscore (@var{x}, @var{opt}) ## @deftypefnx {} {@var{z} =} zscore (@var{x}, @var{opt}, @var{dim}) ## @deftypefnx {} {[@var{z}, @var{mu}, @var{sigma}] =} zscore (@dots{}) -## Compute the Z score of @var{x} +## Compute the Z score of @var{x}. ## ## If @var{x} is a vector, subtract its mean and divide by its standard ## deviation. If the standard deviation is zero, divide by 1 instead.