Mercurial > octave
changeset 28344:40024b83597c
maint: merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 22 May 2020 11:06:58 +0200 |
| parents | b95dbd889f1a (diff) 8b71a6cec9bf (current diff) |
| children | d73e4749d8dd |
| files | |
| diffstat | 215 files changed, 7999 insertions(+), 4281 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Wed May 06 10:05:36 2020 +0200 +++ b/NEWS Fri May 22 11:06:58 2020 +0200 @@ -1,251 +1,117 @@ -Summary of important user-visible changes for version 6 (yyyy-mm-dd): +Summary of important user-visible changes for version 7 (yyyy-mm-dd): ---------------------------------------------------------------------- ### General improvements -- The `intersect`, `setdiff`, `setxor`, `union`, and `unique` functions - accept a new sorting option `"stable"` which will return output values - in the same order as the input, rather than in ascending order. - -- Complex RESTful web services can now be accessed by the `webread` and - `webwrite` functions alongside with the `weboptions` structure. One - major feature is the support for cookies to enable RESTful - communication with the web service. - - Additionally, the system web browser can be opened by the `web` function. - -- The `linspace` function now produces symmetrical sequences when the - endpoints are symmetric. This is more intuitive and also compatible - with recent changes made in Matlab R2019b. +- Many functions in Octave can be called in a command form---no +parentheses for invocation and no return argument assignment---or in a +functional form---parentheses and '=' for assignment of return values. -- The underlying algorithm of the `rand` function has been changed. - For single precision outputs, the algorithm has been fixed so that it - produces values strictly in the range (0, 1). Previously, it could - occasionally generate the right endpoint value of 1 (See bug #41742). - In addition, the new implementation uses a uniform interval between - floating point values in the range (0, 1) rather than targeting a - uniform density (# of random integers / length along real number - line). + Command Form Example -- Numerical integration has been improved. The `quadv` function has - been re-written so that it can compute integrands of periodic - functions. At the same time, performance is better with ~3.5X fewer - function evaluations required. A bug in `quadgk` that caused complex - path integrals specified with `"Waypoints"` to occasionally be - calculated in the opposite direction was fixed. + `mkdir new_directory` -- The `edit` function option `"editinplace"` now defaults to `true` and - the option `"home"` now defaults to the empty matrix `[]`. Files will - no longer be copied to the user's HOME directory for editing. The old - behavior can be restored by setting `"editinplace"` to `false` and - `"home"` to `"~/octave"`. + Function Form Example -- The `format` command supports two new options: `uppercase` and - `lowercase` (default). With the default, print a lowercase 'e' for - the exponent character in scientific notation and lowercase 'a-f' for - the hex digits representing 10-15. With `uppercase`, print 'E' and - 'A-F' instead. The previous uppercase formats, `E` and `G`, no longer - control the case of the output. - - Additionally, the `format` command can be called with multiple options - for controlling the format, spacing, and case in arbitrary order. - For example: + `status = mkdir ("new_directory")` - format long e uppercase loose - - Note, in the case of multiple competing format options the rightmost - one is used, and, in case of an error, the previous format remains - unchanged. - -- L-value references (e.g., increment (++), decrement (--), and all - in-place assignment operators (+=, -=, *=, /=, etc.)) are no longer - allowed in anonymous functions. - -- New warnings have been added about questionable uses of the colon ':' - range operator. Each has a new warning ID so that it can be disabled - if desired. - - > `Octave:colon-complex-argument` : when any arg is complex - > `Octave:colon-nonscalar-argument` : when any arg is non-scalar + Octave now handles errors that occur in a consistent manner. If + called in command form and there is a failure, an error is thrown + and a message printed. If called in functional form, no error or + message is printed and the failure is communicated to the programmer + via the output status variable. -- The `regexp` and related functions now correctly handle and *require* - strings in UTF-8 encoding. As with any other function that requires - strings to be encoded in Octave's native encoding, you can use - `native2unicode` to convert from your preferred locale. For example, - the copyright symbol in UTF-8 is `native2unicode (169, "latin1")`. - -- The startup file `octaverc` now can be located in the platform - dependent location for user local configuration files (e.g. - ${XDG_CONFIG_HOME}/octave/octaverc on Unix-like operating systems or - %APPDATA%\octave\octaverc on Windows). - -- `pkg describe` now lists dependencies and inverse dependencies - (i.e., other installed packages that depend on the package in - question). - -- When unloading a package, `pkg` now checks if any remaining loaded - packages depend on the one to be removed. If this is the case `pkg` - aborts with an explanatory error message. This behavior can be - overridden with the `-nodeps` option. - -#### Graphics backend - -- The use of Qt4 for graphics and the GUI is deprecated in Octave - version 6 and no further bug fixes will be made. Qt4 support will be - removed completely in Octave version 7. - -- The `legend` function has been entirely rewritten. This fixes a - number of historical bugs, but also implements new properties such as - `"AutoUpdate"` and `"NumColumns"`. The gnuplot toolkit---which is no - longer actively maintained---still uses the old legend function. - -- The `axis` function was updated which resolved 10 bugs affecting - axes to which `"equal"` had been applied. + The following list of functions have been modified. -- Graphic primitives now accept a color property value of `"none"` - which is useful when a particular primitive needs to be hidden - (for example, the Y-axis of an axes object with `"ycolor" = "none"`) - without hiding the entire primitive `"visibility" = "off"`. - -- A new property `"FontSmoothing"` has been added to text and axes - objects that controls whether anti-aliasing is used during the - rendering of characters. The default is `"on"` which produces smooth, - more visually appealing text. - -- The figure property `"windowscrollwheelfcn"`is now implemented. - This makes it possible to provide a callback function to be executed - when users manipulate the mouse wheel on a given figure. - -- The figure properties `"pointer"`, `"pointershapecdata"`, and - `"pointershapehotspot"` are now implemented. This makes it possible - to change the shape of the cursor (pointer in Matlab-speak) displayed - in a plot window. + * `copyfile` + * `fcntl` + * `fileattrib` + * `kill` + * `link` + * `mkfifo` + * `movefile` + * `rename` + * `rmdir` + * `symlink` + * `unlink` -- The figure property `"paperpositionmode"` now has the default `"auto"` - rather than `"manual"`. This change is more intuitive and is - Matlab compatible. - -- The appearance of patterned lines `"LineStyle" = ":"|"--"|"-."` has - been improved for small widths (`"LineWidth"` less than 1.5 pixels) - which is a common scenario. +### Graphics backend -- Printing to EPS files now uses a tight bounding box (`"-tight"` - argument to print) by default. This makes more sense for EPS - files which are normally embedded within other documents, and is - Matlab compatible. If necessary use the `"-loose"` option to - reproduce figures as they appeared in previous versions of Octave. - -- The following print devices are no longer officially supported: cdr, - corel, aifm, ill, cgm, hpgl, mf and dxf. A warning will be thrown - when using those devices, and the code for supporting those formats - will eventually be removed from a future version of Octave. - -- The placement of text subscripts and superscripts has been -re-engineered and now produces visually attractive results similar to -Latex. +- Support for Qt4 for graphics and the GUI has been removed. ### Matlab compatibility -- The function `unique` now returns column index vectors for the second - and third outputs. When duplicate values are present, the default - index to return is now the `"first"` occurrence. The previous Octave - behavior, or Matlab behavior from releases prior to R2012b, can be - obtained by using the `"legacy"` flag. +- The function `griddata` now implements the "v4" Biharmonic Spline +Interpolation method. In adddition, the function now accepts 3-D inputs +by passing the data to `griddata3`. -- The function `setdiff` with the `"rows"` argument now returns Matlab - compatible results. The previous Octave behavior, or Matlab behavior - from releases prior to R2012b, can be obtained by using the `"legacy"` - flag. - -- The functions `intersect`, `setxor`, and `union` now accept a - `"legacy"` flag which changes the index values (second and third - outputs) as well as the orientation of all outputs to match Matlab - releases prior to R2012b. +- Coordinate transformation functions `cart2sph`, `sph2cart`, +`cart2pol`, and `pol2cart` can now accept either row or column vectors +for coordinate inputs. A single coordinate matrix with one variable per +column can still be used as function input, but a single output variable +will now contain just the first output coordinate, and will no longer +return the full output coordinate matrix. Output size matches the +size of input vectors, or in the case of an input matrix will be column +vectors with rows corresponding to the input coordinate matrix. -- The function `streamtube` is Matlab compatible and plots tubes along - streamlines which are scaled by the vector field divergence. The - Octave-only extension `ostreamtube` can be used to visualize the flow - expansion and contraction of the vector field due to the local - crossflow divergence. - -- The interpreter now supports handles to nested functions. - -- The graphics properties `"LineWidth"` and `"MarkerSize"` are now - measured in points, *not* pixels. Compared to previous versions - of Octave, some lines and markers will appear 4/3 larger. +- The function `dec2bin` and `dec2hex` now support negative numbers. -- The meta.class property "SuperClassList" has been renamed - "Superclasslist" for Matlab compatibility. The original name will - exist as an alias until Octave version 8.1. +- `uicontrol` objects now fully implement the "Off" and "Inactive" +values of the "Enable" property. When the value is "Off", no +interaction with the object occurs and the `uicontrol` changes color +(typically to gray) to indicate it is disabled. When the value is +"Inactive", the object appears normally (no change in color), but it is +not possible to change the value of the object (such as modifying text +in an `Edit` box or clicking on a `RadioButton`). -- The function `javaaddpath` now prepends new directories to the - existing dynamic classpath by default. To append them instead, use - the new `"-end"` argument. Multiple directories may now be specified - in a cell array of strings. - -- An undocumented function `gui_mainfcn` has been added, for compatibility - with figures created with Matlab's GUIDE. - -- Several validator functions of type `mustBe*` have been added. See - the list of new functions below. +- The functions `scatter` and `scatter3` now return a handle to a scatter +graphics object. For compatibility, they return a hg group of patch +graphics objects when the "gnuplot" graphics toolkit is used. In +previous versions of Octave, these functions returned a hg group of patch +graphics objects for all graphics toolkits. -### Alphabetical list of new functions added in Octave 6 +- The function `saveas` now defaults to saving in Octave figure format +(.ofig) rather than PDF (.pdf). + +- The additional property "contextmenu" has been added to all graphics +objects. It is equivalent to the previously used "uicontextmenu" +property which is hidden now. -* `commandhistory` -* `commandwindow` -* `filebrowser` -* `is_same_file` -* `lightangle` -* `mustBeFinite` -* `mustBeGreaterThan` -* `mustBeGreaterThanOrEqual` -* `mustBeInteger` -* `mustBeLessThan` -* `mustBeLessThanOrEqual` -* `mustBeMember` -* `mustBeNegative` -* `mustBeNonempty` -* `mustBeNonNan` -* `mustBeNonnegative` -* `mustBeNonpositive` -* `mustBeNonsparse` -* `mustBeNonzero` -* `mustBeNumeric` -* `mustBeNumericOrLogical` -* `mustBePositive` -* `mustBeReal` -* `namedargs2cell` -* `newline` -* `ode23s` -* `ostreamtube` -* `rescale` -* `rotx` -* `roty` -* `rotz` -* `stream2` -* `stream3` -* `streamline` -* `streamtube` -* `uisetfont` -* `verLessThan` -* `web` -* `weboptions` -* `webread` -* `webwrite` -* `workspace` +- Additional properties have been added for the `axes` graphics object: + * "alphamap" (not yet implemented) + * "alphascale" (not yet implemented) + * "colorscale" (not yet implemented) + * "fontsizemode" (not yet implemented) + * "innerposition" (equivalent to "position") + * "interactions" (not yet implemented) + * "layout" (not yet implemented) + * "legend" (not yet implemented) + * "nextseriesindex" (read-only, used by `scatter` graphics objects) + * "positionconstraint" (replacement for "activepositionproperty" + which is now a hidden property. No plans for removal.) + * "toolbar" (not yet implemented) + * "xaxis" (not yet implemented) + * "yaxis" (not yet implemented) + * "zaxis" (not yet implemented) +### Alphabetical list of new functions added in Octave 7 + +* `getpixelposition` +* `endsWith` +* `rng` +* `startsWith` ### Deprecated functions and properties -The following functions and properties have been deprecated in Octave 6 -and will be removed from Octave 8 (or whatever version is the second -major release after 6): +The following functions and properties have been deprecated in Octave 7 +and will be removed from Octave 9 (or whatever version is the second +major release after 7): - Functions Function | Replacement -----------------------|------------------ - `runtests` | `oruntests` + | - Properties @@ -253,47 +119,31 @@ -----------------|---------------|------------ | | - ### Removed functions and properties -The following functions and properties were deprecated in Octave 4.4 -and have been removed from Octave 6. +The following functions and properties were deprecated in Octave 5 +and have been removed from Octave 7. - Functions - Function | Replacement - ---------------------|------------------ - `chop` | `sprintf` for visual results - `desktop` | `isguirunning` - `tmpnam` | `tempname` - `toascii` | `double` - `java2mat` | `__java2mat__` + Function | Replacement + -------------------------|------------------ + `output_max_field_width` | `output_precision` + `is_keyword` | `iskeyword` - Properties - Object | Property | Value - ---------------------|---------------------------|----------------------- - `annotation` | `edgecolor ("rectangle")` | - `axes` | `drawmode` | - `figure` | `doublebuffer` | - | `mincolormap` | - | `wvisual` | - | `wvisualmode` | - | `xdisplay` | - | `xvisual` | - | `xvisualmode` | - `line` | `interpreter` | - `patch` | `interpreter` | - `surface` | `interpreter` | - `text` | `fontweight` | `"demi"` and `"light"` - `uibuttongroup` | `fontweight` | `"demi"` and `"light"` - `uicontrol` | `fontweight` | `"demi"` and `"light"` - `uipanel` | `fontweight` | `"demi"` and `"light"` - `uitable` | `fontweight` | `"demi"` and `"light"` - + Object | Property | Value + -----------------|---------------|------------ + `text` | `fontangle` | `"oblique"` + `uibuttongroup` | `fontangle` | `"oblique"` + `uicontrol` | `fontangle` | `"oblique"` + `uipanel` | `fontangle` | `"oblique"` + `uitable` | `fontangle` | `"oblique"` ### Old release news +- [Octave 6.x](etc/NEWS.6) - [Octave 5.x](etc/NEWS.5) - [Octave 4.x](etc/NEWS.4) - [Octave 3.x](etc/NEWS.3)
--- a/bootstrap.conf Wed May 06 10:05:36 2020 +0200 +++ b/bootstrap.conf Fri May 22 11:06:58 2020 +0200 @@ -117,9 +117,12 @@ unictype/ctype-upper unictype/ctype-xdigit unistd + unistr/u16-to-u8 + unistr/u32-to-u8 unistr/u8-check unistr/u8-strmblen unistr/u8-strmbtouc + unistr/u8-to-u16 unistr/u8-to-u32 unlink unsetenv
--- a/configure.ac Wed May 06 10:05:36 2020 +0200 +++ b/configure.ac Fri May 22 11:06:58 2020 +0200 @@ -27,7 +27,7 @@ ### Initialize Autoconf AC_PREREQ([2.65]) -AC_INIT([GNU Octave], [6.0.1], [https://octave.org/bugs.html], [octave], +AC_INIT([GNU Octave], [7.0.0], [https://octave.org/bugs.html], [octave], [https://www.gnu.org/software/octave/]) ### Declare version numbers @@ -39,9 +39,9 @@ ## explains how to update these numbers for release and development ## versions. -OCTAVE_MAJOR_VERSION=6 +OCTAVE_MAJOR_VERSION=7 OCTAVE_MINOR_VERSION=0 -OCTAVE_PATCH_VERSION=1 +OCTAVE_PATCH_VERSION=0 dnl PACKAGE_VERSION is set by the AC_INIT VERSION argument. OCTAVE_VERSION="$PACKAGE_VERSION" @@ -63,7 +63,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-v54" +OCTAVE_API_VERSION="api-v54+" AC_SUBST(OCTAVE_MAJOR_VERSION) AC_SUBST(OCTAVE_MINOR_VERSION) @@ -536,20 +536,6 @@ AC_DEFINE_UNQUOTED(OCTAVE_IDX_TYPE, [$OCTAVE_IDX_TYPE], [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) -### Enable bounds checking on element references within Octave's array and -### matrix classes. -dnl This slows down some operations a bit, so it is turned off by default. - -ENABLE_BOUNDS_CHECK=no -AC_ARG_ENABLE([bounds-check], - [AS_HELP_STRING([--enable-bounds-check], - [OBSOLETE: use --enable-address-sanitizer-flags instead])], - [if test "$enableval" = yes; then ENABLE_BOUNDS_CHECK=yes; fi], []) -if test $ENABLE_BOUNDS_CHECK = yes; then - warn_bounds_check="--enable-bounds-check is obsolete; use --enable-address-sanitizer-flags instead" - OCTAVE_CONFIGURE_WARNING([warn_bounds_check]) -fi - ### Check for pthread library AX_PTHREAD @@ -1365,7 +1351,7 @@ [zlib.h], [gzclearerr]) ## Also define HAVE_ZLIB if libz is found. -if test -z "$warn_z"; then +if test -n "$Z_LIBS"; then AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.]) fi @@ -1604,7 +1590,7 @@ OCTAVE_CHECK_LIB(curl, cURL, [cURL library not found. The ftp objects, urlread, and urlwrite functions will be disabled.], [curl/curl.h], [curl_easy_escape]) -if test -z "$warn_curl"; then +if test -n "$CURL_LIBS"; then ## Additional check on cURL library that was found AC_CACHE_CHECK([for CURLOPT_DIRLISTONLY in curl/curl.h], [octave_cv_curl_has_curlopt_dirlistonly], @@ -1652,8 +1638,6 @@ [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], [if test x"$withval" = xno; then check_magick=no - warn_magick_disabled="--without-magick specified. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional." - OCTAVE_CONFIGURE_WARNING([warn_magick_disabled]) else magick="$withval" fi], [magick="GraphicsMagick"]) @@ -1765,8 +1749,6 @@ [don't use OpenGL libraries, disable OpenGL graphics])], [if test x"$withval" = xno; then check_opengl=no - warn_opengl_disabled="--without-opengl specified. OpenGL graphics will be disabled." - OCTAVE_CONFIGURE_WARNING([warn_opengl_disabled]) fi]) ## Check for OpenGL library @@ -1787,7 +1769,6 @@ [don't use FreeType library, OpenGL graphics will not be fully functional])], [if test x"$withval" = xno; then check_freetype=no - warn_freetype="--without-freetype specified. OpenGL graphics will not be fully functional." fi]) if test $check_freetype = yes; then @@ -1847,7 +1828,7 @@ ### GUI/Qt related tests. -QT_VERSIONS="5 4" +QT_VERSIONS="5" AC_ARG_WITH([qt], [AS_HELP_STRING([--with-qt=VER], [use the Qt major version VER]) @@ -1858,8 +1839,6 @@ ;; no) QT_VERSIONS= - warn_qt_disabled="--without-qt specified. The Qt GUI will be disabled." - OCTAVE_CONFIGURE_WARNING([warn_qt_disabled]) ;; *) QT_VERSIONS="$withval" @@ -1871,8 +1850,6 @@ [AS_HELP_STRING([--without-qscintilla], [disable QScintilla editor])], [if test x"$withval" = xno; then check_qscintilla=no - warn_qscintilla_disabled="--without-qscintilla specified. The GUI editor will be disabled." - OCTAVE_CONFIGURE_WARNING([warn_qscintilla_disabled]) fi]) OCTAVE_CHECK_QT([$QT_VERSIONS]) @@ -2026,7 +2003,7 @@ [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) ## Additional check to see if qrupdate lib found supports LU updates -if test -z "$warn_qrupdate"; then +if test -n "$QRUPDATE_LIBS"; then AC_CACHE_CHECK([for slup1up in $QRUPDATE_LIBS], [octave_cv_func_slup1up], [LIBS="$LIBS $QRUPDATE_LIBS" @@ -2124,7 +2101,7 @@ [cs${CXSPARSE_TAG}sqr], [C++], [don't use CXSparse library, disable some sparse matrix functionality]) -if test -z "$warn_cxsparse"; then +if test -n "$CXSPARSE_LIBS"; then ## Additional check for CXSparse version >= 2.2 if test $octave_cv_lib_cxsparse = yes; then OCTAVE_CHECK_CXSPARSE_VERSION_OK @@ -2217,50 +2194,56 @@ ### Check for SUNDIALS IDA library and header. -save_CPPFLAGS="$CPPFLAGS" -save_LDFLAGS="$LDFLAGS" -save_LIBS="$LIBS" -LIBS="$SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" -LDFLAGS="$SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" -CPPFLAGS="$SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" -OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS IDA], - [SUNDIALS IDA library not found. The solvers ode15i and ode15s will be disabled.], - [ida/ida.h ida.h], [IDAInit], - [], [don't use SUNDIALS IDA library, disable solvers ode15i and ode15s]) -CPPFLAGS="$save_CPPFLAGS" -LDFLAGS="$save_LDFLAGS" -LIBS="$save_LIBS" +if test -n "$SUNDIALS_NVECSERIAL_LIBS"; then + + save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + LIBS="$SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" + LDFLAGS="$SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" + CPPFLAGS="$SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" + OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS IDA], + [SUNDIALS IDA library not found. The solvers ode15i and ode15s will be disabled.], + [ida/ida.h ida.h], [IDAInit], + [], [don't use SUNDIALS IDA library, disable solvers ode15i and ode15s]) + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" +fi ### Check for SUNDIALS library features, some required, some optional. -CPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" -LDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" -LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" -if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida"; then - dnl Any of the following tests could determine that SUNDIALS is incompatible - dnl and should be disabled. In that event, they all populate the same - dnl variable with appropriate warning messages, and further tests should be - dnl skipped if a warning message has already been generated that SUNDIALS is - dnl disabled. - warn_sundials_disabled= - if test -z "$warn_sundials_disabled"; then - OCTAVE_CHECK_SUNDIALS_COMPATIBLE_API +if test -n "$SUNDIALS_IDA_LIBS" && test -n "$SUNDIALS_NVECSERIAL_LIBS"; then + + CPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" + LDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" + LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" + if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida"; then + dnl Any of the following tests could determine that SUNDIALS is incompatible + dnl and should be disabled. In that event, they all populate the same + dnl variable with appropriate warning messages, and further tests should be + dnl skipped if a warning message has already been generated that SUNDIALS is + dnl disabled. + warn_sundials_disabled= + if test -z "$warn_sundials_disabled"; then + OCTAVE_CHECK_SUNDIALS_COMPATIBLE_API + fi + if test -z "$warn_sundials_disabled"; then + OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE + fi + if test -z "$warn_sundials_disabled"; then + OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE + fi + dnl The following tests determine whether certain optional features are + dnl present in the SUNDIALS libraries, but will not disable using SUNDIALS. + if test -z "$warn_sundials_disabled"; then + OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU + fi fi - if test -z "$warn_sundials_disabled"; then - OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE - fi - if test -z "$warn_sundials_disabled"; then - OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE - fi - dnl The following tests determine whether certain optional features are - dnl present in the SUNDIALS libraries, but will not disable using SUNDIALS. - if test -z "$warn_sundials_disabled"; then - OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU - fi + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" fi -CPPFLAGS="$save_CPPFLAGS" -LDFLAGS="$save_LDFLAGS" -LIBS="$save_LIBS" dnl Define this way instead of with an #if in oct-conf-post.h so that dnl the build features script will get the correct value. @@ -2269,36 +2252,36 @@ dnl How can we do a better job here? Do we need to disable sundials dnl any tests fail, or can we fix __ode15__.cc so that it still partially dnl works when some things are missing (for example, KLU)? -if test -n "$SUNDIALS_IDA_LIBS" \ - && test -n "$SUNDIALS_NVECSERIAL_LIBS" \ - && test "x$octave_cv_sundials_sunlinsol_dense" = xyes \ - && test "x$octave_cv_sundials_realtype_is_double" = xyes \ - && test "x$octave_have_sundials_compatible_api" = xyes; then - AC_DEFINE(HAVE_SUNDIALS, 1, [Define to 1 if SUNDIALS is available.]) - - ## Collections of options needed to build with SUNDIALS and its dependencies. - SUNDIALS_XCPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_SUNLINSOLKLU_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS" - SUNDIALS_XLDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_SUNLINSOLKLU_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS" - SUNDIALS_XLIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_SUNLINSOLKLU_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS" -else - SUNDIALS_IDA_CPPFLAGS= - SUNDIALS_IDA_LDFLAGS= - SUNDIALS_IDA_LIBS= - SUNDIALS_SUNLINSOLKLU_CPPFLAGS= - SUNDIALS_SUNLINSOLKLU_LDFLAGS= - SUNDIALS_SUNLINSOLKLU_LIBS= - SUNDIALS_NVECSERIAL_CPPFLAGS= - SUNDIALS_NVECSERIAL_LDFLAGS= - SUNDIALS_NVECSERIAL_LIBS= - SUNDIALS_XCPPFLAGS= - SUNDIALS_XLDFLAGS= - SUNDIALS_XLIBS= - dnl Emit a fallback warning message in case SUNDIALS has been disabled for - dnl some reason that hasn't already generated one of these known warnings. - if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida" \ - && test -z "$warn_sundials_disabled"; then - warn_sundials_disabled="SUNDIALS libraries are missing some feature. The solvers ode15i and ode15s will be disabled." - OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) +if test -n "$SUNDIALS_IDA_LIBS" && test -n "$SUNDIALS_NVECSERIAL_LIBS"; then + if test "x$octave_cv_sundials_sunlinsol_dense" = xyes \ + && test "x$octave_cv_sundials_realtype_is_double" = xyes \ + && test "x$octave_have_sundials_compatible_api" = xyes; then + AC_DEFINE(HAVE_SUNDIALS, 1, [Define to 1 if SUNDIALS is available.]) + + ## Options needed to build with SUNDIALS and its dependencies. + SUNDIALS_XCPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_SUNLINSOLKLU_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS" + SUNDIALS_XLDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_SUNLINSOLKLU_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS" + SUNDIALS_XLIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_SUNLINSOLKLU_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS" + else + SUNDIALS_IDA_CPPFLAGS= + SUNDIALS_IDA_LDFLAGS= + SUNDIALS_IDA_LIBS= + SUNDIALS_SUNLINSOLKLU_CPPFLAGS= + SUNDIALS_SUNLINSOLKLU_LDFLAGS= + SUNDIALS_SUNLINSOLKLU_LIBS= + SUNDIALS_NVECSERIAL_CPPFLAGS= + SUNDIALS_NVECSERIAL_LDFLAGS= + SUNDIALS_NVECSERIAL_LIBS= + SUNDIALS_XCPPFLAGS= + SUNDIALS_XLDFLAGS= + SUNDIALS_XLIBS= + dnl Emit a fallback warning message in case SUNDIALS has been disabled for + dnl some reason that hasn't already generated one of these known warnings. + if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida" \ + && test -z "$warn_sundials_disabled"; then + warn_sundials_disabled="SUNDIALS libraries are missing some feature. The solvers ode15i and ode15s will be disabled." + OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) + fi fi fi @@ -2319,7 +2302,7 @@ OCTAVE_CHECK_LIB_ARPACK_OK_1( [AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], [warn_arpack="ARPACK library found, but does not seem to work properly; disabling eigs function"]) - if test -z "$warn_arpack"; then + if test -n "$ARPACK_LIBS"; then OCTAVE_CHECK_LIB_ARPACK_OK_2([], [AC_MSG_WARN([ARPACK library found, but is buggy; upgrade library (>= v3.3.0) for better results])]) fi @@ -2997,7 +2980,7 @@ libgui/mk-default-qt-settings.sh liboctave/external/mk-f77-def.sh liboctave/mk-version-h.sh - libinterp/corefcn/mk-mxarray-h.sh + libinterp/corefcn/mk-mxtypes-h.sh build-aux/subst-config-vals.sh build-aux/subst-cross-config-vals.sh build-aux/subst-script-vals.sh])
--- a/doc/interpreter/contributors.in Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/contributors.in Fri May 22 11:06:58 2020 +0200 @@ -89,6 +89,7 @@ Paul Eggert Stephen Eglen Peter Ekberg +Abdallah K. Elshamy Garrett Euler Edmund Grimley Evans Rolf Fabian
--- a/doc/interpreter/genpropdoc.m Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/genpropdoc.m Fri May 22 11:06:58 2020 +0200 @@ -39,9 +39,10 @@ function genpropdoc (objname, fname) objnames = {"root", "figure", "axes", ... - "image", "light", "line", "patch", "surface", "text", ... - "uibuttongroup", "uicontextmenu", "uicontrol", "uipanel", ... - "uimenu", "uipushtool", "uitable", "uitoggletool" "uitoolbar" + "image", "light", "line", "patch", "scatter", "surface", ... + "text", "uibuttongroup", "uicontextmenu", "uicontrol", ... + "uipanel", "uimenu", "uipushtool", "uitable", ... + "uitoggletool", "uitoolbar" }; ## Base properties @@ -165,6 +166,11 @@ s.doc = "If __prop__ is @qcode{\"on\"}, the __objname__ is \ clipped in its parent axes limits."; + case "contextmenu" + s.doc = "Graphics handle of the uicontextmenu object that is \ +currently associated to this __objname__ object."; + s.valid = valid_handle; + case "createfcn" s.doc = "Callback function executed immediately after __objname__ \ has been created. Function is set by using default property on root object, \ @@ -224,11 +230,6 @@ s.valid = valid_string; s.printdefault = false; - case "uicontextmenu" - s.doc = "Graphics handle of the uicontextmenu object that is \ -currently associated to this __objname__ object."; - s.valid = valid_handle; - case "userdata" s.doc = "User-defined data to associate with the graphics object."; s.valid = "Any Octave data"; @@ -653,12 +654,6 @@ s.doc = doc_unused; ## Specific properties - case "activepositionproperty" - s.doc = "Specify which of @qcode{\"position\"} or \ -@qcode{\"outerposition\"} properties takes precedence when axes \ -annotations extent changes. @xref{XREFaxesposition, , @w{position property}}, \ -and @ref{XREFaxesposition, , @w{outerposition property}}."; - case "alim" s.doc = sprintf (doc_notimpl, "Transparency"); @@ -765,6 +760,11 @@ case "gridlinestyle" + case "innerposition" + s.doc = "The @qcode{\"innerposition\"} property is the same as the \ +@ref{XREFaxesposition, , @w{@qcode{\"position\"} property}}."; + s.valid = valid_4elvec; + case "labelfontsizemultiplier" s.doc = "Ratio between the x/y/zlabel fontsize and the tick \ label fontsize"; @@ -833,6 +833,13 @@ @xref{XREFaxesouterposition, , @w{outerposition property}}."; s.valid = valid_4elvec; + case "positionconstraint" + s.doc = "Specify which of @qcode{\"innerposition\"} or \ +@qcode{\"outerposition\"} properties takes precedence when axes \ +annotations extent changes. \ +@xref{XREFaxesinnerposition, , @w{@qcode{\"innerposition\"} property}}, \ +and @ref{XREFaxesouterposition, , @w{@qcode{\"outerposition\"} property}}."; + case "projection" s.doc = doc_unused; @@ -1529,6 +1536,117 @@ endswitch + ## Scatter properties + elseif (strcmp (objname, "scatter")) + switch (field) + ## Overridden shared properties + case "children" + s.doc = doc_unused; + + ## Specific properties + case "cdatamode" + s.doc = "If @code{cdatamode} is @qcode{\"auto\"}, @code{cdata} is set \ +to the color from the @code{colororder} of the ancestor axes corresponding to \ +the @code{seriesindex}."; + + case "cdatasource" + s.doc = sprintf (doc_notimpl, "Data from workspace variables"); + + case "cdata" + s.doc = "Data defining the scatter object color.\n\ +\n\ +If @code{cdata} is a scalar index into the current colormap or a RGB triplet, \ +it defines the color of all scatter markers.\n\ +\n\ +If @code{cdata} is an N-by-1 vector of indices or an N-by-3 (RGB) matrix, \ +it defines the color of each one of the N scatter markers."; + s.valid = valid_scalmat; + + + case "displayname" + s.doc = "Text of the legend entry corresponding to this scatter object."; + + case "linewidth" + s.doc = "Line width of the edge of the markers."; + + case "marker" + s.doc = "@xref{XREFlinemarker, , @w{line marker property}}."; + + case "markeredgealpha" + s.doc = "Transparency level of the faces of the markers where a \ +value of 0 means complete transparency and a value of 1 means solid faces \ +without transparency. Note that the markers are not sorted from back to \ +front which might lead to unexpected results when rendering layered \ +transparent markers or in combination with other transparent objects."; + s.valid = "scalar"; + + case "markeredgecolor" + s.doc = "Color of the edge of the markers. @qcode{\"none\"} means \ +that the edges are transparent and @qcode{\"flat\"} means that the value \ +from @code{cdata} is used. @xref{XREFlinemarkeredgecolor, , \ +@w{line markeredgecolor property}}."; + s.valid = packopt ({markdef("@qcode{\"none\"}"), ... + "@qcode{\"flat\"}", ... + valid_color}); + + case "markerfacealpha" + s.doc = "Transparency level of the faces of the markers where a \ +value of 0 means complete transparency and a value of 1 means solid faces \ +without transparency. Note that the markers are not sorted from back to \ +front which might lead to unexpected results when rendering layered \ +transparent markers or in combination with other transparent objects."; + s.valid = "scalar"; + + case "markerfacecolor" + s.doc = "Color of the face of the markers. @qcode{\"none\"} means \ +that the faces are transparent, @qcode{\"flat\"} means that the value from \ +@code{cdata} is used, and @qcode{\"auto\"} uses the @code{color} property of \ +the ancestor axes. @xref{XREFlinemarkerfacecolor, , \ +@w{line markerfacecolor property}}."; + s.valid = packopt ({markdef("@qcode{\"none\"}"), ... + "@qcode{\"flat\"}", ... + "@qcode{\"auto\"}", ... + valid_color}); + + case "seriesindex" + s.doc = "Each scatter object in the same axes is asigned an \ +incrementing integer. This corresponds to the index into the \ +@code{colororder} of the ancestor axes that is used if @code{cdatamode} is \ +set to @qcode{\"auto\"}."; + + case "sizedatasource" + s.doc = sprintf (doc_notimpl, "Data from workspace variables"); + + case "sizedata" + s.doc = "Size of the area of the marker. A scalar value applies to \ +all markers. If @code{cdata} is an N-by-1 vector, it defines the color of \ +each one of the N scatter markers."; + s.valid = packopt ({"[]", "scalar", "vector"}); + + case "xdatasource" + s.doc = sprintf (doc_notimpl, "Data from workspace variables"); + + case "xdata" + s.doc = "Vector with the x coordinates of the scatter object."; + s.valid = "vector"; + + case "ydatasource" + s.doc = sprintf (doc_notimpl, "Data from workspace variables"); + + case "ydata" + s.doc = "Vector with the y coordinates of the scatter object."; + s.valid = "vector"; + + case "zdatasource" + s.doc = sprintf (doc_notimpl, "Data from workspace variables"); + + case "zdata" + s.doc = "For 3D data, vector with the y coordinates of the scatter \ +object."; + s.valid = packopt ({"[]", "vector"}); + + endswitch + ## Light properties elseif (strcmp (objname, "light")) switch (field) @@ -1861,6 +1979,10 @@ h = 0; elseif (strcmp (objname, "figure")) h = hf; + elseif (strcmp (objname, "scatter")) + ## Make sure to get a scatter object independent of graphics toolkit + hax = axes (hf); + h = __go_scatter__ (hax); else eval (["h = " objname " ();"]); endif
--- a/doc/interpreter/graphics_properties.mk Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/graphics_properties.mk Fri May 22 11:06:58 2020 +0200 @@ -5,6 +5,7 @@ interpreter/plot-lineproperties.texi \ interpreter/plot-patchproperties.texi \ interpreter/plot-rootproperties.texi \ + interpreter/plot-scatterproperties.texi \ interpreter/plot-surfaceproperties.texi \ interpreter/plot-textproperties.texi @@ -35,5 +36,8 @@ interpreter/plot-surfaceproperties.texi: interpreter/genpropdoc.m $(AM_V_GEN)$(call gen-propdoc-texi,surface) +interpreter/plot-scatterproperties.texi: interpreter/genpropdoc.m + $(AM_V_GEN)$(call gen-propdoc-texi,scatter) + interpreter/plot-textproperties.texi: interpreter/genpropdoc.m $(AM_V_GEN)$(call gen-propdoc-texi,text)
--- a/doc/interpreter/gui.txi Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/gui.txi Fri May 22 11:06:58 2020 +0200 @@ -141,6 +141,8 @@ @DOCSTRING(isguirunning) +@DOCSTRING(getpixelposition) + @DOCSTRING(movegui) @DOCSTRING(openvar)
--- a/doc/interpreter/matrix.txi Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/matrix.txi Fri May 22 11:06:58 2020 +0200 @@ -175,6 +175,8 @@ @DOCSTRING(randg) +@DOCSTRING(rng) + The generators operate in the new or old style together, it is not possible to mix the two. Initializing any generator with @qcode{"state"} or @qcode{"seed"} causes the others to switch to the
--- a/doc/interpreter/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/module.mk Fri May 22 11:06:58 2020 +0200 @@ -8,6 +8,7 @@ %reldir%/plot-lineproperties.texi \ %reldir%/plot-patchproperties.texi \ %reldir%/plot-rootproperties.texi \ + %reldir%/plot-scatterproperties.texi \ %reldir%/plot-surfaceproperties.texi \ %reldir%/plot-textproperties.texi \ %reldir%/plot-uimenuproperties.texi \ @@ -51,6 +52,9 @@ %reldir%/plot-rootproperties.texi: %reldir%/genpropdoc.m $(GRAPHICS_PROPS_SRC) $(AM_V_GEN)$(call gen-propdoc-texi,root) +%reldir%/plot-scatterproperties.texi: %reldir%/genpropdoc.m $(GRAPHICS_PROPS_SRC) + $(AM_V_GEN)$(call gen-propdoc-texi,scatter) + %reldir%/plot-surfaceproperties.texi: %reldir%/genpropdoc.m $(GRAPHICS_PROPS_SRC) $(AM_V_GEN)$(call gen-propdoc-texi,surface)
--- a/doc/interpreter/octave.texi Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/octave.texi Fri May 22 11:06:58 2020 +0200 @@ -569,6 +569,7 @@ * Text Properties:: * Image Properties:: * Patch Properties:: +* Scatter Properties:: * Surface Properties:: * Light Properties:: * Uimenu Properties:: @@ -600,7 +601,6 @@ * Error Bar Series:: * Line Series:: * Quiver Group:: -* Scatter Group:: * Stair Group:: * Stem Series:: * Surface Group::
--- a/doc/interpreter/plot.txi Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/plot.txi Fri May 22 11:06:58 2020 +0200 @@ -1171,24 +1171,30 @@ The graphics functions use pointers, which are of class graphics_handle, in order to address the data structures which control visual display. A graphics handle may point to any one of a number of different base object -types and these objects are the graphics data structures themselves. The +types. These objects are the graphics data structures themselves. The primitive graphic object types are: @code{figure}, @code{axes}, @code{line}, -@code{text}, @code{patch}, @code{surface}, @code{text}, @code{image}, and -@code{light}. - -Each of these objects has a function by the same name, and, each of these +@code{text}, @code{patch}, @code{scatter}, @code{surface}, @code{text}, +@code{image}, and @code{light}. + +Each of these objects has a function by the same name, and each of these functions returns a graphics handle pointing to an object of the corresponding -type. In addition there are several functions which operate on properties of -the graphics objects and which also return handles: the functions @code{plot} -and @code{plot3} return a handle pointing to an object of type line, the -function @code{subplot} returns a handle pointing to an object of type axes, -the function @code{fill} returns a handle pointing to an object of type patch, -the functions @code{area}, @code{bar}, @code{barh}, @code{contour}, -@code{contourf}, @code{contour3}, @code{surf}, @code{mesh}, @code{surfc}, -@code{meshc}, @code{errorbar}, @code{quiver}, @code{quiver3}, @code{scatter}, -@code{scatter3}, @code{stair}, @code{stem}, @code{stem3} each return a handle -to a complex data structure as documented in -@ref{XREFdatasources,,Data Sources}. +type. + +In addition, there are several functions which operate on properties of the +graphics objects and which also return handles. This includes but is not +limited to the following functions: The functions @code{plot} and @code{plot3} +return a handle pointing to an object of type @code{line}. The function +@code{subplot} returns a handle pointing to an object of type @code{axes}. +The functions @code{fill}, @code{trimesh}, and @code{trisurf} return a handle +pointing to an object of type patch. The function @code{scatter3} returns a +handle to an object of type scatter. The functions @code{slice}, @code{surf}, +@code{surfl}, @code{mesh}, @code{meshz}, @code{pcolor}, and @code{waterfall} +each return a handle of type surface. The function @code{camlight} returns a +handle to an object of type light. The functions @code{area}, @code{bar}, +@code{barh}, @code{contour}, @code{contourf}, @code{contour3}, @code{surfc}, +@code{meshc}, @code{errorbar}, @code{quiver}, @code{quiver3}, @code{stair}, +@code{stem}, @code{stem3} each return a handle to a complex data structure as +documented in @ref{XREFdatasources,,Data Sources}. The graphics objects are arranged in a hierarchy: @@ -1200,8 +1206,12 @@ 3. Below the @code{figure} objects are @code{axes} or @code{hggroup} objects. -4. Below the @code{axes} objects are @code{line}, @code{text}, @code{patch}, -@code{surface}, @code{image}, and @code{light} objects. +4. Below the @code{axes} or @code{hggroup} objects are @code{line}, +@code{text}, @code{patch}, @code{scatter}, @code{surface}, @code{image}, and +@code{light} objects. + +It is possible to walk this hierarchical tree by querying the @qcode{"parent"} +and @qcode{"children"} properties of the graphics objects. Graphics handles may be distinguished from function handles (@pxref{Function Handles}) by means of the function @code{ishghandle}. @@ -1490,6 +1500,7 @@ * Text Properties:: * Image Properties:: * Patch Properties:: +* Scatter Properties:: * Surface Properties:: * Light Properties:: * Uimenu Properties:: @@ -1564,6 +1575,13 @@ @include plot-patchproperties.texi +@node Scatter Properties +@subsubsection Scatter Properties +@prindex @sortas{@ Scatter Properties} Scatter Properties + +@include plot-scatterproperties.texi + + @node Surface Properties @subsubsection Surface Properties @prindex @sortas{@ Surface Properties} Surface Properties @@ -2120,7 +2138,6 @@ * Error Bar Series:: * Line Series:: * Quiver Group:: -* Scatter Group:: * Stair Group:: * Stem Series:: * Surface Group:: @@ -2446,46 +2463,6 @@ Data source variables. @end table -@node Scatter Group -@subsubsection Scatter Group -@cindex group objects -@cindex scatter group - -Scatter series objects are created by the @code{scatter} or @code{scatter3} -functions. A single hggroup element contains as many children as there are -points in the scatter plot, with each child representing one of the points. -The properties of the stem series are - -@table @code -@item linewidth -The line width of the line objects of the points. @xref{Line Styles}. - -@item marker -@itemx markeredgecolor -@itemx markerfacecolor -The line and fill color of the markers of the points. @xref{Colors}. - -@item xdata -@itemx ydata -@itemx zdata -The original x, y and z data of the stems. - -@item cdata -The color data for the points of the plot. Each point can have a separate -color, or a unique color can be specified. - -@item sizedata -The size data for the points of the plot. Each point can its own size or a -unique size can be specified. - -@item xdatasource -@itemx ydatasource -@itemx zdatasource -@itemx cdatasource -@itemx sizedatasource -Data source variables. -@end table - @node Stair Group @subsubsection Stair Group @cindex group objects
--- a/doc/interpreter/strings.txi Wed May 06 10:05:36 2020 +0200 +++ b/doc/interpreter/strings.txi Fri May 22 11:06:58 2020 +0200 @@ -416,6 +416,10 @@ @DOCSTRING(strncmpi) +@DOCSTRING(startsWith) + +@DOCSTRING(endsWith) + @node Manipulating Strings @section Manipulating Strings
--- a/etc/GNULIB.UPDATE Wed May 06 10:05:36 2020 +0200 +++ b/etc/GNULIB.UPDATE Fri May 22 11:06:58 2020 +0200 @@ -1,39 +1,13 @@ ## Instructions for updating gnulib on development branch -## Change directory to the local Octave repositoy and clone the gnulib git -## repository: -git clone git://git.savannah.gnu.org/gnulib.git gnulib-git - -## Convert to hg (might take some time): -hg --config extensions.convert= convert ./gnulib-git ./gnulib-hg +## "cd" to a directory where you want to clone the gnulib repository and run: +git clone git://git.savannah.gnu.org/gnulib.git -## Change directory to the gnulib sub-repo in Octave and execute the following -## commands: -cd ./gnulib -hg pull default -hg update -hg log -rtip --template "{node}\n" - -## Take note of the SHA-1 hash (LAST_OLD_HASH) of that revision. +## If you already have a local gnulib git repository, pull the latest changes: +git pull -## Locate the first new revision in the converted repository and replace it in -## the following command: -cd ../gnulib-hg -hg log -r20111 --template "{node}\n" - -## Take note of the SHA-1 hash (FIRST_NEW_HASH) of that revision. +## Query the commit id of the current head: +git rev-parse HEAD -## Change to the main directory of the local Octave repository and execute the -## following command replacing the hashes with the information just gathered: -cd .. -echo FIRST_NEW_HASH LAST_OLD_HASH > splicemap - -## Execute the following command (having replaced FIRST_NEW_HASH): -hg --config extensions.convert= convert ./gnulib-hg ./gnulib --splicemap ./splicemap --config convert.hg.startrev=FIRST_NEW_HASH - -## In the Octave repository do the following: -cd gnulib -hg update -cd .. -hg commit -m "maint: update gnulib subrepo." -hg push default -r . +## Locate the line in bootstrap.conf starting with ": ${GNULIB_REVISION=" and +## replace the git commit id with the new one.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/NEWS.6 Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,301 @@ +Summary of important user-visible changes for version 6 (yyyy-mm-dd): +---------------------------------------------------------------------- + +### General improvements + +- The `intersect`, `setdiff`, `setxor`, `union`, and `unique` functions + accept a new sorting option `"stable"` which will return output values + in the same order as the input, rather than in ascending order. + +- Complex RESTful web services can now be accessed by the `webread` and + `webwrite` functions alongside with the `weboptions` structure. One + major feature is the support for cookies to enable RESTful + communication with the web service. + + Additionally, the system web browser can be opened by the `web` function. + +- The `linspace` function now produces symmetrical sequences when the + endpoints are symmetric. This is more intuitive and also compatible + with recent changes made in Matlab R2019b. + +- The underlying algorithm of the `rand` function has been changed. + For single precision outputs, the algorithm has been fixed so that it + produces values strictly in the range (0, 1). Previously, it could + occasionally generate the right endpoint value of 1 (See bug #41742). + In addition, the new implementation uses a uniform interval between + floating point values in the range (0, 1) rather than targeting a + uniform density (# of random integers / length along real number + line). + +- Numerical integration has been improved. The `quadv` function has + been re-written so that it can compute integrands of periodic + functions. At the same time, performance is better with ~3.5X fewer + function evaluations required. A bug in `quadgk` that caused complex + path integrals specified with `"Waypoints"` to occasionally be + calculated in the opposite direction was fixed. + +- The `edit` function option `"editinplace"` now defaults to `true` and + the option `"home"` now defaults to the empty matrix `[]`. Files will + no longer be copied to the user's HOME directory for editing. The old + behavior can be restored by setting `"editinplace"` to `false` and + `"home"` to `"~/octave"`. + +- The `format` command supports two new options: `uppercase` and + `lowercase` (default). With the default, print a lowercase 'e' for + the exponent character in scientific notation and lowercase 'a-f' for + the hex digits representing 10-15. With `uppercase`, print 'E' and + 'A-F' instead. The previous uppercase formats, `E` and `G`, no longer + control the case of the output. + + Additionally, the `format` command can be called with multiple options + for controlling the format, spacing, and case in arbitrary order. + For example: + + format long e uppercase loose + + Note, in the case of multiple competing format options the rightmost + one is used, and, in case of an error, the previous format remains + unchanged. + +- L-value references (e.g., increment (++), decrement (--), and all + in-place assignment operators (+=, -=, *=, /=, etc.)) are no longer + allowed in anonymous functions. + +- New warnings have been added about questionable uses of the colon ':' + range operator. Each has a new warning ID so that it can be disabled + if desired. + + > `Octave:colon-complex-argument` : when any arg is complex + > `Octave:colon-nonscalar-argument` : when any arg is non-scalar + +- The `regexp` and related functions now correctly handle and *require* + strings in UTF-8 encoding. As with any other function that requires + strings to be encoded in Octave's native encoding, you can use + `native2unicode` to convert from your preferred locale. For example, + the copyright symbol in UTF-8 is `native2unicode (169, "latin1")`. + +- The startup file `octaverc` now can be located in the platform + dependent location for user local configuration files (e.g. + ${XDG_CONFIG_HOME}/octave/octaverc on Unix-like operating systems or + %APPDATA%\octave\octaverc on Windows). + +- `pkg describe` now lists dependencies and inverse dependencies + (i.e., other installed packages that depend on the package in + question). + +- When unloading a package, `pkg` now checks if any remaining loaded + packages depend on the one to be removed. If this is the case `pkg` + aborts with an explanatory error message. This behavior can be + overridden with the `-nodeps` option. + +#### Graphics backend + +- The use of Qt4 for graphics and the GUI is deprecated in Octave + version 6 and no further bug fixes will be made. Qt4 support will be + removed completely in Octave version 7. + +- The `legend` function has been entirely rewritten. This fixes a + number of historical bugs, but also implements new properties such as + `"AutoUpdate"` and `"NumColumns"`. The gnuplot toolkit---which is no + longer actively maintained---still uses the old legend function. + +- The `axis` function was updated which resolved 10 bugs affecting + axes to which `"equal"` had been applied. + +- Graphic primitives now accept a color property value of `"none"` + which is useful when a particular primitive needs to be hidden + (for example, the Y-axis of an axes object with `"ycolor" = "none"`) + without hiding the entire primitive `"visibility" = "off"`. + +- A new property `"FontSmoothing"` has been added to text and axes + objects that controls whether anti-aliasing is used during the + rendering of characters. The default is `"on"` which produces smooth, + more visually appealing text. + +- The figure property `"windowscrollwheelfcn"`is now implemented. + This makes it possible to provide a callback function to be executed + when users manipulate the mouse wheel on a given figure. + +- The figure properties `"pointer"`, `"pointershapecdata"`, and + `"pointershapehotspot"` are now implemented. This makes it possible + to change the shape of the cursor (pointer in Matlab-speak) displayed + in a plot window. + +- The figure property `"paperpositionmode"` now has the default `"auto"` + rather than `"manual"`. This change is more intuitive and is + Matlab compatible. + +- The appearance of patterned lines `"LineStyle" = ":"|"--"|"-."` has + been improved for small widths (`"LineWidth"` less than 1.5 pixels) + which is a common scenario. + +- Printing to EPS files now uses a tight bounding box (`"-tight"` + argument to print) by default. This makes more sense for EPS + files which are normally embedded within other documents, and is + Matlab compatible. If necessary use the `"-loose"` option to + reproduce figures as they appeared in previous versions of Octave. + +- The following print devices are no longer officially supported: cdr, + corel, aifm, ill, cgm, hpgl, mf and dxf. A warning will be thrown + when using those devices, and the code for supporting those formats + will eventually be removed from a future version of Octave. + +- The placement of text subscripts and superscripts has been +re-engineered and now produces visually attractive results similar to +Latex. + +### Matlab compatibility + +- The function `unique` now returns column index vectors for the second + and third outputs. When duplicate values are present, the default + index to return is now the `"first"` occurrence. The previous Octave + behavior, or Matlab behavior from releases prior to R2012b, can be + obtained by using the `"legacy"` flag. + +- The function `setdiff` with the `"rows"` argument now returns Matlab + compatible results. The previous Octave behavior, or Matlab behavior + from releases prior to R2012b, can be obtained by using the `"legacy"` + flag. + +- The functions `intersect`, `setxor`, and `union` now accept a + `"legacy"` flag which changes the index values (second and third + outputs) as well as the orientation of all outputs to match Matlab + releases prior to R2012b. + +- The function `streamtube` is Matlab compatible and plots tubes along + streamlines which are scaled by the vector field divergence. The + Octave-only extension `ostreamtube` can be used to visualize the flow + expansion and contraction of the vector field due to the local + crossflow divergence. + +- The interpreter now supports handles to nested functions. + +- The graphics properties `"LineWidth"` and `"MarkerSize"` are now + measured in points, *not* pixels. Compared to previous versions + of Octave, some lines and markers will appear 4/3 larger. + +- The meta.class property "SuperClassList" has been renamed + "Superclasslist" for Matlab compatibility. The original name will + exist as an alias until Octave version 8.1. + +- The function `javaaddpath` now prepends new directories to the + existing dynamic classpath by default. To append them instead, use + the new `"-end"` argument. Multiple directories may now be specified + in a cell array of strings. + +- An undocumented function `gui_mainfcn` has been added, for compatibility + with figures created with Matlab's GUIDE. + +- Several validator functions of type `mustBe*` have been added. See + the list of new functions below. + +### Alphabetical list of new functions added in Octave 6 + +* `commandhistory` +* `commandwindow` +* `filebrowser` +* `is_same_file` +* `lightangle` +* `mustBeFinite` +* `mustBeGreaterThan` +* `mustBeGreaterThanOrEqual` +* `mustBeInteger` +* `mustBeLessThan` +* `mustBeLessThanOrEqual` +* `mustBeMember` +* `mustBeNegative` +* `mustBeNonempty` +* `mustBeNonNan` +* `mustBeNonnegative` +* `mustBeNonpositive` +* `mustBeNonsparse` +* `mustBeNonzero` +* `mustBeNumeric` +* `mustBeNumericOrLogical` +* `mustBePositive` +* `mustBeReal` +* `namedargs2cell` +* `newline` +* `ode23s` +* `ostreamtube` +* `rescale` +* `rotx` +* `roty` +* `rotz` +* `stream2` +* `stream3` +* `streamline` +* `streamtube` +* `uisetfont` +* `verLessThan` +* `web` +* `weboptions` +* `webread` +* `webwrite` +* `workspace` + + +### Deprecated functions and properties + +The following functions and properties have been deprecated in Octave 6 +and will be removed from Octave 8 (or whatever version is the second +major release after 6): + +- Functions + + Function | Replacement + -----------------------|------------------ + `runtests` | `oruntests` + +- Properties + + Object | Property | Value + -----------------|---------------|------------ + | | + + +### Removed functions and properties + +The following functions and properties were deprecated in Octave 4.4 +and have been removed from Octave 6. + +- Functions + + Function | Replacement + ---------------------|------------------ + `chop` | `sprintf` for visual results + `desktop` | `isguirunning` + `tmpnam` | `tempname` + `toascii` | `double` + `java2mat` | `__java2mat__` + +- Properties + + Object | Property | Value + ---------------------|---------------------------|----------------------- + `annotation` | `edgecolor ("rectangle")` | + `axes` | `drawmode` | + `figure` | `doublebuffer` | + | `mincolormap` | + | `wvisual` | + | `wvisualmode` | + | `xdisplay` | + | `xvisual` | + | `xvisualmode` | + `line` | `interpreter` | + `patch` | `interpreter` | + `surface` | `interpreter` | + `text` | `fontweight` | `"demi"` and `"light"` + `uibuttongroup` | `fontweight` | `"demi"` and `"light"` + `uicontrol` | `fontweight` | `"demi"` and `"light"` + `uipanel` | `fontweight` | `"demi"` and `"light"` + `uitable` | `fontweight` | `"demi"` and `"light"` + + +### Old release news + +- [Octave 5.x](etc/NEWS.5) +- [Octave 4.x](etc/NEWS.4) +- [Octave 3.x](etc/NEWS.3) +- [Octave 2.x](etc/NEWS.2) +- [Octave 1.x](etc/NEWS.1)
--- a/libgui/graphics/BaseControl.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/BaseControl.cc Fri May 22 11:06:58 2020 +0200 @@ -50,18 +50,30 @@ if (props.style_is ("edit") || props.style_is ("listbox")) { - p.setColor (QPalette::Base, - Utils::fromRgb (props.get_backgroundcolor_rgb ())); - p.setColor (QPalette::Text, + Matrix bg_color = props.get_backgroundcolor_rgb (); + // Matlab compatibility: Default color is ignored, and rendered as + // white ([1.0, 1.0, 1.0]). See bug #58261. + if (bg_color(0) == bg_color(1) && bg_color(0) == bg_color(2) + && (std::abs (bg_color(1) - 0.94) < .005)) + bg_color.fill (1.0); + + p.setColor (QPalette::Active, QPalette::Base, + Utils::fromRgb (bg_color)); + p.setColor (QPalette::Inactive, QPalette::Base, + Utils::fromRgb (bg_color)); + p.setColor (QPalette::Active, QPalette::Text, + Utils::fromRgb (props.get_foregroundcolor_rgb ())); + p.setColor (QPalette::Inactive, QPalette::Text, Utils::fromRgb (props.get_foregroundcolor_rgb ())); } else if (props.style_is ("popupmenu")) { - // popumenu (QComboBox) is a listbox with a button, so needs set colors for both + // popupmenu (QComboBox) is a listbox with a button. + // This requires setting colors for both. QColor bcol = Utils::fromRgb (props.get_backgroundcolor_rgb ()); QColor fcol = Utils::fromRgb (props.get_foregroundcolor_rgb ()); - QString qss = QString ("background: %1 none;\n" - "color: %2;") + QString qss = QString (":enabled { background: %1 none;\n" + "color: %2; }") .arg(bcol.name ()).arg (fcol.name ()); w->setStyleSheet(qss); return; @@ -69,9 +81,13 @@ else if (props.style_is ("radiobutton") || props.style_is ("checkbox")) { - p.setColor (QPalette::Button, + p.setColor (QPalette::Active, QPalette::Button, + Utils::fromRgb (props.get_backgroundcolor_rgb ())); + p.setColor (QPalette::Inactive, QPalette::Button, Utils::fromRgb (props.get_backgroundcolor_rgb ())); - p.setColor (QPalette::WindowText, + p.setColor (QPalette::Active, QPalette::WindowText, + Utils::fromRgb (props.get_foregroundcolor_rgb ())); + p.setColor (QPalette::Inactive, QPalette::WindowText, Utils::fromRgb (props.get_foregroundcolor_rgb ())); } else if (props.style_is ("pushbutton") @@ -79,17 +95,21 @@ { QColor bcol = Utils::fromRgb (props.get_backgroundcolor_rgb ()); QColor fcol = Utils::fromRgb (props.get_foregroundcolor_rgb ()); - QString qss = QString ("background: %1 none;\n" - "color: %2;") + QString qss = QString (":enabled { background: %1 none;\n" + "color: %2; }") .arg(bcol.name ()).arg (fcol.name ()); w->setStyleSheet(qss); return; } else { - p.setColor (QPalette::Window, + p.setColor (QPalette::Active, QPalette::Window, + Utils::fromRgb (props.get_backgroundcolor_rgb ())); + p.setColor (QPalette::Inactive, QPalette::Window, Utils::fromRgb (props.get_backgroundcolor_rgb ())); - p.setColor (QPalette::WindowText, + p.setColor (QPalette::Active, QPalette::WindowText, + Utils::fromRgb (props.get_foregroundcolor_rgb ())); + p.setColor (QPalette::Inactive, QPalette::WindowText, Utils::fromRgb (props.get_foregroundcolor_rgb ())); } @@ -119,7 +139,10 @@ octave::math::round (bb(2)), octave::math::round (bb(3))); w->setFont (Utils::computeFont<uicontrol> (up, bb(3))); updatePalette (up, w); - w->setEnabled (up.enable_is ("on")); + if (up.enable_is ("inactive")) + w->blockSignals (true); + else + w->setEnabled (up.enable_is ("on")); w->setToolTip (Utils::fromStdString (up.get_tooltipstring ())); w->setVisible (up.is_visible ()); m_keyPressHandlerDefined = ! up.get_keypressfcn ().isempty (); @@ -174,7 +197,16 @@ break; case uicontrol::properties::ID_ENABLE: - w->setEnabled (up.enable_is ("on")); + if (up.enable_is ("inactive")) + { + w->blockSignals (true); + w->setEnabled (true); + } + else + { + w->blockSignals (false); + w->setEnabled (up.enable_is ("on")); + } break; case uicontrol::properties::ID_TOOLTIPSTRING:
--- a/libgui/graphics/Canvas.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/Canvas.cc Fri May 22 11:06:58 2020 +0200 @@ -371,11 +371,7 @@ r.adjust (-5, -5, 5, 5); -#if defined (HAVE_QMOUSEEVENT_LOCALPOS) bool rect_contains_pos = r.contains (event->localPos ()); -#else - bool rect_contains_pos = r.contains (event->posF ()); -#endif if (rect_contains_pos) { currentObj = childObj; @@ -429,11 +425,7 @@ // the axes and still select it. r.adjust (-20, -20, 20, 20); -#if defined (HAVE_QMOUSEEVENT_LOCALPOS) bool rect_contains_pos = r.contains (event->localPos ()); -#else - bool rect_contains_pos = r.contains (event->posF ()); -#endif if (rect_contains_pos) axesObj = *it; }
--- a/libgui/graphics/CheckBoxControl.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/CheckBoxControl.cc Fri May 22 11:06:58 2020 +0200 @@ -61,10 +61,37 @@ const graphics_object& go, QCheckBox *box) : ButtonControl (oct_obj, interp, go, box) { + uicontrol::properties& up = properties<uicontrol> (); + box->setAutoFillBackground (true); + if (up.enable_is ("inactive")) + box->setCheckable (false); } CheckBoxControl::~CheckBoxControl (void) { } + void + CheckBoxControl::update (int pId) + { + uicontrol::properties& up = properties<uicontrol> (); + QCheckBox *box = qWidget<QCheckBox> (); + + switch (pId) + { + case uicontrol::properties::ID_ENABLE: + { + if (up.enable_is ("inactive")) + box->setCheckable (false); + else + box->setCheckable (true); + ButtonControl::update (pId); + } + break; + + default: + ButtonControl::update (pId); + break; + } + } };
--- a/libgui/graphics/CheckBoxControl.h Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/CheckBoxControl.h Fri May 22 11:06:58 2020 +0200 @@ -50,6 +50,9 @@ static CheckBoxControl * create (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go); + + protected: + void update (int pId); }; }
--- a/libgui/graphics/EditControl.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/EditControl.cc Fri May 22 11:06:58 2020 +0200 @@ -85,6 +85,10 @@ uicontrol::properties& up = properties<uicontrol> (); + if (up.enable_is ("inactive")) + edit->setReadOnly (true); + else + edit->setEnabled (up.enable_is ("on")); edit->setText (Utils::fromStdString (up.get_string_string ())); edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (), up.get_verticalalignment ())); @@ -117,9 +121,15 @@ uicontrol::properties& up = properties<uicontrol> (); + if (up.enable_is ("inactive")) + edit->setReadOnly (true); + else + edit->setEnabled (up.enable_is ("on")); edit->setAcceptRichText (false); edit->setPlainText (Utils::fromStringVector (up.get_string_vector ()).join ("\n")); + edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (), + up.get_verticalalignment ())); connect (edit, SIGNAL (textChanged (void)), SLOT (textChanged (void))); @@ -177,6 +187,16 @@ up.get_verticalalignment ())); return true; + case uicontrol::properties::ID_ENABLE: + if (up.enable_is ("inactive")) + edit->setReadOnly (true); + else + { + edit->setReadOnly (false); + edit->setEnabled (up.enable_is ("on")); + } + return true; + case uicontrol::properties::ID_MIN: case uicontrol::properties::ID_MAX: if ((up.get_max () - up.get_min ()) > 1) @@ -208,6 +228,22 @@ (up.get_string_vector ()).join ("\n")); return true; + case uicontrol::properties::ID_HORIZONTALALIGNMENT: + case uicontrol::properties::ID_VERTICALALIGNMENT: + edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (), + up.get_verticalalignment ())); + return true; + + case uicontrol::properties::ID_ENABLE: + if (up.enable_is ("inactive")) + edit->setReadOnly (true); + else + { + edit->setReadOnly (false); + edit->setEnabled (up.enable_is ("on")); + } + return true; + case uicontrol::properties::ID_MIN: case uicontrol::properties::ID_MAX: if ((up.get_max () - up.get_min ()) <= 1)
--- a/libgui/graphics/PushButtonControl.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/PushButtonControl.cc Fri May 22 11:06:58 2020 +0200 @@ -71,6 +71,7 @@ QImage img = Utils::makeImageFromCData (cdat, cdat.columns (), cdat.rows ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); + btn->setIconSize (QSize (cdat.columns (), cdat.rows ())); } PushButtonControl::~PushButtonControl (void)
--- a/libgui/graphics/QtHandlesUtils.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/QtHandlesUtils.cc Fri May 22 11:06:58 2020 +0200 @@ -288,8 +288,12 @@ int w = qMin (dv(1), static_cast<octave_idx_type> (width)); int h = qMin (dv(0), static_cast<octave_idx_type> (height)); - int x_off = (w < width ? (width - w) / 2 : 0); - int y_off = (h < height ? (height - h) / 2 : 0); + // If size mismatch, take data from center of CDATA and + // place in in center of QImage. + int x_img_off = (w < width ? (width - w) / 2 : 0); + int y_img_off = (h < height ? (height - h) / 2 : 0); + int x_cdat_off = (dv(1) > w ? (dv(1) - w) / 2 : 0); + int y_cdat_off = (dv(0) > h ? (dv(0) - h) / 2 : 0); QImage img (width, height, QImage::Format_ARGB32); img.fill (qRgba (0, 0, 0, 0)); @@ -298,23 +302,25 @@ { uint8NDArray d = v.uint8_array_value (); - for (int i = 0; i < w; i++) - for (int j = 0; j < h; j++) + for (int i = x_cdat_off; i < w + x_cdat_off; i++) + for (int j = y_cdat_off; j < h + y_cdat_off; j++) { int r = d(j, i, 0); int g = d(j, i, 1); int b = d(j, i, 2); int a = 255; - img.setPixel (x_off + i, y_off + j, qRgba (r, g, b, a)); + img.setPixel (x_img_off + i - x_cdat_off, + y_img_off + j - y_cdat_off, + qRgba (r, g, b, a)); } } else if (v.is_single_type ()) { FloatNDArray f = v.float_array_value (); - for (int i = 0; i < w; i++) - for (int j = 0; j < h; j++) + for (int i = x_cdat_off; i < w + x_cdat_off; i++) + for (int j = y_cdat_off; j < h + y_cdat_off; j++) { float r = f(j, i, 0); float g = f(j, i, 1); @@ -322,7 +328,8 @@ int a = (octave::math::isnan (r) || octave::math::isnan (g) || octave::math::isnan (b) ? 0 : 255); - img.setPixel (x_off + i, y_off + j, + img.setPixel (x_img_off + i - x_cdat_off, + y_img_off + j - y_cdat_off, qRgba (octave::math::round (r * 255), octave::math::round (g * 255), octave::math::round (b * 255), @@ -333,8 +340,8 @@ { NDArray d = v.array_value (); - for (int i = 0; i < w; i++) - for (int j = 0; j < h; j++) + for (int i = x_cdat_off; i < w + x_cdat_off; i++) + for (int j = y_cdat_off; j < h + y_cdat_off; j++) { double r = d(j, i, 0); double g = d(j, i, 1); @@ -342,7 +349,8 @@ int a = (octave::math::isnan (r) || octave::math::isnan (g) || octave::math::isnan (b) ? 0 : 255); - img.setPixel (x_off + i, y_off + j, + img.setPixel (x_img_off + i - x_cdat_off, + y_img_off + j - y_cdat_off, qRgba (octave::math::round (r * 255), octave::math::round (g * 255), octave::math::round (b * 255), @@ -394,12 +402,7 @@ // We assume a standard mouse with 15 degree steps and Qt returns // 1/8 of a degree. -#if defined (HAVE_QWHEELEVENT_ANGLEDELTA) int ydelta = -(event->angleDelta().y ()); -#else - int ydelta = (event->orientation () == Qt::Vertical - ? -(event->delta ()) : 0); -#endif retval.setfield ("VerticalScrollCount", octave_value (ydelta / 120)); // FIXME: Is there any way to access the number of lines a scroll step
--- a/libgui/graphics/RadioButtonControl.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/RadioButtonControl.cc Fri May 22 11:06:58 2020 +0200 @@ -69,11 +69,39 @@ if (btnGroup) btnGroup->addButton (radio); + uicontrol::properties& up = properties<uicontrol> (); + radio->setAutoFillBackground (true); radio->setAutoExclusive (false); + if (up.enable_is ("inactive")) + radio->setCheckable (false); } RadioButtonControl::~RadioButtonControl (void) { } + void + RadioButtonControl::update (int pId) + { + uicontrol::properties& up = properties<uicontrol> (); + QRadioButton *btn = qWidget<QRadioButton> (); + + switch (pId) + { + case uicontrol::properties::ID_ENABLE: + { + if (up.enable_is ("inactive")) + btn->setCheckable (false); + else + btn->setCheckable (true); + ButtonControl::update (pId); + } + break; + + default: + ButtonControl::update (pId); + break; + } + } + };
--- a/libgui/graphics/RadioButtonControl.h Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/RadioButtonControl.h Fri May 22 11:06:58 2020 +0200 @@ -50,6 +50,9 @@ static RadioButtonControl * create (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go); + + protected: + void update (int pId); }; }
--- a/libgui/graphics/Table.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/Table.cc Fri May 22 11:06:58 2020 +0200 @@ -1321,11 +1321,7 @@ : QAbstractItemView::NoSelection); // Set rearrangeablecolumns - #if defined (HAVE_QT4) - m_tableWidget->horizontalHeader ()->setMovable (enabled && rearrangeableColumns); - #elif defined (HAVE_QT5) - m_tableWidget->horizontalHeader ()->setSectionsMovable (enabled && rearrangeableColumns); - #endif + m_tableWidget->horizontalHeader ()->setSectionsMovable (enabled && rearrangeableColumns); m_tableWidget->horizontalHeader ()->setDragEnabled (enabled && rearrangeableColumns); m_tableWidget->horizontalHeader ()->setDragDropMode (QAbstractItemView::InternalMove); @@ -1504,11 +1500,7 @@ bool rearrangeableColumns = tp.is_rearrangeablecolumns (); bool enabled = tp.is_enable (); - #if defined (HAVE_QT4) - m_tableWidget->horizontalHeader ()->setMovable (enabled && rearrangeableColumns); - #elif defined (HAVE_QT5) m_tableWidget->horizontalHeader ()->setSectionsMovable (enabled && rearrangeableColumns); - #endif m_tableWidget->horizontalHeader ()->setDragEnabled (enabled && rearrangeableColumns); m_tableWidget->horizontalHeader ()->setDragDropMode (QAbstractItemView::InternalMove); }
--- a/libgui/graphics/ToggleButtonControl.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/ToggleButtonControl.cc Fri May 22 11:06:58 2020 +0200 @@ -77,6 +77,7 @@ QImage img = Utils::makeImageFromCData (cdat, cdat.columns (), cdat.rows ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); + btn->setIconSize (QSize (cdat.columns (), cdat.rows ())); } ToggleButtonControl::~ToggleButtonControl (void)
--- a/libgui/graphics/ToolBarButton.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/graphics/ToolBarButton.cc Fri May 22 11:06:58 2020 +0200 @@ -49,7 +49,7 @@ action->setVisible (tp.is_visible ()); // Get the icon data from cdata or as a named icon - QImage img = Utils::makeImageFromCData (tp.get_cdata (), 32, 32); + QImage img = Utils::makeImageFromCData (tp.get_cdata (), 24, 24); if (img.width () == 0) { @@ -104,7 +104,7 @@ case T::properties::ID_CDATA: { // Get the icon data from cdata or as a named icon - QImage img = Utils::makeImageFromCData (tp.get_cdata (), 32, 32); + QImage img = Utils::makeImageFromCData (tp.get_cdata (), 24, 24); if (img.width () == 0) {
--- a/libgui/src/files-dock-widget.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/files-dock-widget.cc Fri May 22 11:06:58 2020 +0200 @@ -245,16 +245,8 @@ (settings->value (fb_column_state.key).toByteArray ()); // Set header properties for sorting -#if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE) m_file_tree_view->header ()->setSectionsClickable (true); -#else - m_file_tree_view->header ()->setClickable (true); -#endif -#if defined (HAVE_QHEADERVIEW_SETSECTIONSMOVABLE) m_file_tree_view->header ()->setSectionsMovable (true); -#else - m_file_tree_view->header ()->setMovable (true); -#endif m_file_tree_view->header ()->setSortIndicatorShown (true); QStringList mru_dirs = @@ -720,17 +712,38 @@ QItemSelectionModel *m = m_file_tree_view->selectionModel (); QModelIndexList rows = m->selectedRows (); + int file_cnt = rows.size (); + bool multiple_files = (file_cnt > 1); + for (auto it = rows.begin (); it != rows.end (); it++) { QModelIndex index = *it; QFileInfo info = m_file_system_model->fileInfo (index); - if (QMessageBox::question (this, tr ("Delete file/directory"), - tr ("Are you sure you want to delete\n") - + info.filePath (), - QMessageBox::Yes | QMessageBox::No) - == QMessageBox::Yes) + QMessageBox::StandardButton dlg_answer; + if (multiple_files) + if (it == rows.begin ()) + { + dlg_answer = QMessageBox::question (this, + tr ("Delete file/directory"), + tr ("Are you sure you want to delete all %1 selected files?\n").arg (file_cnt), + QMessageBox::Yes | QMessageBox::No); + if (dlg_answer != QMessageBox::Yes) + return; + } + else + dlg_answer = QMessageBox::Yes; + else + { + dlg_answer = QMessageBox::question (this, + tr ("Delete file/directory"), + tr ("Are you sure you want to delete\n") + + info.filePath (), + QMessageBox::Yes | QMessageBox::No); + } + + if (dlg_answer) { if (info.isDir ()) {
--- a/libgui/src/find-files-dialog.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/find-files-dialog.cc Fri May 22 11:06:58 2020 +0200 @@ -126,11 +126,7 @@ m_file_list->setSortingEnabled (true); m_file_list->horizontalHeader ()->restoreState (settings->value (ff_column_state.key).toByteArray ()); m_file_list->horizontalHeader ()->setSortIndicatorShown (true); -#if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE) m_file_list->horizontalHeader ()->setSectionsClickable (true); -#else - m_file_list->horizontalHeader ()->setClickable (true); -#endif m_file_list->horizontalHeader ()->setStretchLastSection (true); m_file_list->sortByColumn (settings->value (ff_sort_files_by_column).toInt (), static_cast<Qt::SortOrder>
--- a/libgui/src/gui-preferences-ed.h Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/gui-preferences-ed.h Fri May 22 11:06:58 2020 +0200 @@ -215,6 +215,12 @@ const gui_pref ed_notebook_tab_width_max ("editor/notebook_tab_width_max", QVariant (300)); +const gui_pref +ed_force_newline ("editor/force_newline", QVariant (true)); + +const gui_pref +ed_rm_trailing_spaces ("editor/rm_trailing_spaces", QVariant (true)); + #if defined (HAVE_QSCINTILLA) #if defined (Q_OS_WIN32) const int os_eol_mode = QsciScintilla::EolWindows;
--- a/libgui/src/m-editor/file-editor-tab.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/m-editor/file-editor-tab.cc Fri May 22 11:06:58 2020 +0200 @@ -1833,7 +1833,23 @@ QApplication::setOverrideCursor (Qt::WaitCursor); // read the file binary, decoding later - const QByteArray text_data = file.readAll (); + QByteArray text_data = file.readAll (); + + // remove newline at end of file if we add one again when saving + resource_manager& rmgr = m_octave_qobj.get_resource_manager (); + gui_settings *settings = rmgr.get_settings (); + + if (settings->value (ed_force_newline).toBool ()) + { + const QByteArray eol_lf = QByteArray (1,0x0a); + const QByteArray eol_cr = QByteArray (1,0x0d); + + if (text_data.endsWith (eol_lf)) + text_data.chop (1); // remove LF + + if (text_data.endsWith (eol_cr)) // remove CR (altogether CRLF, too) + text_data.chop (1); + } // decode QTextCodec::ConverterState st; @@ -1990,6 +2006,22 @@ return eol_mode; } + QString file_editor_tab::eol_string (void) + { + switch (m_edit_area->eolMode ()) + { + case QsciScintilla::EolWindows: + return ("\r\n"); + case QsciScintilla::EolMac: + return ("\r"); + case QsciScintilla::EolUnix: + return ("\n"); + } + + // Last resort, if the above goes wrong (should never happen) + return ("\r\n"); + } + void file_editor_tab::update_eol_indicator (void) { switch (m_edit_area->eolMode ()) @@ -2255,10 +2287,36 @@ if (! codec) return; // No valid codec + // Remove trailing white spaces if desired + resource_manager& rmgr = m_octave_qobj.get_resource_manager (); + gui_settings *settings = rmgr.get_settings (); + + if (settings->value (ed_rm_trailing_spaces).toBool ()) + { + int line, col; + m_edit_area->getCursorPosition (&line,&col); + + QString eol = eol_string (); + QString edit_text = m_edit_area->text (); + + edit_text.replace (QRegExp ("[\\t ]+" + eol), eol); // All lines + long int idx = edit_text.lastIndexOf (QRegExp ("[^\\t^ ]")); + edit_text.chop (edit_text.length () - idx - 1); // Last line + + m_edit_area->setText (edit_text); + m_edit_area->setCursorPosition (line,col); + } + + // Save the file out.setCodec (codec); QApplication::setOverrideCursor (Qt::WaitCursor); + out << m_edit_area->text (); + if (settings->value (ed_force_newline).toBool () + && m_edit_area->text ().length ()) + out << eol_string (); // Add newline if desired + out.flush (); QApplication::restoreOverrideCursor (); file.flush (); @@ -2476,9 +2534,6 @@ void file_editor_tab::handle_save_file_as_answer (const QString& saveFileName) { - if (m_save_as_desired_eol != m_edit_area->eolMode ()) - convert_eol (this,m_save_as_desired_eol); - if (saveFileName == m_file_name) { save_file (saveFileName); @@ -2495,13 +2550,6 @@ void file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName) { - if (m_save_as_desired_eol != m_edit_area->eolMode ()) - { - m_edit_area->setReadOnly (false); // was set to read-only in save_file_as - convert_eol (this,m_save_as_desired_eol); - m_edit_area->setReadOnly (true); // restore read-only mode - } - // saveFileName == m_file_name can not happen, because we only can get here // when we close a tab and m_file_name is not a valid filename yet @@ -3142,7 +3190,7 @@ // remember first visible line and x-offset for restoring the view afterwards int first_line = m_edit_area->firstVisibleLine (); - int x_offset = m_edit_area->SendScintilla(QsciScintillaBase::SCI_GETXOFFSET); + int x_offset = m_edit_area->SendScintilla (QsciScintillaBase::SCI_GETXOFFSET); // search for first occurrence of the detected word bool find_result_available @@ -3177,7 +3225,7 @@ // restore the visible area of the file, the cursor position, // and the selection m_edit_area->setFirstVisibleLine (first_line); - m_edit_area->SendScintilla(QsciScintillaBase::SCI_SETXOFFSET, x_offset); + m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETXOFFSET, x_offset); m_edit_area->setCursorPosition (line, col); m_edit_area->setSelection (line, col - wlen, line, col); m_edit_area->set_word_selection (word);
--- a/libgui/src/m-editor/file-editor-tab.h Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/m-editor/file-editor-tab.h Fri May 22 11:06:58 2020 +0200 @@ -295,6 +295,7 @@ QString get_function_name (void); QsciScintilla::EolMode detect_eol_mode (void); + QString eol_string (void); void update_eol_indicator (void); octave_qscintilla *m_edit_area;
--- a/libgui/src/m-editor/file-editor.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/m-editor/file-editor.cc Fri May 22 11:06:58 2020 +0200 @@ -75,9 +75,7 @@ setTabsClosable (true); setUsesScrollButtons (true); -#if defined (HAVE_QTABWIDGET_SETMOVABLE) setMovable (true); -#endif } tab_bar * file_editor_tab_widget::get_tab_bar (void) const
--- a/libgui/src/m-editor/find-dialog.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/m-editor/find-dialog.cc Fri May 22 11:06:58 2020 +0200 @@ -381,21 +381,7 @@ int lbeg, lend, cbeg, cend; _edit_area->getSelection (&lbeg,&cbeg,&lend,&cend); if (lbeg == lend) -#if defined (HAVE_QCOMBOBOX_SETCURRENTTEXT) _search_line_edit->setCurrentText (_edit_area->selectedText ()); -#else - if (_search_line_edit->isEditable ()) - { - _search_line_edit->setEditText (_edit_area->selectedText ()); - } - else - { - int i = _search_line_edit->findText (_edit_area->selectedText ()); - - if (i > -1) - _search_line_edit->setCurrentIndex (i); - } -#endif } // set focus to "Find what" and select all text
--- a/libgui/src/main-window.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/main-window.cc Fri May 22 11:06:58 2020 +0200 @@ -767,9 +767,7 @@ QTextBrowser *browser = m_community_news_window->findChild<QTextBrowser *>("OctaveNews" -#if defined (QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS) , Qt::FindDirectChildrenOnly -#endif ); if (browser) browser->setHtml (news);
--- a/libgui/src/octave-qobject.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/octave-qobject.cc Fri May 22 11:06:58 2020 +0200 @@ -119,11 +119,7 @@ // Disable all Qt messages by default. static void -#if defined (QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT) message_handler (QtMsgType, const QMessageLogContext &, const QString &) -#else - message_handler (QtMsgType, const char *) -#endif { } //! Reimplement QApplication::notify. Octave's own exceptions are @@ -177,11 +173,7 @@ if (show_gui_msgs.empty ()) { -#if defined (HAVE_QINSTALLMESSAGEHANDLER) qInstallMessageHandler (message_handler); -#else - qInstallMsgHandler (message_handler); -#endif } // Set the codec for all strings (before wizard or any GUI object) @@ -189,10 +181,6 @@ QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8")); #endif -#if defined (HAVE_QT4) - QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8")); -#endif - // Initialize global Qt application metadata. QCoreApplication::setApplicationName ("GNU Octave"); @@ -202,7 +190,6 @@ qRegisterMetaType<octave_value_list> ("octave_value_list"); - // Bug #55940 (Disable App Nap on Mac) #if defined (Q_OS_MAC) // Mac App Nap feature causes pause() and sleep() to misbehave.
--- a/libgui/src/resource-manager.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/resource-manager.cc Fri May 22 11:06:58 2020 +0200 @@ -216,13 +216,9 @@ QString resource_manager::get_default_font_family (void) { // Get the default monospaced font -#if defined (HAVE_QFONT_MONOSPACE) QFont fixed_font; fixed_font.setStyleHint (QFont::Monospace); QString default_family = fixed_font.defaultFamily (); -#else - QString default_family = global_font_family; -#endif std::string env_default_family = sys::env::getenv ("OCTAVE_DEFAULT_FONT"); if (! env_default_family.empty ())
--- a/libgui/src/settings-dialog.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/settings-dialog.cc Fri May 22 11:06:58 2020 +0200 @@ -350,6 +350,8 @@ editor_restoreSession->setChecked (settings->value (ed_restore_session).toBool ()); editor_create_new_file->setChecked (settings->value (ed_create_new_file).toBool ()); editor_reload_changed_files->setChecked (settings->value (ed_always_reload_changed_files).toBool ()); + editor_force_newline->setChecked (settings->value (ed_force_newline).toBool ()); + editor_remove_trailing_spaces->setChecked (settings->value (ed_rm_trailing_spaces).toBool ()); editor_hiding_closes_files->setChecked (settings->value (ed_hiding_closes_files).toBool ()); editor_show_dbg_file->setChecked (settings->value (ed_show_dbg_file).toBool ()); @@ -935,6 +937,8 @@ settings->setValue (ed_create_new_file.key, editor_create_new_file->isChecked ()); settings->setValue (ed_hiding_closes_files.key, editor_hiding_closes_files->isChecked ()); settings->setValue (ed_always_reload_changed_files.key, editor_reload_changed_files->isChecked ()); + settings->setValue (ed_force_newline.key, editor_force_newline->isChecked ()); + settings->setValue (ed_rm_trailing_spaces.key, editor_remove_trailing_spaces->isChecked ()); settings->setValue (ed_show_dbg_file.key, editor_show_dbg_file->isChecked ()); settings->setValue (cs_font_size.key, terminal_fontSize->value ());
--- a/libgui/src/settings-dialog.ui Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/settings-dialog.ui Fri May 22 11:06:58 2020 +0200 @@ -32,7 +32,7 @@ </size> </property> <property name="currentIndex"> - <number>5</number> + <number>2</number> </property> <widget class="QWidget" name="tab_general"> <property name="enabled"> @@ -841,9 +841,9 @@ <property name="geometry"> <rect> <x>0</x> - <y>0</y> + <y>-898</y> <width>1021</width> - <height>1467</height> + <height>1529</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_16"> @@ -2053,7 +2053,7 @@ </property> </widget> </item> - <item row="8" column="0"> + <item row="10" column="0"> <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="topMargin"> <number>0</number> @@ -2111,7 +2111,7 @@ </item> </layout> </item> - <item row="10" column="0"> + <item row="12" column="0"> <layout class="QHBoxLayout" name="horizontalLayout_16"> <item> <widget class="QLabel" name="label_16"> @@ -2138,7 +2138,7 @@ </item> </layout> </item> - <item row="7" column="0"> + <item row="9" column="0"> <widget class="QCheckBox" name="editor_hiding_closes_files"> <property name="text"> <string>Close all files when the editor widget is closed/hidden</string> @@ -2148,6 +2148,26 @@ </property> </widget> </item> + <item row="5" column="0"> + <widget class="QCheckBox" name="editor_force_newline"> + <property name="text"> + <string>Force newline at end when saving file</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="6" column="0"> + <widget class="QCheckBox" name="editor_remove_trailing_spaces"> + <property name="text"> + <string>Remove trailing spaces when saving file</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </item> </layout>
--- a/libgui/src/shortcut-manager.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/shortcut-manager.cc Fri May 22 11:06:58 2020 +0200 @@ -75,11 +75,7 @@ if (key == Qt::Key_unknown || key == 0) return; -#if defined (HAVE_QGUIAPPLICATION) Qt::KeyboardModifiers modifiers = QGuiApplication::keyboardModifiers (); //e->modifiers (); -#else - Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers (); //e->modifiers (); -#endif if (m_shift_modifier || (modifiers & Qt::ShiftModifier)) key += Qt::SHIFT; @@ -372,11 +368,7 @@ m_dialog = nullptr; m_level_hash.clear (); -#if defined (HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE) tree_view->header ()->setSectionResizeMode (QHeaderView::ResizeToContents); -#else - tree_view->header ()->setResizeMode (QHeaderView::ResizeToContents); -#endif QTreeWidgetItem *main = new QTreeWidgetItem (tree_view); main->setText (0, tr ("Global"));
--- a/libgui/src/tab-bar.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/tab-bar.cc Fri May 22 11:06:58 2020 +0200 @@ -56,16 +56,12 @@ void tab_bar::move_tab_left (void) { -#if defined (HAVE_QTABWIDGET_SETMOVABLE) switch_tab (-1, true); -#endif } void tab_bar::move_tab_right (void) { -#if defined (HAVE_QTABWIDGET_SETMOVABLE) switch_tab (1, true); -#endif } void tab_bar::switch_tab (int direction, bool movetab) @@ -83,11 +79,9 @@ if (movetab) { -#if defined (HAVE_QTABWIDGET_SETMOVABLE) moveTab (old_pos, new_pos); setCurrentIndex (old_pos); setCurrentIndex (new_pos); -#endif } else setCurrentIndex (new_pos);
--- a/libgui/src/variable-editor.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/variable-editor.cc Fri May 22 11:06:58 2020 +0200 @@ -110,7 +110,6 @@ connect (p, SIGNAL (visibilityChanged (bool)), this, SLOT (setVisible (bool))); -#if defined (HAVE_QGUIAPPLICATION) #define DOCKED_FULLSCREEN_BUTTON_TOOLTIP "Fullscreen undock" #define UNDOCKED_FULLSCREEN_BUTTON_TOOLTIP "Fullscreen" // Add a fullscreen button @@ -140,7 +139,6 @@ if (first != nullptr) index = h_layout->indexOf (first); h_layout->insertWidget (index, fullscreen_button); -#endif // Custom title bars cause loss of decorations, add a frame m_frame = new QFrame (this); @@ -152,7 +150,6 @@ void variable_dock_widget::change_floating (bool) { -#if defined (HAVE_QGUIAPPLICATION) if (isFloating ()) { if (m_full_screen) @@ -166,7 +163,6 @@ } else m_fullscreen_action->setToolTip (tr (UNDOCKED_FULLSCREEN_BUTTON_TOOLTIP)); -#endif setFloating (! isFloating ()); } @@ -216,7 +212,6 @@ void variable_dock_widget::change_fullscreen (void) { -#if defined (HAVE_QGUIAPPLICATION) resource_manager& rmgr = m_octave_qobj.get_resource_manager (); if (! m_full_screen) @@ -256,7 +251,6 @@ } #undef DOCKED_FULLSCREEN_BUTTON_TOOLTIP #undef UNDOCKED_FULLSCREEN_BUTTON_TOOLTIP -#endif } void @@ -500,11 +494,7 @@ setHorizontalScrollMode (QAbstractItemView::ScrollPerPixel); setVerticalScrollMode (QAbstractItemView::ScrollPerPixel); -#if defined (HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE) verticalHeader ()->setSectionResizeMode (QHeaderView::Interactive); -#else - verticalHeader ()->setResizeMode (QHeaderView::Interactive); -#endif } void @@ -512,11 +502,7 @@ { QTableView::setModel (model); -#if defined (HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE) horizontalHeader ()->setSectionResizeMode (QHeaderView::Interactive); -#else - horizontalHeader ()->setResizeMode (QHeaderView::Interactive); -#endif m_var_model = parent ()->findChild<variable_editor_model *> (); @@ -1664,9 +1650,7 @@ // that restores active window and focus before acting. QList<HoverToolButton *> hbuttonlist = m_tool_bar->findChildren<HoverToolButton *> ("" -#if defined (QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS) , Qt::FindDirectChildrenOnly -#endif ); for (int i = 0; i < hbuttonlist.size (); i++) { @@ -1678,9 +1662,7 @@ QList<ReturnFocusToolButton *> rfbuttonlist = m_tool_bar->findChildren<ReturnFocusToolButton *> ("" -#if defined (QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS) , Qt::FindDirectChildrenOnly -#endif ); for (int i = 0; i < rfbuttonlist.size (); i++) {
--- a/libgui/src/variable-editor.h Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/variable-editor.h Fri May 22 11:06:58 2020 +0200 @@ -86,8 +86,6 @@ QFrame *m_frame; -#if defined (HAVE_QGUIAPPLICATION) - QAction *m_fullscreen_action; bool m_full_screen; @@ -96,8 +94,6 @@ QRect m_prev_geom; -#endif - // See Octave bug #53807 and https://bugreports.qt.io/browse/QTBUG-44813 #define QTBUG_44813_FIX_VERSION 0x999999 signals:
--- a/libgui/src/workspace-view.cc Wed May 06 10:05:36 2020 +0200 +++ b/libgui/src/workspace-view.cc Fri May 22 11:06:58 2020 +0200 @@ -120,16 +120,8 @@ (settings->value (ws_column_state.key).toByteArray ()); // Set header properties for sorting -#if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE) m_view->horizontalHeader ()->setSectionsClickable (true); -#else - m_view->horizontalHeader ()->setClickable (true); -#endif -#if defined (HAVE_QHEADERVIEW_SETSECTIONSMOVABLE) m_view->horizontalHeader ()->setSectionsMovable (true); -#else - m_view->horizontalHeader ()->setMovable (true); -#endif m_view->horizontalHeader ()->setSortIndicator ( settings->value (ws_sort_column).toInt (), static_cast<Qt::SortOrder> (settings->value (ws_sort_order).toUInt ()));
--- a/libinterp/corefcn/data.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/data.cc Fri May 22 11:06:58 2020 +0200 @@ -4248,6 +4248,18 @@ dim_vector dims (1, 1); + // The TYPE argument is required to be "logical" if present. This + // feature appears to be undocumented in Matlab. + + if (nargin > 0 && args(nargin-1).is_string ()) + { + std::string nm = args(nargin-1).string_value (); + nargin--; + + if (oct_data_conv::string_to_data_type (nm) != oct_data_conv::dt_logical) + error ("%s: invalid data type '%s'", fcn, nm.c_str ()); + } + switch (nargin) { case 0: @@ -4908,6 +4920,12 @@ return fill_matrix (args, false, "false"); } +/* +%!assert (false (2, 3), logical (zeros (2, 3))) +%!assert (false (2, 3, "logical"), logical (zeros (2, 3))) +%!error false (2, 3, "double") +*/ + DEFUN (true, args, , doc: /* -*- texinfo -*- @deftypefn {} {} true (@var{x}) @@ -4926,6 +4944,12 @@ return fill_matrix (args, true, "true"); } +/* +%!assert (true (2, 3), logical (ones (2, 3))) +%!assert (true (2, 3, "logical"), logical (ones (2, 3))) +%!error true (2, 3, "double") +*/ + template <typename MT> octave_value identity_matrix (int nr, int nc)
--- a/libinterp/corefcn/dirfns.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/dirfns.cc Fri May 22 11:06:58 2020 +0200 @@ -224,7 +224,7 @@ } } -DEFMETHODX ("rmdir", Frmdir, interp, args, , +DEFMETHODX ("rmdir", Frmdir, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} rmdir @var{dir} @deftypefnx {} {} rmdir (@var{dir}, "s") @@ -250,6 +250,7 @@ std::string dirname = args(0).xstring_value ("rmdir: DIR must be a string"); std::string fulldir = octave::sys::file_ops::tilde_expand (dirname); + octave_value_list retval; int status = -1; std::string msg; @@ -287,20 +288,30 @@ evmgr.file_renamed (status >= 0); - if (status < 0) - return ovl (false, msg, "rmdir"); + if (nargout == 0) + { + if (status < 0) + error ("rmdir: operation failed: %s", msg.c_str ()); + } else - return ovl (true, "", ""); + { + if (status < 0) + retval = ovl (0.0, msg, "rmdir"); + else + retval = ovl (1.0, "", ""); + } + + return retval; } -DEFUNX ("link", Flink, args, , +DEFUNX ("link", Flink, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} link @var{old} @var{new} -@deftypefnx {} {[@var{err}, @var{msg}] =} link (@var{old}, @var{new}) +@deftypefnx {} {[@var{status}, @var{msg}] =} link (@var{old}, @var{new}) Create a new link (also known as a hard link) to an existing file. -If successful, @var{err} is 0 and @var{msg} is an empty string. -Otherwise, @var{err} is nonzero and @var{msg} contains a system-dependent +If successful, @var{status} is 0 and @var{msg} is an empty string. +Otherwise, @var{status} is -1 and @var{msg} contains a system-dependent error message. @seealso{symlink, unlink, readlink, lstat} @end deftypefn */) @@ -314,24 +325,35 @@ from = octave::sys::file_ops::tilde_expand (from); to = octave::sys::file_ops::tilde_expand (to); + octave_value_list retval; std::string msg; int status = octave::sys::link (from, to, msg); - if (status < 0) - return ovl (-1.0, msg); + if (nargout == 0) + { + if (status < 0) + error ("link: operation failed: %s", msg.c_str ()); + } else - return ovl (status, ""); + { + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); + } + + return retval; } -DEFUNX ("symlink", Fsymlink, args, , +DEFUNX ("symlink", Fsymlink, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} symlink @var{old} @var{new} -@deftypefnx {} {[@var{err}, @var{msg}] =} symlink (@var{old}, @var{new}) +@deftypefnx {} {[@var{status}, @var{msg}] =} symlink (@var{old}, @var{new}) Create a symbolic link @var{new} which contains the string @var{old}. -If successful, @var{err} is 0 and @var{msg} is an empty string. -Otherwise, @var{err} is nonzero and @var{msg} contains a system-dependent +If successful, @var{status} is 0 and @var{msg} is an empty string. +Otherwise, @var{status} is -1 and @var{msg} contains a system-dependent error message. @seealso{link, unlink, readlink, lstat} @end deftypefn */) @@ -345,14 +367,25 @@ from = octave::sys::file_ops::tilde_expand (from); to = octave::sys::file_ops::tilde_expand (to); + octave_value_list retval; std::string msg; int status = octave::sys::symlink (from, to, msg); - if (status < 0) - return ovl (-1.0, msg); + if (nargout == 0) + { + if (status < 0) + error ("symlink: operation failed: %s", msg.c_str ()); + } else - return ovl (status, ""); + { + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); + } + + return retval; } DEFUNX ("readlink", Freadlink, args, , @@ -385,14 +418,14 @@ return ovl (result, status, ""); } -DEFMETHODX ("rename", Frename, interp, args, , +DEFMETHODX ("rename", Frename, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} rename @var{old} @var{new} -@deftypefnx {} {[@var{err}, @var{msg}] =} rename (@var{old}, @var{new}) +@deftypefnx {} {[@var{status}, @var{msg}] =} rename (@var{old}, @var{new}) Change the name of file @var{old} to @var{new}. -If successful, @var{err} is 0 and @var{msg} is an empty string. -Otherwise, @var{err} is nonzero and @var{msg} contains a system-dependent +If successful, @var{status} is 0 and @var{msg} is an empty string. +Otherwise, @var{status} is -1 and @var{msg} contains a system-dependent error message. @seealso{movefile, copyfile, ls, dir} @end deftypefn */) @@ -406,6 +439,7 @@ from = octave::sys::file_ops::tilde_expand (from); to = octave::sys::file_ops::tilde_expand (to); + octave_value_list retval; std::string msg; octave::event_manager& evmgr = interp.get_event_manager (); @@ -414,16 +448,22 @@ int status = octave::sys::rename (from, to, msg); - if (status < 0) + evmgr.file_renamed (status >= 0); + + if (nargout == 0) { - evmgr.file_renamed (false); - return ovl (-1.0, msg); + if (status < 0) + error ("rename: operation failed: %s", msg.c_str ()); } else { - evmgr.file_renamed (true); - return ovl (status, ""); + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); } + + return retval; } DEFUN (glob, args, , @@ -567,8 +607,8 @@ %! save (filename{n}, "a"); %! endfor %! else -%! rmdir (tmpdir); -%! error ("Couldn't change to temporary dir"); +%! sts = rmdir (tmpdir); +%! error ("Couldn't change to temporary directory"); %! endif %! else %! error ("Couldn't create temporary directory"); @@ -580,7 +620,7 @@ %! delete (filename{n}); %! endfor %! cd (cwd); -%! rmdir (tmpdir); +%! sts = rmdir (tmpdir); %! assert (result1, {"file1"; "myfile1"}); %! assert (result2, {"myfile1"}); %! assert (result3, {"file1"; "file2"});
--- a/libinterp/corefcn/dynamic-ld.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/dynamic-ld.cc Fri May 22 11:06:58 2020 +0200 @@ -199,13 +199,41 @@ return retval; } + void * + dynamic_loader::try_load_mex (dynamic_library& mex_file, + const std::string& fcn_name, bool& have_fmex) + { + // FCN_NAME is not used here, the mangler functions always return + // some form of "mexFunction". + + have_fmex = false; + + void *function = mex_file.search (fcn_name, mex_mangler); + + if (! function) + { + // FIXME: Can we determine this C mangling scheme + // automatically at run time or configure time? + + function = mex_file.search (fcn_name, mex_uscore_mangler); + + if (! function) + { + function = mex_file.search (fcn_name, mex_f77_mangler); + + if (function) + have_fmex = true; + } + } + + return function; + } + octave_function * dynamic_loader::load_mex (const std::string& fcn_name, const std::string& file_name, bool /*relative*/) { - octave_function *retval = nullptr; - unwind_protect frame; frame.protect_var (m_doing_load); @@ -230,29 +258,17 @@ bool have_fmex = false; - void *function = mex_file.search (fcn_name, mex_mangler); - - if (! function) - { - // FIXME: Can we determine this C mangling scheme - // automatically at run time or configure time? - function = mex_file.search (fcn_name, mex_uscore_mangler); - - if (! function) - { - function = mex_file.search (fcn_name, mex_f77_mangler); - - if (function) - have_fmex = true; - } - } + void *function = try_load_mex (mex_file, fcn_name, have_fmex); if (! function) error ("failed to install .mex file function '%s'", fcn_name.c_str ()); - retval = new octave_mex_function (function, have_fmex, mex_file, fcn_name); + void *symbol = mex_file.search ("__mx_has_interleaved_complex__"); - return retval; + bool interleaved = symbol != nullptr; + + return new octave_mex_function (function, interleaved, have_fmex, + mex_file, fcn_name); } bool
--- a/libinterp/corefcn/dynamic-ld.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/dynamic-ld.h Fri May 22 11:06:58 2020 +0200 @@ -128,6 +128,9 @@ static std::string mex_uscore_mangler (const std::string& name); static std::string mex_f77_mangler (const std::string& name); + + static void * try_load_mex (dynamic_library& mex_file, + const std::string& fcn_name, bool& have_fmex); }; }
--- a/libinterp/corefcn/error.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/error.cc Fri May 22 11:06:58 2020 +0200 @@ -751,9 +751,13 @@ panic_impossible (); if (nel > 1) - os << "\n\n"; + { + os << "\n"; + os << "Non-default warning states are:\n\n"; + os << " State Warning ID\n"; + } - // The state for all is always supposed to be first in the list. + // The state for "all" is always supposed to be first in the list. for (octave_idx_type i = 1; i < nel; i++) { @@ -1525,7 +1529,6 @@ octave_value curr_state = val.contents ("state"); // FIXME: this might be better with a dictionary object. - octave::tree_evaluator& tw = interp.get_evaluator (); octave_value curr_warning_states @@ -1579,39 +1582,28 @@ tw.set_auto_fcn_var (octave::stack_frame::SAVED_WARNING_STATES, m); - // Now ignore the "local" argument and continue to - // handle the current setting. + // Now ignore the "local" argument, + // and continue to handle the current setting. nargin--; } } - if (nargin >= 2 && arg2_lc == "all") + if ((nargin == 1 + && (arg1 == "on" || arg1 == "off" || arg1 == "error")) + || (nargin >= 2 && arg2_lc == "all")) { - // If "all" is explicitly given as ID. + // If "all" is given implicitly or explicitly as ID. + if (arg1 == "error") + error ("warning: cannot specify \"all\" warning ID with state \"error\""); octave_map tmp; - int is_error = (arg1 == "error"); - Cell id (1, 1 + 2*is_error); - Cell st (1, 1 + 2*is_error); + Cell id (1, 1); + Cell st (1, 1); id(0) = "all"; st(0) = arg1; - // Since internal Octave functions are not compatible, - // and "all"=="error" causes any "on" to throw an error, - // turning all warnings into errors should disable - // Octave:language-extension. - - if (is_error) - { - id(1) = "Octave:language-extension"; - st(1) = "off"; - - id(2) = "Octave:single-quote-string"; - st(2) = "off"; - } - tmp.assign ("identifier", id); tmp.assign ("state", st); @@ -1667,25 +1659,63 @@ else if (arg1 == "query") { if (arg2_lc == "all") - retval = es.warning_options (); + { + if (nargout > 0) + retval = es.warning_options (); + else + es.display_warning_options (octave_stdout); + } else if (arg2_lc == "backtrace" || arg2_lc == "debug" || arg2_lc == "verbose" || arg2_lc == "quiet") { - octave_scalar_map tmp; - tmp.assign ("identifier", arg2_lc); - if (arg2_lc == "backtrace") - tmp.assign ("state", es.backtrace_on_warning () ? "on" : "off"); - else if (arg2_lc == "debug") - tmp.assign ("state", es.debug_on_warning () ? "on" : "off"); - else if (arg2_lc == "verbose") - tmp.assign ("state", es.verbose_warning () ? "on" : "off"); + if (nargout > 0) + { + octave_scalar_map tmp; + tmp.assign ("identifier", arg2_lc); + if (arg2_lc == "backtrace") + tmp.assign ("state", es.backtrace_on_warning () ? "on" : "off"); + else if (arg2_lc == "debug") + tmp.assign ("state", es.debug_on_warning () ? "on" : "off"); + else if (arg2_lc == "verbose") + tmp.assign ("state", es.verbose_warning () ? "on" : "off"); + else + tmp.assign ("state", es.quiet_warning () ? "on" : "off"); + + retval = tmp; + } else - tmp.assign ("state", es.quiet_warning () ? "on" : "off"); - - retval = tmp; + { + if (arg2_lc == "backtrace") + octave_stdout << "\"backtrace\" warning state is \"" << + (es.backtrace_on_warning () ? "on" : "off") << + "\"\n"; + else if (arg2_lc == "debug") + octave_stdout << "\"debug\" warning state is \"" << + (es.debug_on_warning () ? "on" : "off") << + "\"\n"; + else if (arg2_lc == "verbose") + octave_stdout << "\"verbose\" warning state is \"" << + (es.verbose_warning () ? "on" : "off") << + "\"\n"; + else + octave_stdout << "\"quiet\" warning state is \"" << + (es.quiet_warning () ? "on" : "off") << + "\"\n"; + } } else - retval = es.warning_query (arg2); + { + if (nargout > 0) + retval = es.warning_query (arg2); + else + { + octave_scalar_map tmp = es.warning_query (arg2); + + octave_stdout << "\"" << arg2 << "\" warning state is \"" << + tmp.getfield ("state").string_value () << + "\"\n"; + } + } done = true; } @@ -1768,9 +1798,6 @@ } /* -%!test <*45753> -%! warning ("error"); -%! assert (! isempty (help ("warning"))); %!test <*51997> %! id = "Octave:logical-conversion"; @@ -1793,6 +1820,8 @@ %! idx = strcmp ({warnst.identifier}, "Octave:test-57290-ID"); %! assert (warnst(idx).state, "off"); +%!error <cannot specify "all" warning ID> warning ("error") + */ octave_value_list
--- a/libinterp/corefcn/file-io.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/file-io.cc Fri May 22 11:06:58 2020 +0200 @@ -1641,8 +1641,10 @@ %! c = textscan (str, "%4f %f", "delimiter", ";", "collectOutput", 1); %! assert (c, {[12, 34; 1234, 56789; 7, NaN]}); +## FIXME: Not Matlab compatible. Matlab prioritizes precision over field width +## so "12.234e+2", when read with "%10.2f %f", yields "12.23" and "4e+2". ## Ignore trailing delimiter, but use leading one -%!test +%!#test %! str = "12.234e+2,34, \n12345.789-9876j,78\n,10|3"; %! c = textscan (str, "%10.2f %f", "delimiter", ",", "collectOutput", 1, %! "expChars", "e|"); @@ -2285,7 +2287,46 @@ %! obs = textscan (str, "%q", "delimiter", ","); %! assert (obs, { { "a,b"; "c" } }); +%!test <*58008> +%! txt = sprintf ('literal_other_1_1;literal_other_1_2\nliteral_other_2_1;literal_other_2_2\nliteral_other_3_1;literal_other_3_2'); +%! nm1 = textscan (txt, 'literal%s literal%s', 'Delimiter', ';'); +%! assert (nm1{1}, {"_other_1_1" ; "_other_2_1" ; "_other_3_1"}); +%! assert (nm1{2}, {"_other_1_2" ; "_other_2_2" ; "_other_3_2"}); +%! nm2 = textscan (txt, 'literal%s;literal%s', 'Delimiter', ';'); +%! assert (nm1, nm2); + +%!test <*57612> +%! str = sprintf (['101,' '\n' '201,']); +%! C = textscan (str, '%s%q', 'Delimiter', ','); +%! assert (size (C), [1, 2]); +%! assert (C{1}, { "101"; "201" }); +%! assert (C{2}, { ""; "" }); + +%!test <*57612> +%! str = sprintf (['101,' '\n' '201,']); +%! C = textscan (str, '%s%f', 'Delimiter', ','); +%! assert (size (C), [1, 2]); +%! assert (C{1}, { "101"; "201" }); +%! assert (C{2}, [ NaN; NaN ]); + +%!test <*57612> +%! str = sprintf (['101,' '\n' '201,']); +%! C = textscan (str, '%s%d', 'Delimiter', ','); +%! assert (size (C), [1, 2]); +%! assert (C{1}, { "101"; "201" }); +%! assert (C{2}, int32 ([ 0; 0 ])); + +%!test <*51093> +%! str = sprintf ('a\t\tb\tc'); +%! C = textscan (str, '%s', 'Delimiter', '\t', 'MultipleDelimsAsOne', false); +%! assert (C{1}, {'a'; ''; 'b'; 'c'}); + +%!xtest <50743> +%! C = textscan ('5973459727478852968', '%u64'); +%! assert (C{1}, uint64 (5973459727478852968)); + */ + // These tests have end-comment sequences, so can't just be in a comment #if 0 ## Test unfinished comment @@ -2890,7 +2931,7 @@ %! assert (tmpdir, tmp_tmpdir); %! assert (tmpfname (1:4), "file"); %! unwind_protect_cleanup -%! rmdir (tmp_tmpdir); +%! sts = rmdir (tmp_tmpdir); %! for i = 1:numel (envvar) %! if (isempty (envdir{i})) %! unsetenv (envvar{i});
--- a/libinterp/corefcn/gl-render.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/gl-render.cc Fri May 22 11:06:58 2020 +0200 @@ -734,6 +734,8 @@ draw_surface (dynamic_cast<const surface::properties&> (props)); else if (go.isa ("patch")) draw_patch (dynamic_cast<const patch::properties&> (props)); + else if (go.isa ("scatter")) + draw_scatter (dynamic_cast<const scatter::properties&> (props)); else if (go.isa ("light")) draw_light (dynamic_cast<const light::properties&> (props)); else if (go.isa ("hggroup")) @@ -3695,6 +3697,116 @@ } void + opengl_renderer::draw_scatter (const scatter::properties& props) + { +#if defined (HAVE_OPENGL) + + // Do not render if the scatter object has incoherent data + std::string msg; + if (props.has_bad_data (msg)) + { + warning ("opengl_renderer: %s. Not rendering.", msg.c_str ()); + return; + } + + bool draw_all = selecting; + + if (draw_all || (! props.marker_is ("none") + && ! (props.markeredgecolor_is ("none") + && props.markerfacecolor_is ("none")))) + { + bool do_edge = draw_all || ! props.markeredgecolor_is ("none"); + bool do_face = draw_all || ! props.markerfacecolor_is ("none"); + + const Matrix x = props.get_xdata ().matrix_value (); + const Matrix y = props.get_ydata ().matrix_value (); + const Matrix z = props.get_zdata ().matrix_value (); + const Matrix c = props.get_color_data ().matrix_value (); + const Matrix s = props.get_sizedata ().matrix_value (); + + int np = x.rows (); + bool has_z = ! z.isempty (); + + // If markeredgecolor is "flat", mecolor is empty + Matrix mecolor = (draw_all ? Matrix (1, 3, 0.0) : + props.get_markeredgecolor_rgb ()); + Matrix mfcolor = (draw_all ? Matrix (1, 3, 0.0) : + props.get_markerfacecolor_rgb ()); + const double mea = props.get_markeredgealpha (); + const double mfa = props.get_markerfacealpha (); + + if (props.markerfacecolor_is ("auto")) + { + gh_manager& gh_mgr + = octave::__get_gh_manager__ ("opengl_renderer::draw_scatter"); + graphics_object go = gh_mgr.get_object (props.get___myhandle__ ()); + graphics_object ax = go.get_ancestor ("axes"); + const axes::properties& ax_props + = dynamic_cast<const axes::properties&> (ax.get_properties ()); + + mfcolor = ax_props.get_color ().matrix_value (); + } + + init_marker (props.get_marker (), std::sqrt (s(0)), + props.get_linewidth ()); + + uint8_t clip_mask = (props.is_clipping () ? 0x7F : 0x40); + uint8_t clip_ok = 0x40; + + Matrix cc; + if (! c.isempty ()) + { + if (c.rows () == 1) + cc = c; + else + { + cc.resize (1, 3); + cc(0) = c(0,0); + cc(1) = c(0,1); + cc(2) = c(0,2); + } + } + + for (int i = 0; i < np; i++) + { + if ((clip_code (x(i), y(i), (has_z ? z(i) : 0.0)) & clip_mask) + != clip_ok) + continue; + + if (c.rows () > 1) + { + cc(0) = c(i,0); + cc(1) = c(i,1); + cc(2) = c(i,2); + } + + Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor) + : Matrix ()); + Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor) + : Matrix ()); + + if (s.numel () > 1) + change_marker (props.get_marker (), std::sqrt (s(i))); + + draw_marker (x(i), y(i), (has_z ? z(i) : 0.0), lc, fc, mea, mfa); + } + + end_marker (); + } + +#else + + octave_unused_parameter (props); + + // This shouldn't happen because construction of opengl_renderer + // objects is supposed to be impossible if OpenGL is not available. + + panic_impossible (); + +#endif + } + + void opengl_renderer::draw_light (const light::properties& props) { #if defined (HAVE_OPENGL) @@ -4279,6 +4391,27 @@ } void + opengl_renderer::change_marker (const std::string& m, double size) + { +#if defined (HAVE_OPENGL) + + marker_id = make_marker_list (m, size, false); + filled_marker_id = make_marker_list (m, size, true); + +#else + + octave_unused_parameter (m); + octave_unused_parameter (size); + + // This shouldn't happen because construction of opengl_renderer + // objects is supposed to be impossible if OpenGL is not available. + + panic_impossible (); + +#endif + } + + void opengl_renderer::end_marker (void) { #if defined (HAVE_OPENGL) @@ -4304,7 +4437,8 @@ void opengl_renderer::draw_marker (double x, double y, double z, - const Matrix& lc, const Matrix& fc) + const Matrix& lc, const Matrix& fc, + const double la, const double fa) { #if defined (HAVE_OPENGL) @@ -4315,12 +4449,12 @@ if (filled_marker_id > 0 && fc.numel () > 0) { - m_glfcns.glColor3dv (fc.data ()); + m_glfcns.glColor4d (fc(0), fc(1), fc(2), fa); set_polygon_offset (true, -1.0); m_glfcns.glCallList (filled_marker_id); if (lc.numel () > 0) { - m_glfcns.glColor3dv (lc.data ()); + m_glfcns.glColor4d (lc(0), lc(1), lc(2), la); m_glfcns.glPolygonMode (GL_FRONT_AND_BACK, GL_LINE); m_glfcns.glEdgeFlag (GL_TRUE); set_polygon_offset (true, -2.0); @@ -4331,7 +4465,7 @@ } else if (marker_id > 0 && lc.numel () > 0) { - m_glfcns.glColor3dv (lc.data ()); + m_glfcns.glColor4d (lc(0), lc(1), lc(2), la); m_glfcns.glCallList (marker_id); } @@ -4342,6 +4476,8 @@ octave_unused_parameter (z); octave_unused_parameter (lc); octave_unused_parameter (fc); + octave_unused_parameter (la); + octave_unused_parameter (fa); // This shouldn't happen because construction of opengl_renderer // objects is supposed to be impossible if OpenGL is not available.
--- a/libinterp/corefcn/gl-render.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/gl-render.h Fri May 22 11:06:58 2020 +0200 @@ -81,6 +81,7 @@ virtual void draw_line (const line::properties& props); virtual void draw_surface (const surface::properties& props); virtual void draw_patch (const patch::properties& props); + virtual void draw_scatter (const scatter::properties& props); virtual void draw_light (const light::properties& props); virtual void draw_hggroup (const hggroup::properties& props); virtual void draw_text (const text::properties& props); @@ -115,9 +116,11 @@ } virtual void init_marker (const std::string& m, double size, float width); + virtual void change_marker (const std::string& m, double size); virtual void end_marker (void); virtual void draw_marker (double x, double y, double z, - const Matrix& lc, const Matrix& fc); + const Matrix& lc, const Matrix& fc, + const double la = 1.0, const double fa = 1.0); virtual void text_to_pixels (const std::string& txt, uint8NDArray& pixels,
--- a/libinterp/corefcn/gl2ps-print.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/gl2ps-print.cc Fri May 22 11:06:58 2020 +0200 @@ -39,6 +39,7 @@ #include <gl2ps.h> +#include "file-ops.h" #include "lo-mappers.h" #include "oct-locbuf.h" #include "tmpfile-wrapper.h" @@ -128,6 +129,13 @@ && fa.double_value () < 1) retval = true; } + else if (go.isa ("scatter")) + { + octave_value fa = go.get ("markerfacealpha"); + if (fa.is_scalar_type () && fa.is_double_type () + && fa.double_value () < 1) + retval = true; + } return retval; } @@ -410,9 +418,13 @@ if (n_begin != std::string::npos) { + // Strip any quote characters characters around filename size_t n_end = include_graph.find_last_not_of (" \"'"); include_graph = include_graph.substr (n_begin, n_end - n_begin + 1); + // Strip path from filename + n_begin = include_graph.find_last_of (octave::sys::file_ops::dir_sep_chars ()); + include_graph = include_graph.substr (n_begin + 1); } else include_graph = "foobar-inc";
--- a/libinterp/corefcn/graphics.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/graphics.cc Fri May 22 11:06:58 2020 +0200 @@ -1157,8 +1157,9 @@ { pfx = name.substr (0, 7); - if (pfx.compare ("surface") || pfx.compare ("hggroup") - || pfx.compare ("uipanel") || pfx.compare ("uitable")) + if (pfx.compare ("surface") || pfx.compare ("scatter") + || pfx.compare ("hggroup") || pfx.compare ("uipanel") + || pfx.compare ("uitable")) offset = 7; else if (len >= 9) { @@ -1226,6 +1227,8 @@ go = new light (h, p); else if (type.compare ("patch")) go = new patch (h, p); + else if (type.compare ("scatter")) + go = new scatter (h, p); else if (type.compare ("surface")) go = new surface (h, p); else if (type.compare ("hggroup")) @@ -1784,18 +1787,18 @@ } /* -## Test validation of uicontextmenu property +## Test validation of contextmenu property %!test %! hf = figure ("visible", "off"); %! unwind_protect %! hax = axes ("parent", hf); %! hpa = patch ("parent", hax); %! try -%! set (hax, "uicontextmenu", hpa); +%! set (hax, "contextmenu", hpa); %! catch %! err = lasterr (); %! end_try_catch -%! assert (err, 'set: invalid graphics object type for property "uicontextmenu"'); +%! assert (err, 'set: invalid graphics object type for property "contextmenu"'); %! unwind_protect_cleanup %! delete (hf); %! end_unwind_protect @@ -2297,8 +2300,9 @@ { pfx = name.substr (0, 7); - if (pfx.compare ("surface") || pfx.compare ("hggroup") - || pfx.compare ("uipanel") || pfx.compare ("uitable")) + if (pfx.compare ("surface") || pfx.compare ("scatter") + || pfx.compare ("hggroup")|| pfx.compare ("uipanel") + || pfx.compare ("uitable")) offset = 7; else if (len > 9) { @@ -2357,6 +2361,8 @@ has_property = image::properties::has_core_property (pname); else if (pfx == "patch") has_property = patch::properties::has_core_property (pname); + else if (pfx == "scatter") + has_property = scatter::properties::has_core_property (pname); else if (pfx == "surface") has_property = surface::properties::has_core_property (pname); else if (pfx == "hggroup") @@ -2439,8 +2445,9 @@ { pfx = name.substr (0, 7); - if (pfx.compare ("surface") || pfx.compare ("hggroup") - || pfx.compare ("uipanel") || pfx.compare ("uitable")) + if (pfx.compare ("surface") || pfx.compare ("scatter") + || pfx.compare ("hggroup") || pfx.compare ("uipanel") + || pfx.compare ("uitable")) offset = 7; else if (len > 9) { @@ -3494,15 +3501,15 @@ } void -base_properties::update_uicontextmenu (void) const -{ - if (uicontextmenu.get ().isempty ()) +base_properties::update_contextmenu (void) const +{ + if (contextmenu.get ().isempty ()) return; gh_manager& gh_mgr - = octave::__get_gh_manager__ ("base_properties::update_uicontextmenu"); - - graphics_object go = gh_mgr.get_object (uicontextmenu.get ()); + = octave::__get_gh_manager__ ("base_properties::update_contextmenu"); + + graphics_object go = gh_mgr.get_object (contextmenu.get ()); if (go && go.isa ("uicontextmenu")) { @@ -5278,7 +5285,7 @@ axes::properties::sync_positions (void) { // First part is equivalent to 'update_tightinset ()' - if (activepositionproperty.is ("position")) + if (positionconstraint.is ("innerposition")) update_position (); else update_outerposition (); @@ -5295,7 +5302,7 @@ tightinset = tinset; set_units (old_units); update_transform (); - if (activepositionproperty.is ("position")) + if (positionconstraint.is ("innerposition")) update_position (); else update_outerposition (); @@ -5346,7 +5353,7 @@ %! hf = figure ("visible", "off"); %! graphics_toolkit (hf, "qt"); %! fpos = get (hf, "position"); -%! set (gca, "activepositionproperty", "position"); +%! set (gca, "positionconstraint", "innerposition"); %! unwind_protect %! plot (rand (3)); %! position = get (gca, "position"); @@ -7514,7 +7521,7 @@ void axes::properties::update_outerposition (void) { - set_activepositionproperty ("outerposition"); + set_positionconstraint ("outerposition"); caseless_str old_units = get_units (); set_units ("normalized"); @@ -7573,7 +7580,7 @@ void axes::properties::update_position (void) { - set_activepositionproperty ("position"); + set_positionconstraint ("innerposition"); caseless_str old_units = get_units (); set_units ("normalized"); @@ -7632,7 +7639,7 @@ double right_margin = std::max (linset(2), tinset(2)); double top_margin = std::max (linset(3), tinset(3)); - if (activepositionproperty.is ("position")) + if (positionconstraint.is ("innerposition")) { Matrix innerbox = position.get ().matrix_value (); @@ -8732,6 +8739,11 @@ xproperties.set_has3Dkids ((max_val - min_val) > std::numeric_limits<double>::epsilon ()); + // FIXME: How to correctly handle (positive or negative) log scale? + if ((! octave::math::isfinite (min_val) + || ! octave::math::isfinite (max_val)) + && ! xproperties.zscale_is ("log")) + min_val = max_val = 0.; limits = xproperties.get_axis_limits (min_val, max_val, min_pos, max_neg, @@ -10217,6 +10229,119 @@ // --------------------------------------------------------------------- octave_value +scatter::properties::get_color_data (void) const +{ + octave_value c = get_cdata (); + if (c.is_undefined () || c.isempty ()) + return Matrix (); + else + return convert_cdata (*this, c, c.columns () == 1, 2); +} + +void +scatter::properties::update_data (void) +{ + Matrix xd = get_xdata ().matrix_value (); + Matrix yd = get_ydata ().matrix_value (); + Matrix zd = get_zdata ().matrix_value (); + Matrix cd = get_cdata ().matrix_value (); + Matrix sd = get_sizedata ().matrix_value (); + + bad_data_msg = ""; + if (xd.dims () != yd.dims () + || (xd.dims () != zd.dims () && ! zd.isempty ())) + { + bad_data_msg = "x/y/zdata must have the same dimensions"; + return; + } + + octave_idx_type x_rows = xd.rows (); + octave_idx_type c_cols = cd.columns (); + octave_idx_type c_rows = cd.rows (); + + if (! cd.isempty () && (c_rows != 1 || c_cols != 3) + && (c_rows != x_rows || (c_cols != 1 && c_cols != 3))) + { + bad_data_msg = "cdata must be an rgb triplet or have the same number of " + "rows as X and one or three columns"; + return; + } + + octave_idx_type s_rows = sd.rows (); + if (s_rows != 1 && s_rows != x_rows) + { + bad_data_msg = "sizedata must be a scalar or a vector with the same " + "dimensions as X"; + return; + } +} + +static bool updating_scatter_cdata = false; + +void +scatter::properties::update_color (void) +{ + if (updating_scatter_cdata) + return; + + gh_manager& gh_mgr + = octave::__get_gh_manager__ ("scatter::properties::update_color"); + + graphics_object go = gh_mgr.get_object (get___myhandle__ ()); + + axes::properties& parent_axes_prop + = dynamic_cast<axes::properties&> + (go.get_ancestor ("axes").get_properties ()); + + Matrix color_order = parent_axes_prop.get_colororder ().matrix_value (); + Matrix series_idx = get_seriesindex ().matrix_value (); + octave_idx_type s = (static_cast<octave_idx_type> (series_idx(0)) - 1) + % color_order.rows (); + + Matrix color = Matrix (1, 3, 0.); + color(0) = color_order(s,0); + color(1) = color_order(s,1); + color(2) = color_order(s,2); + + octave::unwind_protect frame; + frame.protect_var (updating_scatter_cdata); + updating_scatter_cdata = true; + + set_cdata (color); + set_cdatamode ("auto"); +} + +void +scatter::initialize (const graphics_object& go) +{ + base_graphics_object::initialize (go); + + Matrix series_idx = xproperties.get_seriesindex ().matrix_value (); + if (series_idx.isempty ()) + { + // Increment series index counter in parent axes + axes::properties& parent_axes_prop + = dynamic_cast<axes::properties&> + (go.get_ancestor ("axes").get_properties ()); + + if (! parent_axes_prop.nextplot_is ("add")) + parent_axes_prop.set_nextseriesindex (1); + + series_idx.resize (1, 1); + series_idx(0) = parent_axes_prop.get_nextseriesindex (); + xproperties.set_seriesindex (series_idx); + + parent_axes_prop.set_nextseriesindex + (parent_axes_prop.get_nextseriesindex () + 1); + } + + if (xproperties.cdatamode_is ("auto")) + xproperties.update_color (); +} + +// --------------------------------------------------------------------- + +octave_value surface::properties::get_color_data (void) const { return convert_cdata (*this, get_cdata (), cdatamapping_is ("scaled"), 3); @@ -10806,8 +10931,8 @@ graphics_object go = gh_mgr.get_object (*it); if (go.valid_object () - && go.get ("uicontextmenu") == xproperties.get___myhandle__ ()) - go.set ("uicontextmenu", Matrix ()); + && go.get ("contextmenu") == xproperties.get___myhandle__ ()) + go.set ("contextmenu", Matrix ()); } } @@ -12440,6 +12565,7 @@ plist_map["text"] = text::properties::factory_defaults (); plist_map["image"] = image::properties::factory_defaults (); plist_map["patch"] = patch::properties::factory_defaults (); + plist_map["scatter"] = scatter::properties::factory_defaults (); plist_map["surface"] = surface::properties::factory_defaults (); plist_map["light"] = light::properties::factory_defaults (); plist_map["hggroup"] = hggroup::properties::factory_defaults (); @@ -13235,7 +13361,7 @@ if (go.isa ("surface")) nd = 3; - else if ((go.isa ("line") || go.isa ("patch")) + else if ((go.isa ("line") || go.isa ("patch") || go.isa ("scatter")) && ! go.get ("zdata").isempty ()) nd = 3; else @@ -13338,6 +13464,15 @@ GO_BODY (patch); } +DEFMETHOD (__go_scatter__, interp, args, , + doc: /* -*- texinfo -*- +@deftypefn {} {} __go_scatter__ (@var{parent}) +Undocumented internal function. +@end deftypefn */) +{ + GO_BODY (scatter); +} + DEFMETHOD (__go_light__, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __go_light__ (@var{parent}) @@ -14535,6 +14670,42 @@ return ovl (go.get_toolkit ().get_pixels (go)); } +DEFMETHOD (__get_position__, interp, args, , + doc: /* -*- texinfo -*- +@deftypefn {} {@var{pos} =} __get_position__ (@var{h}, @var{units}) +Internal function. + +Return the position of the graphics object @var{h} in the specified +@var{units}. +@end deftypefn */) +{ + if (args.length () != 2) + print_usage (); + + double h + = args(0).xdouble_value ("__get_position__: H must be a graphics handle"); + + std::string units + = args(1).xstring_value ("__get_position__: UNITS must be a string"); + + gh_manager& gh_mgr = interp.get_gh_manager (); + + graphics_object go = gh_mgr.get_object (h); + + if (h == 0 || ! go) + error ("__get_position__: H must be a handle to a valid graphics object"); + + graphics_object parent_go = gh_mgr.get_object (go.get_parent ()); + Matrix bbox = parent_go.get_properties ().get_boundingbox (true) + .extract_n (0, 2, 1, 2); + + Matrix pos = convert_position (go.get ("position").matrix_value (), + go.get ("units").string_value (), + units, bbox); + + return ovl (pos); +} + DEFUN (__get_system_fonts__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{font_struct} =} __get_system_fonts__ ()
--- a/libinterp/corefcn/graphics.in.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/graphics.in.h Fri May 22 11:06:58 2020 +0200 @@ -2308,6 +2308,18 @@ void set___modified__ (const octave_value& val) { __modified__ = val; } + // Redirect calls to "uicontextmenu" to "contextmenu". + + graphics_handle get_uicontextmenu (void) const + { + return get_contextmenu (); + } + + void set_uicontextmenu (const octave_value& val) + { + set_contextmenu (val); + } + void reparent (const graphics_handle& new_parent) { parent = new_parent; } // Update data limits for AXIS_TYPE (xdata, ydata, etc.) in the parent @@ -2318,7 +2330,7 @@ virtual void update_axis_limits (const std::string& axis_type, const graphics_handle& h) const; - virtual void update_uicontextmenu (void) const; + virtual void update_contextmenu (void) const; virtual void delete_children (bool clear = false, bool from_root = false) { @@ -2378,6 +2390,7 @@ callback_property buttondownfcn , Matrix () children_property children gf , Matrix () bool_property clipping , "on" + handle_property contextmenu u , graphics_handle () callback_property createfcn , Matrix () callback_property deletefcn , Matrix () radio_property handlevisibility u , "{on}|callback|off" @@ -2389,7 +2402,7 @@ bool_property selectionhighlight , "on" string_property tag s , "" string_property type frs , ty - handle_property uicontextmenu u , graphics_handle () + handle_property uicontextmenu gsh , graphics_handle () any_property userdata , Matrix () bool_property visible u , "on" @@ -2425,7 +2438,7 @@ virtual void init (void) { - uicontextmenu.add_constraint ("uicontextmenu"); + contextmenu.add_constraint ("uicontextmenu"); } }; @@ -3453,6 +3466,43 @@ void sync_positions (void); + // Redirect calls to "activepositionproperty" to "positionconstraint". + + std::string get_activepositionproperty (void) const + { + std::string cur_val; + + if (positionconstraint.is ("innerposition")) + cur_val = "position"; + else + cur_val = "outerposition"; + + return cur_val; + } + + void set_activepositionproperty (const octave_value& val) + { + // call set method to validate the input + activepositionproperty.set (val); + + if (val.char_matrix_value ().row_as_string (0) == "position") + set_positionconstraint ("innerposition"); + else + set_positionconstraint (val); + } + + // Redirect calls to "innerposition" to "position". + + octave_value get_innerposition (void) const + { + return get_position (); + } + + void set_innerposition (const octave_value& val) + { + set_position (val); + } + void update_autopos (const std::string& elem_type); void update_xlabel_position (void); void update_ylabel_position (void); @@ -3622,9 +3672,12 @@ // Programming note: Keep property list sorted if new ones are added. BEGIN_PROPERTIES (axes) - radio_property activepositionproperty , "{outerposition}|position" + radio_property activepositionproperty gsh , "{outerposition}|position" row_vector_property alim m , default_lim () radio_property alimmode , "{auto}|manual" + // FIXME: not yet implemented + array_property alphamap , Matrix () + radio_property alphascale , "{linear}|log" color_property ambientlightcolor , color_values (1, 1, 1) bool_property box u , "off" radio_property boxstyle , "{back}|full" @@ -3643,12 +3696,15 @@ array_property colormap sg , Matrix () array_property colororder , default_colororder () double_property colororderindex , 1.0 + radio_property colorscale , "{linear}|log" array_property currentpoint , Matrix (2, 3, 0.0) row_vector_property dataaspectratio mu , Matrix (1, 3, 1.0) radio_property dataaspectratiomode u , "{auto}|manual" radio_property fontangle u , "{normal}|italic" string_property fontname u , OCTAVE_DEFAULT_FONTNAME - double_property fontsize u , 10 + double_property fontsize mu , 10 + // FIXME: not yet implemented + radio_property fontsizemode , "{auto}|manual" bool_property fontsmoothing u , "on" radio_property fontunits SU , "{points}|inches|centimeters|normalized|pixels" radio_property fontweight u , "{normal}|bold" @@ -3657,8 +3713,15 @@ color_property gridcolor m , color_property (color_values (0.15, 0.15, 0.15), radio_values ("none")) radio_property gridcolormode , "{auto}|manual" radio_property gridlinestyle , "{-}|--|:|-.|none" + array_property innerposition sg , default_axes_position () + // FIXME: Should be an array of "interaction objects". Make it read-only for now. + any_property interactions r , Matrix () double_property labelfontsizemultiplier u , 1.1 radio_property layer u , "{bottom}|top" + // FIXME: Should be a "layoutoptions" object. Make it read-only for now. + handle_property layout r , graphics_handle () + // FIXME: Should be a "legend" object. Make it read-only for now. + handle_property legend r , graphics_handle () // FIXME: should be kind of string array. any_property linestyleorder S , "-" double_property linestyleorderindex , 1.0 @@ -3669,10 +3732,12 @@ radio_property minorgridcolormode , "{auto}|manual" radio_property minorgridlinestyle , "{:}|-|--|-.|none" radio_property nextplot , "{replace}|add|replacechildren" + double_property nextseriesindex r , 1.0 array_property outerposition u , default_axes_outerposition () row_vector_property plotboxaspectratio mu , Matrix (1, 3, 1.0) radio_property plotboxaspectratiomode u , "{auto}|manual" array_property position u , default_axes_position () + radio_property positionconstraint , "{outerposition}|innerposition" radio_property projection , "{orthographic}|perspective" radio_property sortmethod , "{depth}|childorder" radio_property tickdir mu , "{in}|out" @@ -3684,9 +3749,12 @@ handle_property title SOf , make_graphics_handle ("text", __myhandle__, false, false, false) double_property titlefontsizemultiplier u , 1.1 radio_property titlefontweight u , "{bold}|normal" - // FIXME: uicontextmenu should be moved here. + // FIXME: Should be a "axestoolbar" object. Make it read-only for now. + handle_property toolbar r , graphics_handle () radio_property units SU , "{normalized}|inches|centimeters|points|pixels|characters" array_property view u , default_axes_view () + // FIXME: Should be a "ruler" object. Make it read-only for now. + handle_property xaxis r , graphics_handle () radio_property xaxislocation u , "{bottom}|top|origin" color_property xcolor mu , color_property (color_values (0.15, 0.15, 0.15), radio_values ("none")) radio_property xcolormode , "{auto}|manual" @@ -3704,6 +3772,8 @@ radio_property xticklabelmode u , "{auto}|manual" double_property xticklabelrotation , 0.0 radio_property xtickmode u , "{auto}|manual" + // FIXME: Should be a "ruler" object. Make it read-only for now. + handle_property yaxis r , graphics_handle () radio_property yaxislocation u , "{left}|right|origin" color_property ycolor mu , color_property (color_values (0.15, 0.15, 0.15), radio_values ("none")) radio_property ycolormode , "{auto}|manual" @@ -3720,6 +3790,8 @@ radio_property yticklabelmode u , "{auto}|manual" double_property yticklabelrotation , 0.0 radio_property ytickmode u , "{auto}|manual" + // FIXME: Should be a "ruler" object. Make it read-only for now. + handle_property zaxis r , graphics_handle () color_property zcolor mu , color_property (color_values (0.15, 0.15, 0.15), radio_values ("none")) radio_property zcolormode , "{auto}|manual" radio_property zdir u , "{normal}|reverse" @@ -4364,8 +4436,7 @@ color_property edgecolor , color_property (radio_values ("{none}"), color_values (0, 0, 0)) bool_property editing , "off" array_property extent rG , Matrix (1, 4, 0.0) - // FIXME: DEPRECATED: Remove "oblique" in version 7. - radio_property fontangle u , "{normal}|italic|oblique" + radio_property fontangle u , "{normal}|italic" string_property fontname u , OCTAVE_DEFAULT_FONTNAME double_property fontsize u , 10 bool_property fontsmoothing u , "on" @@ -4472,11 +4543,6 @@ { update_font (); update_text_extent (); - // FIXME: DEPRECATED: Remove warning for "oblique" in version 7. - if (fontangle.is ("oblique")) - warning_with_id ("Octave:deprecated-property", - "Setting 'fontangle' to '%s' is deprecated, \ -use 'italic' or 'normal'.", fontangle.current_value ().c_str ()); } void update_fontweight (void) { update_font (); update_text_extent (); } @@ -5060,6 +5126,238 @@ // --------------------------------------------------------------------- +class OCTINTERP_API scatter : public base_graphics_object +{ +public: + class OCTINTERP_API properties : public base_properties + { + public: + octave_value get_color_data (void) const; + + // Matlab allows incoherent data to be stored in scatter properties. + // The scatter object should then be ignored by the renderer. + bool has_bad_data (std::string& msg) const + { + msg = bad_data_msg; + return ! msg.empty (); + } + + bool is_aliminclude (void) const + { return aliminclude.is_on (); } + std::string get_aliminclude (void) const + { return aliminclude.current_value (); } + + bool is_climinclude (void) const + { return climinclude.is_on (); } + std::string get_climinclude (void) const + { return climinclude.current_value (); } + + // See the genprops.awk script for an explanation of the + // properties declarations. + // Programming note: Keep property list sorted if new ones are added. + + BEGIN_PROPERTIES (scatter) + array_property annotation , Matrix () + array_property cdata mu , Matrix () + radio_property cdatamode u , "{auto}|manual" + string_property cdatasource , "" + array_property datatiptemplate , Matrix () + string_property displayname , "" + array_property latitudedata , Matrix () + string_property latitudedatasource , "" + double_property linewidth , 0.5 + array_property longitudedata , Matrix () + string_property longitudedatasource , "" + radio_property marker , "{o}|+|*|.|x|s|square|d|diamond|^|v|>|<|p|pentagram|h|hexagram|none" + double_property markeredgealpha , 1.0 + color_property markeredgecolor , color_property (radio_values ("{flat}"), color_values (0, 0, 0)) + double_property markerfacealpha , 1.0 + color_property markerfacecolor , color_property (radio_values ("{none}|auto|flat"), color_values (0, 0, 0)) + array_property rdata , Matrix () + string_property rdatasource , "" + array_property seriesindex u , Matrix () + array_property sizedata u , Matrix () + string_property sizedatasource , "" + array_property thetadata , Matrix () + string_property thetadatasource , "" + array_property xdata u , Matrix () + string_property xdatasource , "" + array_property ydata u , Matrix () + string_property ydatasource , "" + array_property zdata u , Matrix () + string_property zdatasource , "" + + // hidden properties for limit computation + row_vector_property alim hlr , Matrix () + row_vector_property clim hlr , Matrix () + row_vector_property xlim hlr , Matrix () + row_vector_property ylim hlr , Matrix () + row_vector_property zlim hlr , Matrix () + bool_property aliminclude hlg , "on" + bool_property climinclude hlg , "on" + bool_property xliminclude hl , "on" + bool_property yliminclude hl , "on" + bool_property zliminclude hl , "on" + END_PROPERTIES + + protected: + void init (void) + { + xdata.add_constraint (dim_vector (-1, 1)); + xdata.add_constraint (dim_vector (1, -1)); + xdata.add_constraint (dim_vector (-1, 0)); + xdata.add_constraint (dim_vector (0, -1)); + ydata.add_constraint (dim_vector (-1, 1)); + ydata.add_constraint (dim_vector (1, -1)); + ydata.add_constraint (dim_vector (-1, 0)); + ydata.add_constraint (dim_vector (0, -1)); + zdata.add_constraint (dim_vector (-1, 1)); + zdata.add_constraint (dim_vector (1, -1)); + zdata.add_constraint (dim_vector (-1, 0)); + zdata.add_constraint (dim_vector (0, -1)); + sizedata.add_constraint ("min", 0.0, false); + sizedata.add_constraint (dim_vector (-1, 1)); + sizedata.add_constraint (dim_vector (1, -1)); + sizedata.add_constraint (dim_vector (-1, 0)); + sizedata.add_constraint (dim_vector (0, -1)); + cdata.add_constraint ("double"); + cdata.add_constraint ("single"); + cdata.add_constraint ("logical"); + cdata.add_constraint ("int8"); + cdata.add_constraint ("int16"); + cdata.add_constraint ("int32"); + cdata.add_constraint ("int64"); + cdata.add_constraint ("uint8"); + cdata.add_constraint ("uint16"); + cdata.add_constraint ("uint32"); + cdata.add_constraint ("uint64"); + cdata.add_constraint ("real"); + cdata.add_constraint (dim_vector (-1, 1)); + cdata.add_constraint (dim_vector (-1, 3)); + cdata.add_constraint (dim_vector (-1, 0)); + cdata.add_constraint (dim_vector (0, -1)); + + linewidth.add_constraint ("min", 0.0, false); + seriesindex.add_constraint (dim_vector (1, 1)); + seriesindex.add_constraint (dim_vector (-1, 0)); + seriesindex.add_constraint (dim_vector (0, -1)); + } + + public: + void update_color (void); + + private: + std::string bad_data_msg; + + void update_xdata (void) + { + if (get_xdata ().isempty ()) + { + // For compatibility with Matlab behavior, + // if x/ydata are set empty, silently empty other *data properties. + set_ydata (Matrix ()); + set_zdata (Matrix ()); + bool cdatamode_auto = cdatamode.is ("auto"); + set_cdata (Matrix ()); + if (cdatamode_auto) + set_cdatamode ("auto"); + } + + set_xlim (xdata.get_limits ()); + + update_data (); + } + + void update_ydata (void) + { + if (get_ydata ().isempty ()) + { + set_xdata (Matrix ()); + set_zdata (Matrix ()); + bool cdatamode_auto = cdatamode.is ("auto"); + set_cdata (Matrix ()); + if (cdatamode_auto) + set_cdatamode ("auto"); + } + + set_ylim (ydata.get_limits ()); + + update_data (); + } + + void update_zdata (void) + { + set_zlim (zdata.get_limits ()); + + update_data (); + } + + void update_sizedata (void) + { + update_data (); + } + + void update_cdata (void) + { + if (get_cdata ().matrix_value ().rows () == 1) + set_clim (cdata.get_limits ()); + else + clim = cdata.get_limits (); + + update_data (); + } + + void update_cdatamode (void) + { + if (cdatamode.is ("auto")) + update_color (); + } + + void update_seriesindex (void) + { + if (cdatamode.is ("auto")) + update_color (); + } + + void update_data (void); + + }; + +private: + properties xproperties; + property_list default_properties; + +public: + scatter (const graphics_handle& mh, const graphics_handle& p) + : base_graphics_object (), xproperties (mh, p) + { + // FIXME: seriesindex should increment by one each time a new scatter + // object is added to the axes. + } + + ~scatter (void) = default; + + base_properties& get_properties (void) { return xproperties; } + + const base_properties& get_properties (void) const { return xproperties; } + + bool valid_object (void) const { return true; } + + bool has_readonly_property (const caseless_str& pname) const + { + bool retval = xproperties.has_readonly_property (pname); + if (! retval) + retval = base_properties::has_readonly_property (pname); + return retval; + } + +protected: + void initialize (const graphics_object& go); + +}; + +// --------------------------------------------------------------------- + class OCTINTERP_API surface : public base_graphics_object { public: @@ -5412,6 +5710,7 @@ // --------------------------------------------------------------------- +// FIXME: This class has been renamed to "contextmenu" in Matlab R2020a. class OCTINTERP_API uicontextmenu : public base_graphics_object { public: @@ -5502,8 +5801,7 @@ bool_property clipping , "on" radio_property enable , "{on}|inactive|off" array_property extent rG , Matrix (1, 4, 0.0) - // FIXME: DEPRECATED: Remove "oblique" in version 7. - radio_property fontangle u , "{normal}|italic|oblique" + radio_property fontangle u , "{normal}|italic" string_property fontname u , OCTAVE_DEFAULT_FONTNAME double_property fontsize u , 10 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" @@ -5553,11 +5851,6 @@ void update_fontangle (void) { update_text_extent (); - // FIXME: DEPRECATED: Remove warning for "oblique" in version 7. - if (fontangle.is ("oblique")) - warning_with_id ("Octave:deprecated-property", - "Setting 'fontangle' to '%s' is deprecated, \ -use 'italic' or 'normal'.", fontangle.current_value ().c_str ()); } void update_fontweight (void) { update_text_extent (); } @@ -5618,8 +5911,7 @@ radio_property bordertype , "none|{etchedin}|etchedout|beveledin|beveledout|line" double_property borderwidth , 1 bool_property clipping , "on" - // FIXME: DEPRECATED: Remove "oblique" in version 7. - radio_property fontangle , "{normal}|italic|oblique" + radio_property fontangle , "{normal}|italic" string_property fontname , OCTAVE_DEFAULT_FONTNAME double_property fontsize , 10 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" @@ -5710,8 +6002,7 @@ color_property backgroundcolor , color_values (0.94, 0.94, 0.94) radio_property bordertype , "none|{etchedin}|etchedout|beveledin|beveledout|line" double_property borderwidth , 1 - // FIXME: DEPRECATED: Remove "oblique" in version 7. - radio_property fontangle , "{normal}|italic|oblique" + radio_property fontangle , "{normal}|italic" string_property fontname , OCTAVE_DEFAULT_FONTNAME double_property fontsize , 10 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" @@ -5804,8 +6095,7 @@ any_property data u , Matrix () bool_property enable , "on" array_property extent rG , Matrix (1, 4, 0.0) - // FIXME: DEPRECATED: Remove "oblique" in version 7. - radio_property fontangle u , "{normal}|italic|oblique" + radio_property fontangle u , "{normal}|italic" string_property fontname u , OCTAVE_DEFAULT_FONTNAME double_property fontsize u , 10 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" @@ -5846,11 +6136,6 @@ void update_fontangle (void) { update_table_extent (); - // FIXME: DEPRECATED: Remove warning for "oblique" in version 7. - if (fontangle.is ("oblique")) - warning_with_id ("Octave:deprecated-property", - "Setting 'fontangle' to '%s' is deprecated, \ -use 'italic' or 'normal'.", fontangle.current_value ().c_str ()); } void update_fontweight (void) { update_table_extent (); } };
--- a/libinterp/corefcn/input.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/input.cc Fri May 22 11:06:58 2020 +0200 @@ -1406,40 +1406,3 @@ return input_sys.mfile_encoding (args, nargout); } - -// Always define these functions. The macro is intended to allow the -// declarations to be hidden, not so that Octave will not provide the -// functions if they are requested. - -// #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -bool -octave_yes_or_no (const std::string& prompt) -{ - octave::input_system& input_sys - = octave::__get_input_system__ ("set_default_prompts"); - - return input_sys.yes_or_no (prompt); -} - -void -remove_input_event_hook_functions (void) -{ - octave::input_system& input_sys - = octave::__get_input_system__ ("remove_input_event_hook_functions"); - - input_sys.clear_input_event_hooks (); -} - -// Fix things up so that input can come from the standard input. This -// may need to become much more complicated, which is why it's in a -// separate function. - -FILE * -get_input_from_stdin (void) -{ - octave::command_editor::set_input_stream (stdin); - return octave::command_editor::get_input_stream (); -} - -// #endif
--- a/libinterp/corefcn/input.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/input.h Fri May 22 11:06:58 2020 +0200 @@ -278,17 +278,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::input_system::yes_or_no' instead") -extern bool octave_yes_or_no (const std::string& prompt); - -OCTAVE_DEPRECATED (5, "use 'octave::input_system::clear_input_event_hooks' instead") -extern void remove_input_event_hook_functions (void); - -OCTAVE_DEPRECATED (5, "this function will be removed in a future version of Octave") -extern OCTINTERP_API FILE * get_input_from_stdin (void); - #endif - -#endif
--- a/libinterp/corefcn/load-save.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/load-save.cc Fri May 22 11:06:58 2020 +0200 @@ -1820,6 +1820,46 @@ return load_save_sys.save (args, nargout); } +/* +## Save and load strings with "-v6" +%!test +%! A = A2 = ["foo"; "bar"]; +%! B = B2 = "foobar"; +%! C = C2 = {"foo", "bar"}; +%! D = D2 = {"Saint Barthélemy", "Saint Kitts and Nevis"}; +%! mat_file = [tempname(), ".mat"]; +%! unwind_protect +%! save (mat_file, "A", "B", "C", "D", "-v6"); +%! clear ("A", "B", "C", "D"); +%! load (mat_file); +%! unwind_protect_cleanup +%! unlink (mat_file); +%! end_unwind_protect +%! assert (A, A2); +%! assert (B, B2); +%! assert (C, C2); +%! assert (D, D2); + +## Save and load strings with "-v7" +%!testif HAVE_ZLIB +%! A = A2 = ["foo"; "bar"]; +%! B = B2 = "foobar"; +%! C = C2 = {"foo", "bar"}; +%! D = D2 = {"Saint Barthélemy", "Saint Kitts and Nevis"}; +%! mat_file = [tempname(), ".mat"]; +%! unwind_protect +%! save (mat_file, "A", "B", "C", "D", "-v7"); +%! clear ("A", "B", "C", "D"); +%! load (mat_file); +%! unwind_protect_cleanup +%! unlink (mat_file); +%! end_unwind_protect +%! assert (A, A2); +%! assert (B, B2); +%! assert (C, C2); +%! assert (D, D2); +*/ + DEFMETHOD (crash_dumps_octave_core, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} crash_dumps_octave_core ()
--- a/libinterp/corefcn/ls-mat5.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/ls-mat5.cc Fri May 22 11:06:58 2020 +0200 @@ -50,6 +50,7 @@ #include "oct-time.h" #include "quit.h" #include "str-vec.h" +#include "unistr-wrappers.h" #include "Cell.h" #include "defaults.h" @@ -1404,58 +1405,84 @@ tc = ctmp; } - else + else if (arrayclass == MAT_FILE_CHAR_CLASS) { - if (arrayclass == MAT_FILE_CHAR_CLASS) + bool converted = false; + if (re.isvector () && (type == miUTF16 || type == miUINT16)) { - if (type == miUTF16 || type == miUTF32) - { - bool found_big_char = false; - for (octave_idx_type i = 0; i < n; i++) - { - if (re(i) > 127) - { - re(i) = '?'; - found_big_char = true; - } - } - - if (found_big_char) - warning_with_id ("Octave:load:unsupported-utf-char", - "load: can not read non-ASCII portions of UTF characters; replacing unreadable characters with '?'"); - } - else if (type == miUTF8) + uint16NDArray u16 = re; + const uint16_t *u16_str + = reinterpret_cast<const uint16_t *> (u16.data ()); + + // Convert to UTF-8. + size_t n8; + uint8_t *u8_str = octave_u16_to_u8_wrapper (u16_str, + u16.numel (), + nullptr, &n8); + if (u8_str) { - // Search for multi-byte encoded UTF8 characters and - // replace with 0x3F for '?'... Give the user a warning - - bool utf8_multi_byte = false; - for (octave_idx_type i = 0; i < n; i++) + // FIXME: Is there a better way to construct a charMatrix + // from a non zero terminated buffer? + tc = charMatrix (std::string (reinterpret_cast<char *> (u8_str), n8)); + free (u8_str); + converted = true; + } + } + else if (re.isvector () && (type == miUTF32 || type == miUINT32)) + { + uint32NDArray u32 = re; + const uint32_t *u32_str + = reinterpret_cast<const uint32_t *> (u32.data ()); + + // Convert to UTF-8. + size_t n8; + uint8_t *u8_str = octave_u32_to_u8_wrapper (u32_str, + u32.numel (), + nullptr, &n8); + if (u8_str) + { + // FIXME: Is there a better way to construct a charMatrix + // from a non zero terminated buffer? + tc = charMatrix (std::string (reinterpret_cast<char *> (u8_str), n8)); + free (u8_str); + converted = true; + } + } + else if (type == miUTF8 || type == miUINT8) + { + // Octave's internal encoding is UTF-8. So we should be + // able to use this natively. + tc = re; + tc = tc.convert_to_str (false, true, '\''); + converted = true; + } + + if (! converted) + { + // Fall back to manually replacing non-ASCII + // characters by "?". + bool found_big_char = false; + for (octave_idx_type i = 0; i < n; i++) + { + if (re(i) > 127) { - unsigned char a = static_cast<unsigned char> (re(i)); - if (a > 0x7f) - utf8_multi_byte = true; - } - - if (utf8_multi_byte) - { - warning_with_id ("Octave:load:unsupported-utf-char", - "load: can not read multi-byte encoded UTF8 characters; replacing unreadable characters with '?'"); - for (octave_idx_type i = 0; i < n; i++) - { - unsigned char a - = static_cast<unsigned char> (re(i)); - if (a > 0x7f) - re(i) = '?'; - } + re(i) = '?'; + found_big_char = true; } } + + if (found_big_char) + warning_with_id ("Octave:load:unsupported-utf-char", + "load: failed to convert from input to UTF-8; " + "replacing non-ASCII characters with '?'"); + tc = re; tc = tc.convert_to_str (false, true, '\''); } - else - tc = re; + } + else + tc = re; } } @@ -2057,6 +2084,24 @@ return ret; } +static uint16_t * +maybe_convert_to_u16 (const charNDArray& chm, size_t& n16_str) +{ + uint16_t *u16_str; + dim_vector dv = chm.dims (); + + if (chm.ndims () == 2 && dv(0) == 1) + { + const uint8_t *u8_str = reinterpret_cast<const uint8_t *> (chm.data ()); + u16_str = octave_u8_to_u16_wrapper (u8_str, chm.numel (), + nullptr, &n16_str); + } + else + u16_str = nullptr; + + return u16_str; +} + int save_mat5_element_length (const octave_value& tc, const std::string& name, bool save_as_floats, bool mat7_format) @@ -2074,9 +2119,23 @@ if (tc.is_string ()) { charNDArray chm = tc.char_array_value (); + // convert to UTF-16 + size_t n16_str; + uint16_t *u16_str = maybe_convert_to_u16 (chm, n16_str); ret += 8; - if (chm.numel () > 2) - ret += PAD (2 * chm.numel ()); + + octave_idx_type str_len; + if (u16_str) + { + // Count number of elements in converted string + str_len = 2 * n16_str; + free (u16_str); + } + else + str_len = chm.numel (); + + if (str_len > 2) + ret += PAD (str_len); } else if (tc.issparse ()) { @@ -2401,15 +2460,36 @@ write_mat5_tag (os, miINT32, dim_len); - for (int i = 0; i < nd; i++) + // Strings need to be converted here (or dim-vector will be off). + charNDArray chm; + uint16_t *u16_str; + size_t n16_str; + bool conv_u16 = false; + if (tc.is_string ()) { - int32_t n = dv(i); + chm = tc.char_array_value (); + u16_str = maybe_convert_to_u16 (chm, n16_str); + + if (u16_str) + conv_u16 = true; + } + + if (conv_u16) + { + int32_t n = 1; os.write (reinterpret_cast<char *> (&n), 4); + os.write (reinterpret_cast<char *> (&n16_str), 4); } + else + for (int i = 0; i < nd; i++) + { + int32_t n = dv(i); + os.write (reinterpret_cast<char *> (&n), 4); + } if (PAD (dim_len) > dim_len) { - static char buf[9]="\x00\x00\x00\x00\x00\x00\x00\x00"; + static char buf[9] = "\x00\x00\x00\x00\x00\x00\x00\x00"; os.write (buf, PAD (dim_len) - dim_len); } @@ -2432,24 +2512,35 @@ // data element if (tc.is_string ()) { - charNDArray chm = tc.char_array_value (); - octave_idx_type nel = chm.numel (); - octave_idx_type len = nel*2; - octave_idx_type paddedlength = PAD (len); - - OCTAVE_LOCAL_BUFFER (int16_t, buf, nel+3); - write_mat5_tag (os, miUINT16, len); - - const char *s = chm.data (); - - for (octave_idx_type i = 0; i < nel; i++) - buf[i] = *s++ & 0x00FF; - - os.write (reinterpret_cast<char *> (buf), len); + octave_idx_type len; + octave_idx_type paddedlength; + + if (conv_u16) + { + // converted UTF-16 + len = n16_str*2; + paddedlength = PAD (len); + + write_mat5_tag (os, miUTF16, len); + + os.write (reinterpret_cast<char *> (u16_str), len); + + free (u16_str); + } + else + { + // write as UTF-8 + len = chm.numel (); + paddedlength = PAD (len); + + write_mat5_tag (os, miUTF8, len); + + os.write (chm.data (), len); + } if (paddedlength > len) { - static char padbuf[9]="\x00\x00\x00\x00\x00\x00\x00\x00"; + static char padbuf[9] = "\x00\x00\x00\x00\x00\x00\x00\x00"; os.write (padbuf, paddedlength - len); } }
--- a/libinterp/corefcn/mex.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/mex.cc Fri May 22 11:06:58 2020 +0200 @@ -62,6 +62,197 @@ #include "variables.h" #include "graphics.h" +// These must be declared extern "C" but may be omitted from the set of +// symbols declared in mexproto.h, so we declare them here as well. + +extern "C" +{ + extern OCTINTERP_API const mxArray * + mexGet_interleaved (double handle, const char *property); + + extern OCTINTERP_API mxArray * + mxCreateCellArray (mwSize ndims, const mwSize *dims); + + extern OCTINTERP_API mxArray * + mxCreateCellMatrix (mwSize m, mwSize n); + + extern OCTINTERP_API mxArray * + mxCreateCharArray (mwSize ndims, const mwSize *dims); + + extern OCTINTERP_API mxArray * + mxCreateCharMatrixFromStrings (mwSize m, const char **str); + + extern OCTINTERP_API mxArray * + mxCreateDoubleMatrix (mwSize nr, mwSize nc, mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateDoubleScalar (double val); + + extern OCTINTERP_API mxArray * + mxCreateLogicalArray (mwSize ndims, const mwSize *dims); + + extern OCTINTERP_API mxArray * + mxCreateLogicalMatrix (mwSize m, mwSize n); + + extern OCTINTERP_API mxArray * + mxCreateLogicalScalar (mxLogical val); + + extern OCTINTERP_API mxArray * + mxCreateNumericArray (mwSize ndims, const mwSize *dims, mxClassID class_id, + mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateNumericMatrix (mwSize m, mwSize n, mxClassID class_id, + mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateUninitNumericArray (mwSize ndims, const mwSize *dims, + mxClassID class_id, mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateUninitNumericMatrix (mwSize m, mwSize n, mxClassID class_id, + mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateSparseLogicalMatrix (mwSize m, mwSize n, mwSize nzmax); + + extern OCTINTERP_API mxArray * + mxCreateString (const char *str); + + extern OCTINTERP_API mxArray * + mxCreateStructArray (mwSize ndims, const mwSize *dims, int num_keys, + const char **keys); + + extern OCTINTERP_API mxArray * + mxCreateStructMatrix (mwSize rows, mwSize cols, int num_keys, + const char **keys); + + extern OCTINTERP_API mxArray * + mxCreateCellArray_interleaved (mwSize ndims, const mwSize *dims); + + extern OCTINTERP_API mxArray * + mxCreateCellMatrix_interleaved (mwSize m, mwSize n); + + extern OCTINTERP_API mxArray * + mxCreateCharArray_interleaved (mwSize ndims, const mwSize *dims); + + extern OCTINTERP_API mxArray * + mxCreateCharMatrixFromStrings_interleaved (mwSize m, const char **str); + + extern OCTINTERP_API mxArray * + mxCreateDoubleMatrix_interleaved (mwSize nr, mwSize nc, mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateDoubleScalar_interleaved (double val); + + extern OCTINTERP_API mxArray * + mxCreateLogicalArray_interleaved (mwSize ndims, const mwSize *dims); + + extern OCTINTERP_API mxArray * + mxCreateLogicalMatrix_interleaved (mwSize m, mwSize n); + + extern OCTINTERP_API mxArray * + mxCreateLogicalScalar_interleaved (mxLogical val); + + extern OCTINTERP_API mxArray * + mxCreateNumericArray_interleaved (mwSize ndims, const mwSize *dims, + mxClassID class_id, mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateNumericMatrix_interleaved (mwSize m, mwSize n, mxClassID class_id, + mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateUninitNumericArray_interleaved (mwSize ndims, const mwSize *dims, + mxClassID class_id, + mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateUninitNumericMatrix_interleaved (mwSize m, mwSize n, + mxClassID class_id, + mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateSparse_interleaved (mwSize m, mwSize n, mwSize nzmax, + mxComplexity flag); + + extern OCTINTERP_API mxArray * + mxCreateSparseLogicalMatrix_interleaved (mwSize m, mwSize n, mwSize nzmax); + + extern OCTINTERP_API mxArray * + mxCreateString_interleaved (const char *str); + + extern OCTINTERP_API mxArray * + mxCreateStructArray_interleaved (mwSize ndims, const mwSize *dims, + int num_keys, const char **keys); + + extern OCTINTERP_API mxArray * + mxCreateStructMatrix_interleaved (mwSize rows, mwSize cols, int num_keys, + const char **keys); + + extern OCTINTERP_API int mxMakeArrayReal (mxArray *ptr); + extern OCTINTERP_API int mxMakeArrayComplex (mxArray *ptr); + + extern OCTINTERP_API mxDouble * mxGetDoubles (const mxArray *p); + extern OCTINTERP_API mxSingle * mxGetSingles (const mxArray *p); + extern OCTINTERP_API mxInt8 * mxGetInt8s (const mxArray *p); + extern OCTINTERP_API mxInt16 * mxGetInt16s (const mxArray *p); + extern OCTINTERP_API mxInt32 * mxGetInt32s (const mxArray *p); + extern OCTINTERP_API mxInt64 * mxGetInt64s (const mxArray *p); + extern OCTINTERP_API mxUint8 * mxGetUint8s (const mxArray *p); + extern OCTINTERP_API mxUint16 * mxGetUint16s (const mxArray *p); + extern OCTINTERP_API mxUint32 * mxGetUint32s (const mxArray *p); + extern OCTINTERP_API mxUint64 * mxGetUint64s (const mxArray *p); + + extern OCTINTERP_API mxComplexDouble * mxGetComplexDoubles (const mxArray *p); + extern OCTINTERP_API mxComplexSingle * mxGetComplexSingles (const mxArray *p); +#if 0 + /* We don't have these yet. */ + extern OCTINTERP_API mxComplexInt8 * mxGetComplexInt8s (const mxArray *p); + extern OCTINTERP_API mxComplexInt16 * mxGetComplexInt16s (const mxArray *p); + extern OCTINTERP_API mxComplexInt32 * mxGetComplexInt32s (const mxArray *p); + extern OCTINTERP_API mxComplexInt64 * mxGetComplexInt64s (const mxArray *p); + extern OCTINTERP_API mxComplexUint8 * mxGetComplexUint8s (const mxArray *p); + extern OCTINTERP_API mxComplexUint16 * mxGetComplexUint16s (const mxArray *p); + extern OCTINTERP_API mxComplexUint32 * mxGetComplexUint32s (const mxArray *p); + extern OCTINTERP_API mxComplexUint64 * mxGetComplexUint64s (const mxArray *p); +#endif + + extern OCTINTERP_API double * mxGetPi (const mxArray *ptr); + extern OCTINTERP_API void * mxGetImagData (const mxArray *ptr); + + extern OCTINTERP_API int mxSetDoubles (mxArray *p, mxDouble *d); + extern OCTINTERP_API int mxSetSingles (mxArray *p, mxSingle *d); + extern OCTINTERP_API int mxSetInt8s (mxArray *p, mxInt8 *d); + extern OCTINTERP_API int mxSetInt16s (mxArray *p, mxInt16 *d); + extern OCTINTERP_API int mxSetInt32s (mxArray *p, mxInt32 *d); + extern OCTINTERP_API int mxSetInt64s (mxArray *p, mxInt64 *d); + extern OCTINTERP_API int mxSetUint8s (mxArray *p, mxUint8 *d); + extern OCTINTERP_API int mxSetUint16s (mxArray *p, mxUint16 *d); + extern OCTINTERP_API int mxSetUint32s (mxArray *p, mxUint32 *d); + extern OCTINTERP_API int mxSetUint64s (mxArray *p, mxUint64 *d); + + extern OCTINTERP_API int mxSetComplexDoubles (mxArray *p, mxComplexDouble *d); + extern OCTINTERP_API int mxSetComplexSingles (mxArray *p, mxComplexSingle *d); +#if 0 + /* We don't have these yet. */ + extern OCTINTERP_API int mxSetComplexInt8s (mxArray *p, mxComplexInt8 *d); + extern OCTINTERP_API int mxSetComplexInt16s (mxArray *p, mxComplexInt16 *d); + extern OCTINTERP_API int mxSetComplexInt32s (mxArray *p, mxComplexInt32 *d); + extern OCTINTERP_API int mxSetComplexInt64s (mxArray *p, mxComplexInt64 *d); + extern OCTINTERP_API int mxSetComplexUint8s (mxArray *p, mxComplexUint8 *d); + extern OCTINTERP_API int mxSetComplexUint16s (mxArray *p, mxComplexUint16 *d); + extern OCTINTERP_API int mxSetComplexUint32s (mxArray *p, mxComplexUint32 *d); + extern OCTINTERP_API int mxSetComplexUint64s (mxArray *p, mxComplexUint64 *d); +#endif + + extern OCTINTERP_API void mxSetPi (mxArray *ptr, double *pi); + extern OCTINTERP_API void mxSetImagData (mxArray *ptr, void *pi); +} + // #define DEBUG 1 static void @@ -112,6 +303,10 @@ // ------------------------------------------------------------------ +mxArray_base::mxArray_base (bool interleaved) + : m_interleaved (interleaved) +{ } + static mwIndex calc_single_subscript_internal (mwSize ndims, const mwSize *dims, mwSize nsubs, const mwIndex *subs) @@ -157,13 +352,26 @@ static inline void * maybe_mark_foreign (void *ptr); +#define VOID_MUTATION_METHOD(FCN_NAME, ARG_LIST) \ + void FCN_NAME ARG_LIST { request_mutation (); } + +#define CONST_VOID_MUTATION_METHOD(FCN_NAME, ARG_LIST) \ + void FCN_NAME ARG_LIST const { request_mutation (); } + +#define MUTATION_METHOD(RET_TYPE, FCN_NAME, ARG_LIST, RET_VAL) \ + RET_TYPE FCN_NAME ARG_LIST { request_mutation (); return RET_VAL; } + +#define CONST_MUTATION_METHOD(RET_TYPE, FCN_NAME, ARG_LIST, RET_VAL) \ + RET_TYPE FCN_NAME ARG_LIST const { request_mutation (); return RET_VAL; } + class mxArray_octave_value : public mxArray_base { public: - mxArray_octave_value (const octave_value& ov) - : mxArray_base (), val (ov), mutate_flag (false), - id (mxUNKNOWN_CLASS), class_name (nullptr), ndims (-1), dims (nullptr) { } + mxArray_octave_value (bool interleaved, const octave_value& ov) + : mxArray_base (interleaved), val (ov), mutate_flag (false), + id (mxUNKNOWN_CLASS), class_name (nullptr), ndims (-1), dims (nullptr) + { } // No assignment! FIXME: should this be implemented? Note that we // do have a copy constructor. @@ -174,7 +382,7 @@ mxArray * as_mxArray (void) const { - mxArray *retval = val.as_mxArray (); + mxArray *retval = val.as_mxArray (m_interleaved); // RETVAL is assumed to be an mxArray_matlab object. Should we // assert that condition here? @@ -303,16 +511,10 @@ return ndims; } - void set_m (mwSize /*m*/) { request_mutation (); } - - void set_n (mwSize /*n*/) { request_mutation (); } - - int set_dimensions (mwSize * /*dims_arg*/, mwSize /*ndims_arg*/) - { - request_mutation (); - - return 0; - } + VOID_MUTATION_METHOD (set_m, (mwSize)) + VOID_MUTATION_METHOD (set_n, (mwSize)) + + MUTATION_METHOD (int, set_dimensions, (mwSize *, mwSize), 0) mwSize get_number_of_elements (void) const { return val.numel (); } @@ -378,7 +580,7 @@ } // Not allowed. - void set_class_name (const char * /*name_arg*/) { request_mutation (); } + VOID_MUTATION_METHOD (set_class_name, (const char *)) mxArray * get_property (mwIndex idx, const char *pname) const { @@ -393,7 +595,7 @@ octave_value pval = ov_cdef->get_property (idx, pname); if (pval.is_defined()) - retval = new mxArray (pval); + retval = new mxArray (m_interleaved, pval); } } @@ -410,17 +612,13 @@ ov_cdef->set_property (idx, pname, pval->as_octave_value ()); } else - err_invalid_type (); + err_invalid_type ("set_property"); } - mxArray * get_cell (mwIndex /*idx*/) const - { - request_mutation (); - return nullptr; - } + CONST_MUTATION_METHOD (mxArray *, get_cell, (mwIndex), nullptr) // Not allowed. - void set_cell (mwIndex /*idx*/, mxArray * /*val*/) { request_mutation (); } + VOID_MUTATION_METHOD (set_cell, (mwIndex, mxArray *)) double get_scalar (void) const { @@ -454,6 +652,61 @@ return retval; } + template <typename T> + T * get_data (mxClassID class_id, mxComplexity complexity) const + { + T *retval = static_cast<T *> (val.mex_get_data (class_id, complexity)); + + if (retval) + maybe_mark_foreign (retval); + else + request_mutation (); + + return retval; + } + + CONST_MUTATION_METHOD (mxDouble *, get_doubles, (void), nullptr); + + CONST_MUTATION_METHOD (mxSingle *, get_singles, (void), nullptr); + + CONST_MUTATION_METHOD (mxInt8 *, get_int8s, (void), nullptr); + + CONST_MUTATION_METHOD (mxInt16 *, get_int16s, (void), nullptr); + + CONST_MUTATION_METHOD (mxInt32 *, get_int32s, (void), nullptr); + + CONST_MUTATION_METHOD (mxInt64 *, get_int64s, (void), nullptr); + + CONST_MUTATION_METHOD (mxUint8 *, get_uint8s, (void), nullptr); + + CONST_MUTATION_METHOD (mxUint16 *, get_uint16s, (void), nullptr); + + CONST_MUTATION_METHOD (mxUint32 *, get_uint32s, (void), nullptr); + + CONST_MUTATION_METHOD (mxUint64 *, get_uint64s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexDouble *, get_complex_doubles, (void), nullptr); + CONST_MUTATION_METHOD (mxComplexSingle *, get_complex_singles, (void), nullptr); + +#if 0 + /* We don't have these yet. */ + CONST_MUTATION_METHOD (mxComplexInt8 *, get_complex_int8s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexInt16 *, get_complex_int16s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexInt32 *, get_complex_int32s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexInt64 *, get_complex_int64s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexUint8 *, get_complex_uint8s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexUint16 *, get_complex_uint16s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexUint32 *, get_complex_uint32s, (void), nullptr); + + CONST_MUTATION_METHOD (mxComplexUint64 *, get_complex_uint64s, (void), nullptr); +#endif + void * get_imag_data (void) const { void *retval = nullptr; @@ -467,10 +720,35 @@ } // Not allowed. - void set_data (void * /*pr*/) { request_mutation (); } + VOID_MUTATION_METHOD (set_data, (void *)) + + MUTATION_METHOD (int, set_doubles, (mxDouble *), 0) + MUTATION_METHOD (int, set_singles, (mxSingle *), 0) + MUTATION_METHOD (int, set_int8s, (mxInt8 *), 0) + MUTATION_METHOD (int, set_int16s, (mxInt16 *), 0) + MUTATION_METHOD (int, set_int32s, (mxInt32 *), 0) + MUTATION_METHOD (int, set_int64s, (mxInt64 *), 0) + MUTATION_METHOD (int, set_uint8s, (mxUint8 *), 0) + MUTATION_METHOD (int, set_uint16s, (mxUint16 *), 0) + MUTATION_METHOD (int, set_uint32s, (mxUint32 *), 0) + MUTATION_METHOD (int, set_uint64s, (mxUint64 *), 0) + + MUTATION_METHOD (int, set_complex_doubles, (mxComplexDouble *), 0) + MUTATION_METHOD (int, set_complex_singles, (mxComplexSingle *), 0) +#if 0 + /* We don't have these yet. */ + MUTATION_METHOD (int, set_complex_int8s, (mxComplexInt8 *), 0) + MUTATION_METHOD (int, set_complex_int16s, (mxComplexInt16 *), 0) + MUTATION_METHOD (int, set_complex_int32s, (mxComplexInt32 *), 0) + MUTATION_METHOD (int, set_complex_int64s, (mxComplexInt64 *), 0) + MUTATION_METHOD (int, set_complex_uint8s, (mxComplexUint8 *), 0) + MUTATION_METHOD (int, set_complex_uint16s, (mxComplexUint16 *), 0) + MUTATION_METHOD (int, set_complex_uint32s, (mxComplexUint32 *), 0) + MUTATION_METHOD (int, set_complex_uint64s, (mxComplexUint64 *), 0) +#endif // Not allowed. - void set_imag_data (void * /*pi*/) { request_mutation (); } + VOID_MUTATION_METHOD (set_imag_data, (void *)) mwIndex * get_ir (void) const { @@ -485,50 +763,30 @@ mwSize get_nzmax (void) const { return val.nzmax (); } // Not allowed. - void set_ir (mwIndex * /*ir*/) { request_mutation (); } - - // Not allowed. - void set_jc (mwIndex * /*jc*/) { request_mutation (); } + VOID_MUTATION_METHOD (set_ir, (mwIndex *)) // Not allowed. - void set_nzmax (mwSize /*nzmax*/) { request_mutation (); } + VOID_MUTATION_METHOD (set_jc, (mwIndex *)) // Not allowed. - int add_field (const char * /*key*/) - { - request_mutation (); - return 0; - } + VOID_MUTATION_METHOD (set_nzmax, (mwSize)) + + // Not allowed. + MUTATION_METHOD (int, add_field, (const char *), 0) // Not allowed. - void remove_field (int /*key_num*/) { request_mutation (); } - - mxArray * get_field_by_number (mwIndex /*index*/, int /*key_num*/) const - { - request_mutation (); - return nullptr; - } + VOID_MUTATION_METHOD (remove_field, (int)) + + CONST_MUTATION_METHOD (mxArray *, get_field_by_number, (mwIndex, int), nullptr) // Not allowed. - void set_field_by_number (mwIndex /*index*/, int /*key_num*/, - mxArray * /*val*/) - { - request_mutation (); - } + VOID_MUTATION_METHOD (set_field_by_number, (mwIndex, int, mxArray *)) int get_number_of_fields (void) const { return val.nfields (); } - const char * get_field_name_by_number (int /*key_num*/) const - { - request_mutation (); - return nullptr; - } - - int get_field_number (const char * /*key*/) const - { - request_mutation (); - return 0; - } + CONST_MUTATION_METHOD (const char *, get_field_name_by_number, (int), nullptr) + + CONST_MUTATION_METHOD (int, get_field_number, (const char *), 0) int get_string (char *buf, mwSize buflen) const { @@ -596,21 +854,21 @@ switch (id) { - case mxDOUBLE_CLASS: return sizeof (double); - case mxSINGLE_CLASS: return sizeof (float); - case mxCHAR_CLASS: return sizeof (mxChar); - case mxLOGICAL_CLASS: return sizeof (mxLogical); case mxCELL_CLASS: return sizeof (mxArray *); case mxSTRUCT_CLASS: return sizeof (mxArray *); + case mxLOGICAL_CLASS: return sizeof (mxLogical); + case mxCHAR_CLASS: return sizeof (mxChar); + case mxDOUBLE_CLASS: return get_numeric_element_size (sizeof (mxDouble)); + case mxSINGLE_CLASS: return get_numeric_element_size (sizeof (mxSingle)); + case mxINT8_CLASS: return get_numeric_element_size (sizeof (mxInt8)); + case mxUINT8_CLASS: return get_numeric_element_size (sizeof (mxUint8)); + case mxINT16_CLASS: return get_numeric_element_size (sizeof (mxInt16)); + case mxUINT16_CLASS: return get_numeric_element_size (sizeof (mxUint16)); + case mxINT32_CLASS: return get_numeric_element_size (sizeof (mxInt32)); + case mxUINT32_CLASS: return get_numeric_element_size (sizeof (mxUint32)); + case mxINT64_CLASS: return get_numeric_element_size (sizeof (mxInt64)); + case mxUINT64_CLASS: return get_numeric_element_size (sizeof (mxUint64)); case mxFUNCTION_CLASS: return 0; - case mxINT8_CLASS: return 1; - case mxUINT8_CLASS: return 1; - case mxINT16_CLASS: return 2; - case mxUINT16_CLASS: return 2; - case mxINT32_CLASS: return 4; - case mxUINT32_CLASS: return 4; - case mxINT64_CLASS: return 8; - case mxUINT64_CLASS: return 8; // FIXME: user-defined objects need their own class ID. // What should they return, size of pointer? default: return 0; @@ -637,9 +895,9 @@ : mxArray_base (arg), val (arg.val), mutate_flag (arg.mutate_flag), id (arg.id), class_name (mxArray::strsave (arg.class_name)), ndims (arg.ndims), - dims (ndims > 0 ? static_cast<mwSize *> - (mxArray::malloc (ndims * sizeof (mwSize))) - : nullptr) + dims (ndims > 0 + ? static_cast<mwSize *> (mxArray::malloc (ndims * sizeof (mwSize))) + : nullptr) { if (dims) { @@ -671,13 +929,14 @@ { protected: - mxArray_matlab (mxClassID id_arg = mxUNKNOWN_CLASS) - : mxArray_base (), class_name (nullptr), id (id_arg), ndims (0), + mxArray_matlab (bool interleaved, mxClassID id_arg = mxUNKNOWN_CLASS) + : mxArray_base (interleaved), class_name (nullptr), id (id_arg), ndims (0), dims (nullptr) { } - mxArray_matlab (mxClassID id_arg, mwSize ndims_arg, const mwSize *dims_arg) - : mxArray_base (), class_name (nullptr), id (id_arg), + mxArray_matlab (bool interleaved, mxClassID id_arg, mwSize ndims_arg, + const mwSize *dims_arg) + : mxArray_base (interleaved), class_name (nullptr), id (id_arg), ndims (ndims_arg < 2 ? 2 : ndims_arg), dims (static_cast<mwSize *> (mxArray::malloc (ndims * sizeof (mwSize)))) { @@ -704,8 +963,8 @@ } } - mxArray_matlab (mxClassID id_arg, const dim_vector& dv) - : mxArray_base (), class_name (nullptr), id (id_arg), + mxArray_matlab (bool interleaved, mxClassID id_arg, const dim_vector& dv) + : mxArray_base (interleaved), class_name (nullptr), id (id_arg), ndims (dv.ndims ()), dims (static_cast<mwSize *> (mxArray::malloc (ndims * sizeof (mwSize)))) { @@ -721,8 +980,8 @@ } } - mxArray_matlab (mxClassID id_arg, mwSize m, mwSize n) - : mxArray_base (), class_name (nullptr), id (id_arg), ndims (2), + mxArray_matlab (bool interleaved, mxClassID id_arg, mwSize m, mwSize n) + : mxArray_base (interleaved), class_name (nullptr), id (id_arg), ndims (2), dims (static_cast<mwSize *> (mxArray::malloc (ndims * sizeof (mwSize)))) { dims[0] = m; @@ -900,98 +1159,304 @@ mxArray * get_cell (mwIndex /*idx*/) const { - err_invalid_type (); + err_invalid_type ("get_cell"); } void set_cell (mwIndex /*idx*/, mxArray * /*val*/) { - err_invalid_type (); + err_invalid_type ("set_cell"); } double get_scalar (void) const { - err_invalid_type (); + err_invalid_type ("get_scalar"); } void * get_data (void) const { - err_invalid_type (); + err_invalid_type ("get_data"); + } + + mxDouble * get_doubles (void) const + { + err_invalid_type ("get_doubles"); + } + + mxSingle * get_singles (void) const + { + err_invalid_type ("get_singles"); + } + + mxInt8 * get_int8s (void) const + { + err_invalid_type ("get_int8s"); + } + + mxInt16 * get_int16s (void) const + { + err_invalid_type ("get_int16s"); + } + + mxInt32 * get_int32s (void) const + { + err_invalid_type ("get_int32s"); + } + + mxInt64 * get_int64s (void) const + { + err_invalid_type ("get_int64s"); + } + + mxUint8 * get_uint8s (void) const + { + err_invalid_type ("get_uint8s"); + } + + mxUint16 * get_uint16s (void) const + { + err_invalid_type ("get_uint16s"); + } + + mxUint32 * get_uint32s (void) const + { + err_invalid_type ("get_uint32s"); + } + + mxUint64 * get_uint64s (void) const + { + err_invalid_type ("get_uint64s"); } + mxComplexDouble * get_complex_doubles (void) const + { + err_invalid_type ("get_complex_doubles"); + } + + mxComplexSingle * get_complex_singles (void) const + { + err_invalid_type ("get_complex_singles"); + } + +#if 0 + /* We don't have these yet. */ + mxComplexInt8 * get_complex_int8s (void) const + { + err_invalid_type ("get_complex_int8s"); + } + + mxComplexInt16 * get_complex_int16s (void) const + { + err_invalid_type ("get_complex_int16s"); + } + + mxComplexInt32 * get_complex_int32s (void) const + { + err_invalid_type ("get_complex_int32s"); + } + + mxComplexInt64 * get_complex_int64s (void) const + { + err_invalid_type ("get_complex_int64s"); + } + + mxComplexUint8 * get_complex_uint8s (void) const + { + err_invalid_type ("get_complex_uint8s"); + } + + mxComplexUint16 * get_complex_uint16s (void) const + { + err_invalid_type ("get_complex_uint16s"); + } + + mxComplexUint32 * get_complex_uint32s (void) const + { + err_invalid_type ("get_complex_uint32s"); + } + + mxComplexUint64 * get_complex_uint64s (void) const + { + err_invalid_type ("get_complex_uint64s"); + } +#endif + void * get_imag_data (void) const { - err_invalid_type (); + err_invalid_type ("get_imag_data"); } void set_data (void * /*pr*/) { - err_invalid_type (); + err_invalid_type ("set_data"); + } + + int set_doubles (mxDouble *) + { + err_invalid_type ("set_doubles"); + } + + int set_singles (mxSingle *) + { + err_invalid_type ("set_singles"); + } + + int set_int8s (mxInt8 *) + { + err_invalid_type ("set_int8s"); + } + + int set_int16s (mxInt16 *) + { + err_invalid_type ("set_int16s"); + } + + int set_int32s (mxInt32 *) + { + err_invalid_type ("set_int32s"); + } + + int set_int64s (mxInt64 *) + { + err_invalid_type ("set_int64s"); + } + + int set_uint8s (mxUint8 *) + { + err_invalid_type ("set_uint8s"); + } + + int set_uint16s (mxUint16 *) + { + err_invalid_type ("set_uint16s"); + } + + int set_uint32s (mxUint32 *) + { + err_invalid_type ("set_uint32s"); + } + + int set_uint64s (mxUint64 *) + { + err_invalid_type ("set_uint64s"); } + int set_complex_doubles (mxComplexDouble *) + { + err_invalid_type ("set_complex_doubles"); + } + + int set_complex_singles (mxComplexSingle *) + { + err_invalid_type ("set_complex_singles"); + } + +#if 0 + /* We don't have these yet. */ + int set_complex_int8s (mxComplexInt8 *) + { + err_invalid_type ("set_complex_int8s"); + } + + int set_complex_int16s (mxComplexInt16 *) + { + err_invalid_type ("set_complex_int16s"); + } + + int set_complex_int32s (mxComplexInt32 *) + { + err_invalid_type ("set_complex_int32s"); + } + + int set_complex_int64s (mxComplexInt64 *) + { + err_invalid_type ("set_complex_int64s"); + } + + int set_complex_uint8s (mxComplexUint8 *) + { + err_invalid_type ("set_complex_uint8s"); + } + + int set_complex_uint16s (mxComplexUint16 *) + { + err_invalid_type ("set_complex_uint16s"); + } + + int set_complex_uint32s (mxComplexUint32 *) + { + err_invalid_type ("set_complex_uint32s"); + } + + int set_complex_uint64s (mxComplexUint64 *) + { + err_invalid_type ("set_complex_uint64s"); + } +#endif + void set_imag_data (void * /*pi*/) { - err_invalid_type (); + err_invalid_type ("set_imag_data"); } mwIndex * get_ir (void) const { - err_invalid_type (); + err_invalid_type ("get_ir"); } mwIndex * get_jc (void) const { - err_invalid_type (); + err_invalid_type ("get_jc"); } mwSize get_nzmax (void) const { - err_invalid_type (); + err_invalid_type ("get_nzmax"); } void set_ir (mwIndex * /*ir*/) { - err_invalid_type (); + err_invalid_type ("set_ir"); } void set_jc (mwIndex * /*jc*/) { - err_invalid_type (); + err_invalid_type ("set_jc"); } void set_nzmax (mwSize /*nzmax*/) { - err_invalid_type (); + err_invalid_type ("set_nzmax"); } int add_field (const char * /*key*/) { - err_invalid_type (); + err_invalid_type ("add_field"); } void remove_field (int /*key_num*/) { - err_invalid_type (); + err_invalid_type ("remove_field"); } mxArray * get_field_by_number (mwIndex /*index*/, int /*key_num*/) const { - err_invalid_type (); + err_invalid_type ("get_field_by_number"); } void set_field_by_number (mwIndex /*index*/, int /*key_num*/, mxArray * /*val*/) { - err_invalid_type (); + err_invalid_type ("set_field_by_number"); } int get_number_of_fields (void) const { - err_invalid_type (); + err_invalid_type ("get_number_of_fields"); } const char * get_field_name_by_number (int /*key_num*/) const { - err_invalid_type (); + err_invalid_type ("get_field_name_by_number"); } int get_field_number (const char * /*key*/) const @@ -1001,12 +1466,12 @@ int get_string (char * /*buf*/, mwSize /*buflen*/) const { - err_invalid_type (); + err_invalid_type ("get_string"); } char * array_to_string (void) const { - err_invalid_type (); + err_invalid_type ("array_to_string"); } mwIndex calc_single_subscript (mwSize nsubs, mwIndex *subs) const @@ -1022,16 +1487,16 @@ case mxSTRUCT_CLASS: return sizeof (mxArray *); case mxLOGICAL_CLASS: return sizeof (mxLogical); case mxCHAR_CLASS: return sizeof (mxChar); - case mxDOUBLE_CLASS: return sizeof (double); - case mxSINGLE_CLASS: return sizeof (float); - case mxINT8_CLASS: return 1; - case mxUINT8_CLASS: return 1; - case mxINT16_CLASS: return 2; - case mxUINT16_CLASS: return 2; - case mxINT32_CLASS: return 4; - case mxUINT32_CLASS: return 4; - case mxINT64_CLASS: return 8; - case mxUINT64_CLASS: return 8; + case mxDOUBLE_CLASS: return get_numeric_element_size (sizeof (mxDouble)); + case mxSINGLE_CLASS: return get_numeric_element_size (sizeof (mxSingle)); + case mxINT8_CLASS: return get_numeric_element_size (sizeof (mxInt8)); + case mxUINT8_CLASS: return get_numeric_element_size (sizeof (mxUint8)); + case mxINT16_CLASS: return get_numeric_element_size (sizeof (mxInt16)); + case mxUINT16_CLASS: return get_numeric_element_size (sizeof (mxUint16)); + case mxINT32_CLASS: return get_numeric_element_size (sizeof (mxInt32)); + case mxUINT32_CLASS: return get_numeric_element_size (sizeof (mxUint32)); + case mxINT64_CLASS: return get_numeric_element_size (sizeof (mxInt64)); + case mxUINT64_CLASS: return get_numeric_element_size (sizeof (mxUint64)); case mxFUNCTION_CLASS: return 0; // FIXME: user-defined objects need their own class ID. // What should they return, size of pointer? @@ -1065,59 +1530,79 @@ mwSize ndims; mwSize *dims; - - OCTAVE_NORETURN void err_invalid_type (void) const - { - error ("invalid type for operation"); - } }; + // Matlab-style numeric, character, and logical data. +#define TYPED_GET_METHOD(TYPE, FCN_NAME) \ + TYPE FCN_NAME (void) const \ + { \ + if (! m_interleaved) \ + panic_impossible (); \ + \ + return static_cast<TYPE> (pr); \ + } + +#define TYPED_SET_METHOD(TYPE, FCN_NAME) \ + int FCN_NAME (TYPE d) \ + { \ + if (! m_interleaved) \ + panic_impossible (); \ + \ + pr = d; \ + return 0; \ + } + class mxArray_number : public mxArray_matlab { public: - mxArray_number (mxClassID id_arg, mwSize ndims_arg, const mwSize *dims_arg, - mxComplexity flag = mxREAL, bool init = true) - : mxArray_matlab (id_arg, ndims_arg, dims_arg), - pr (init ? mxArray::calloc (get_number_of_elements (), - get_element_size ()) - : mxArray::malloc (get_number_of_elements () - * get_element_size ())), - pi (flag == mxCOMPLEX - ? (init ? mxArray::calloc (get_number_of_elements (), - get_element_size ()) - : mxArray::malloc (get_number_of_elements () - * get_element_size ())) - : nullptr) { } - - mxArray_number (mxClassID id_arg, const dim_vector& dv, + mxArray_number (bool interleaved, mxClassID id_arg, mwSize ndims_arg, + const mwSize *dims_arg, mxComplexity flag = mxREAL, + bool init = true) + : mxArray_matlab (interleaved, id_arg, ndims_arg, dims_arg), + m_complex (flag == mxCOMPLEX), + pr (init + ? mxArray::calloc (get_number_of_elements (), get_element_size ()) + : mxArray::malloc (get_number_of_elements () * get_element_size ())), + pi (m_interleaved + ? nullptr + : (m_complex + ? (init + ? mxArray::calloc (get_number_of_elements (), get_element_size ()) + : mxArray::malloc (get_number_of_elements () * get_element_size ())) + : nullptr)) + { } + + mxArray_number (bool interleaved, mxClassID id_arg, const dim_vector& dv, mxComplexity flag = mxREAL) - : mxArray_matlab (id_arg, dv), + : mxArray_matlab (interleaved, id_arg, dv), m_complex (flag == mxCOMPLEX), pr (mxArray::calloc (get_number_of_elements (), get_element_size ())), - pi (flag == mxCOMPLEX ? mxArray::calloc (get_number_of_elements (), - get_element_size ()) - : nullptr) + pi (m_interleaved + ? nullptr + : (m_complex + ? mxArray::calloc (get_number_of_elements (), get_element_size ()) + : nullptr)) { } - mxArray_number (mxClassID id_arg, mwSize m, mwSize n, + mxArray_number (bool interleaved, mxClassID id_arg, mwSize m, mwSize n, mxComplexity flag = mxREAL, bool init = true) - : mxArray_matlab (id_arg, m, n), - pr (init ? mxArray::calloc (get_number_of_elements (), - get_element_size ()) - : mxArray::malloc (get_number_of_elements () - * get_element_size ())), - pi (flag == mxCOMPLEX - ? (init ? mxArray::calloc (get_number_of_elements (), - get_element_size ()) - : mxArray::malloc (get_number_of_elements () - * get_element_size ())) - : nullptr) + : mxArray_matlab (interleaved, id_arg, m, n), m_complex (flag == mxCOMPLEX), + pr (init + ? mxArray::calloc (get_number_of_elements (), get_element_size ()) + : mxArray::malloc (get_number_of_elements () * get_element_size ())), + pi (m_interleaved + ? nullptr + : (m_complex + ? (init + ? mxArray::calloc (get_number_of_elements (), get_element_size ()) + : mxArray::malloc (get_number_of_elements () * get_element_size ())) + : nullptr)) { } - mxArray_number (mxClassID id_arg, double val) - : mxArray_matlab (id_arg, 1, 1), + mxArray_number (bool interleaved, mxClassID id_arg, double val) + : mxArray_matlab (interleaved, id_arg, 1, 1), pr (mxArray::calloc (get_number_of_elements (), get_element_size ())), pi (nullptr) { @@ -1125,8 +1610,8 @@ dpr[0] = val; } - mxArray_number (mxClassID id_arg, mxLogical val) - : mxArray_matlab (id_arg, 1, 1), + mxArray_number (bool interleaved, mxClassID id_arg, mxLogical val) + : mxArray_matlab (interleaved, id_arg, 1, 1), pr (mxArray::calloc (get_number_of_elements (), get_element_size ())), pi (nullptr) { @@ -1134,8 +1619,8 @@ lpr[0] = val; } - mxArray_number (const char *str) - : mxArray_matlab (mxCHAR_CLASS, + mxArray_number (bool interleaved, const char *str) + : mxArray_matlab (interleaved, mxCHAR_CLASS, str ? (strlen (str) ? 1 : 0) : 0, str ? strlen (str) : 0), pr (mxArray::calloc (get_number_of_elements (), get_element_size ())), @@ -1148,8 +1633,8 @@ } // FIXME: ??? - mxArray_number (mwSize m, const char **str) - : mxArray_matlab (mxCHAR_CLASS, m, max_str_len (m, str)), + mxArray_number (bool interleaved, mwSize m, const char **str) + : mxArray_matlab (interleaved, mxCHAR_CLASS, m, max_str_len (m, str)), pr (mxArray::calloc (get_number_of_elements (), get_element_size ())), pi (nullptr) { @@ -1178,9 +1663,11 @@ mxArray_number (const mxArray_number& val) : mxArray_matlab (val), pr (mxArray::malloc (get_number_of_elements () * get_element_size ())), - pi (val.pi ? mxArray::malloc (get_number_of_elements () - * get_element_size ()) - : nullptr) + pi (m_interleaved + ? nullptr + : (val.pi + ? mxArray::malloc (get_number_of_elements () * get_element_size ()) + : nullptr)) { size_t nbytes = get_number_of_elements () * get_element_size (); @@ -1198,7 +1685,10 @@ mxArray_number& operator = (const mxArray_number&); - mxArray_base * dup (void) const { return new mxArray_number (*this); } + mxArray_base * dup (void) const + { + return new mxArray_number (*this); + } ~mxArray_number (void) { @@ -1206,10 +1696,15 @@ mxFree (pi); } - int is_complex (void) const { return pi != nullptr; } + int is_complex (void) const + { + return m_interleaved ? m_complex : (pi != nullptr); + } double get_scalar (void) const { + // FIXME: how does this work for interleaved complex arrays? + double retval = 0; switch (get_class_id ()) @@ -1271,11 +1766,73 @@ void * get_data (void) const { return pr; } - void * get_imag_data (void) const { return pi; } + void * get_imag_data (void) const + { + if (m_interleaved) + panic_impossible (); + + return pi; + } void set_data (void *pr_arg) { pr = pr_arg; } - void set_imag_data (void *pi_arg) { pi = pi_arg; } + void set_imag_data (void *pi_arg) + { + if (m_interleaved) + panic_impossible (); + + pi = pi_arg; + } + + TYPED_GET_METHOD (mxDouble *, get_doubles) + TYPED_GET_METHOD (mxSingle *, get_singles) + TYPED_GET_METHOD (mxInt8 *, get_int8s) + TYPED_GET_METHOD (mxInt16 *, get_int16s) + TYPED_GET_METHOD (mxInt32 *, get_int32s) + TYPED_GET_METHOD (mxInt64 *, get_int64s) + TYPED_GET_METHOD (mxUint8 *, get_uint8s) + TYPED_GET_METHOD (mxUint16 *, get_uint16s) + TYPED_GET_METHOD (mxUint32 *, get_uint32s) + TYPED_GET_METHOD (mxUint64 *, get_uint64s) + + TYPED_GET_METHOD (mxComplexDouble *, get_complex_doubles) + TYPED_GET_METHOD (mxComplexSingle *, get_complex_singles) +#if 0 + /* We don't have these yet. */ + TYPED_GET_METHOD (mxComplexInt8 *, get_complex_int8s) + TYPED_GET_METHOD (mxComplexInt16 *, get_complex_int16s) + TYPED_GET_METHOD (mxComplexInt32 *, get_complex_int32s) + TYPED_GET_METHOD (mxComplexInt64 *, get_complex_int64s) + TYPED_GET_METHOD (mxComplexUint8 *, get_complex_uint8s) + TYPED_GET_METHOD (mxComplexUint16 *, get_complex_uint16s) + TYPED_GET_METHOD (mxComplexUint32 *, get_complex_uint32s) + TYPED_GET_METHOD (mxComplexUint64 *, get_complex_uint64s) +#endif + + TYPED_SET_METHOD (mxDouble *, set_doubles) + TYPED_SET_METHOD (mxSingle *, set_singles) + TYPED_SET_METHOD (mxInt8 *, set_int8s) + TYPED_SET_METHOD (mxInt16 *, set_int16s) + TYPED_SET_METHOD (mxInt32 *, set_int32s) + TYPED_SET_METHOD (mxInt64 *, set_int64s) + TYPED_SET_METHOD (mxUint8 *, set_uint8s) + TYPED_SET_METHOD (mxUint16 *, set_uint16s) + TYPED_SET_METHOD (mxUint32 *, set_uint32s) + TYPED_SET_METHOD (mxUint64 *, set_uint64s) + + TYPED_SET_METHOD (mxComplexDouble *, set_complex_doubles) + TYPED_SET_METHOD (mxComplexSingle *, set_complex_singles) +#if 0 + /* We don't have these yet. */ + TYPED_SET_METHOD (mxComplexInt8 *, set_complex_int8s) + TYPED_SET_METHOD (mxComplexInt16 *, set_complex_int16s) + TYPED_SET_METHOD (mxComplexInt32 *, set_complex_int32s) + TYPED_SET_METHOD (mxComplexInt64 *, set_complex_int64s) + TYPED_SET_METHOD (mxComplexUint8 *, set_complex_uint8s) + TYPED_SET_METHOD (mxComplexUint16 *, set_complex_uint16s) + TYPED_SET_METHOD (mxComplexUint32 *, set_complex_uint32s) + TYPED_SET_METHOD (mxComplexUint64 *, set_complex_uint64s) +#endif int get_string (char *buf, mwSize buflen) const { @@ -1336,23 +1893,40 @@ { mwSize nel = get_number_of_elements (); - double *ppr = static_cast<double *> (pr); - - if (pi) + if (is_complex ()) { - ComplexNDArray val (dv); - - Complex *ptr = val.fortran_vec (); - - double *ppi = static_cast<double *> (pi); - - for (mwIndex i = 0; i < nel; i++) - ptr[i] = Complex (ppr[i], ppi[i]); - - retval = val; + if (m_interleaved) + { + Complex *ppr = static_cast<Complex *> (pr); + + ComplexNDArray val (dv); + Complex *ptr = val.fortran_vec (); + + for (mwIndex i = 0; i < nel; i++) + ptr[i] = ppr[i]; + + retval = val; + } + else + { + double *ppr = static_cast<double *> (pr); + + ComplexNDArray val (dv); + + Complex *ptr = val.fortran_vec (); + + double *ppi = static_cast<double *> (pi); + + for (mwIndex i = 0; i < nel; i++) + ptr[i] = Complex (ppr[i], ppi[i]); + + retval = val; + } } else { + double *ppr = static_cast<double *> (pr); + NDArray val (dv); double *ptr = val.fortran_vec (); @@ -1369,23 +1943,40 @@ { mwSize nel = get_number_of_elements (); - float *ppr = static_cast<float *> (pr); - - if (pi) + if (is_complex ()) { - FloatComplexNDArray val (dv); - - FloatComplex *ptr = val.fortran_vec (); - - float *ppi = static_cast<float *> (pi); - - for (mwIndex i = 0; i < nel; i++) - ptr[i] = FloatComplex (ppr[i], ppi[i]); - - retval = val; + if (m_interleaved) + { + FloatComplex *ppr = static_cast<FloatComplex *> (pr); + + FloatComplexNDArray val (dv); + FloatComplex *ptr = val.fortran_vec (); + + for (mwIndex i = 0; i < nel; i++) + ptr[i] = ppr[i]; + + retval = val; + } + else + { + float *ppr = static_cast<float *> (pr); + + FloatComplexNDArray val (dv); + + FloatComplex *ptr = val.fortran_vec (); + + float *ppi = static_cast<float *> (pi); + + for (mwIndex i = 0; i < nel; i++) + ptr[i] = FloatComplex (ppr[i], ppi[i]); + + retval = val; + } } else { + float *ppr = static_cast<float *> (pr); + FloatNDArray val (dv); float *ptr = val.fortran_vec (); @@ -1464,7 +2055,7 @@ octave_value int_to_ov (const dim_vector& dv) const { - if (pi) + if (is_complex ()) error ("complex integer types are not supported"); mwSize nel = get_number_of_elements (); @@ -1483,7 +2074,17 @@ private: + // Flag to identify complex object if using interleaved data and PI is + // always nullptr. + bool m_complex; + + // If using interleaved complex storage, this is the pointer to data + // (real, complex, or logical). Otherwise, it is the pointer to the + // real part of the data. void *pr; + + // If using non-interleaved complex storage, this is the pointer to + // the imaginary part of the data. Othrwise is is always nullptr. void *pi; }; @@ -1493,24 +2094,31 @@ { public: - mxArray_sparse (mxClassID id_arg, mwSize m, mwSize n, mwSize nzmax_arg, - mxComplexity flag = mxREAL) - : mxArray_matlab (id_arg, m, n) - { - nzmax = (nzmax_arg > 0 ? nzmax_arg : 1); - pr = mxArray::calloc (nzmax, get_element_size ()); - pi = (flag == mxCOMPLEX ? mxArray::calloc (nzmax, get_element_size ()) - : nullptr); - ir = (static_cast<mwIndex *> (mxArray::calloc (nzmax, sizeof (mwIndex)))); - jc = (static_cast<mwIndex *> (mxArray::calloc (n + 1, sizeof (mwIndex)))); - } + mxArray_sparse (bool interleaved, mxClassID id_arg, mwSize m, mwSize n, + mwSize nzmax_arg, mxComplexity flag = mxREAL) + : mxArray_matlab (interleaved, id_arg, m, n), m_complex (flag == mxCOMPLEX), + + nzmax (nzmax_arg > 0 ? nzmax_arg : 1), + pr (mxArray::calloc (nzmax, get_element_size ())), + pi (m_interleaved + ? nullptr + : (m_complex + ? mxArray::calloc (nzmax, get_element_size ()) + : nullptr)), + ir (static_cast<mwIndex *> (mxArray::calloc (nzmax, sizeof (mwIndex)))), + jc (static_cast<mwIndex *> (mxArray::calloc (n + 1, sizeof (mwIndex)))) + { } private: mxArray_sparse (const mxArray_sparse& val) : mxArray_matlab (val), nzmax (val.nzmax), pr (mxArray::malloc (nzmax * get_element_size ())), - pi (val.pi ? mxArray::malloc (nzmax * get_element_size ()) : nullptr), + pi (m_interleaved + ? nullptr + : (val.pi + ? mxArray::malloc (nzmax * get_element_size ()) + : nullptr)), ir (static_cast<mwIndex *> (mxArray::malloc (nzmax * sizeof (mwIndex)))), jc (static_cast<mwIndex *> (mxArray::malloc (nzmax * sizeof (mwIndex)))) { @@ -1536,7 +2144,10 @@ mxArray_sparse& operator = (const mxArray_sparse&); - mxArray_base * dup (void) const { return new mxArray_sparse (*this); } + mxArray_base * dup (void) const + { + return new mxArray_sparse (*this); + } ~mxArray_sparse (void) { @@ -1546,17 +2157,38 @@ mxFree (jc); } - int is_complex (void) const { return pi != nullptr; } + int is_complex (void) const + { + return m_interleaved ? m_complex : (pi != nullptr); + } int is_sparse (void) const { return 1; } void * get_data (void) const { return pr; } - void * get_imag_data (void) const { return pi; } + void * get_imag_data (void) const + { + if (m_interleaved) + panic_impossible (); + + return pi; + } void set_data (void *pr_arg) { pr = pr_arg; } - void set_imag_data (void *pi_arg) { pi = pi_arg; } + void set_imag_data (void *pi_arg) + { + if (m_interleaved) + panic_impossible (); + + pi = pi_arg; + } + + TYPED_GET_METHOD (mxDouble *, get_doubles) + TYPED_GET_METHOD (mxComplexDouble *, get_complex_doubles) + + TYPED_SET_METHOD (mxDouble *, set_doubles) + TYPED_SET_METHOD (mxComplexDouble *, set_complex_doubles) mwIndex * get_ir (void) const { return ir; } @@ -1584,24 +2216,45 @@ { case mxDOUBLE_CLASS: { - if (pi) + if (is_complex ()) { - double *ppr = static_cast<double *> (pr); - double *ppi = static_cast<double *> (pi); - - SparseComplexMatrix val (get_m (), get_n (), - static_cast<octave_idx_type> (nzmax)); - - for (mwIndex i = 0; i < nzmax; i++) + if (m_interleaved) { - val.xdata (i) = Complex (ppr[i], ppi[i]); - val.xridx (i) = ir[i]; + Complex *ppr = static_cast<Complex *> (pr); + + SparseComplexMatrix val (get_m (), get_n (), + static_cast<octave_idx_type> (nzmax)); + + for (mwIndex i = 0; i < nzmax; i++) + { + val.xdata (i) = ppr[i]; + val.xridx (i) = ir[i]; + } + + for (mwIndex i = 0; i < get_n () + 1; i++) + val.xcidx (i) = jc[i]; + + retval = val; } - - for (mwIndex i = 0; i < get_n () + 1; i++) - val.xcidx (i) = jc[i]; - - retval = val; + else + { + double *ppr = static_cast<double *> (pr); + double *ppi = static_cast<double *> (pi); + + SparseComplexMatrix val (get_m (), get_n (), + static_cast<octave_idx_type> (nzmax)); + + for (mwIndex i = 0; i < nzmax; i++) + { + val.xdata (i) = Complex (ppr[i], ppi[i]); + val.xridx (i) = ir[i]; + } + + for (mwIndex i = 0; i < get_n () + 1; i++) + val.xcidx (i) = jc[i]; + + retval = val; + } } else { @@ -1657,10 +2310,23 @@ private: + // Flag to identify complex object if using interleaved data and PI is + // always nullptr. + bool m_complex; + + // Maximun number of nonzero elements. mwSize nzmax; + // If using interleaved complex storage, this is the pointer to data + // (real, complex, or logical). Otherwise, it is the pointer to the + // real part of the data. void *pr; + + // If using non-interleaved complex storage, this is the pointer to + // the imaginary part of the data. Othrwise is is always nullptr. void *pi; + + // Sparse storage indexing arrays. mwIndex *ir; mwIndex *jc; }; @@ -1671,9 +2337,9 @@ { public: - mxArray_struct (mwSize ndims_arg, const mwSize *dims_arg, int num_keys_arg, - const char **keys) - : mxArray_matlab (mxSTRUCT_CLASS, ndims_arg, dims_arg), + mxArray_struct (bool interleaved, mwSize ndims_arg, const mwSize *dims_arg, + int num_keys_arg, const char **keys) + : mxArray_matlab (interleaved, mxSTRUCT_CLASS, ndims_arg, dims_arg), nfields (num_keys_arg), fields (static_cast<char **> (mxArray::calloc (nfields, sizeof (char *)))), @@ -1684,8 +2350,9 @@ init (keys); } - mxArray_struct (const dim_vector& dv, int num_keys_arg, const char **keys) - : mxArray_matlab (mxSTRUCT_CLASS, dv), nfields (num_keys_arg), + mxArray_struct (bool interleaved, const dim_vector& dv, int num_keys_arg, + const char **keys) + : mxArray_matlab (interleaved, mxSTRUCT_CLASS, dv), nfields (num_keys_arg), fields (static_cast<char **> (mxArray::calloc (nfields, sizeof (char *)))), data (static_cast<mxArray **> (mxArray::calloc (nfields * @@ -1695,8 +2362,10 @@ init (keys); } - mxArray_struct (mwSize m, mwSize n, int num_keys_arg, const char **keys) - : mxArray_matlab (mxSTRUCT_CLASS, m, n), nfields (num_keys_arg), + mxArray_struct (bool interleaved, mwSize m, mwSize n, int num_keys_arg, + const char **keys) + : mxArray_matlab (interleaved, mxSTRUCT_CLASS, m, n), + nfields (num_keys_arg), fields (static_cast<char **> (mxArray::calloc (nfields, sizeof (char *)))), data (static_cast<mxArray **> (mxArray::calloc (nfields * @@ -1937,18 +2606,18 @@ { public: - mxArray_cell (mwSize ndims_arg, const mwSize *dims_arg) - : mxArray_matlab (mxCELL_CLASS, ndims_arg, dims_arg), + mxArray_cell (bool interleaved, mwSize ndims_arg, const mwSize *dims_arg) + : mxArray_matlab (interleaved, mxCELL_CLASS, ndims_arg, dims_arg), data (static_cast<mxArray **> (mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) { } - mxArray_cell (const dim_vector& dv) - : mxArray_matlab (mxCELL_CLASS, dv), + mxArray_cell (bool interleaved, const dim_vector& dv) + : mxArray_matlab (interleaved, mxCELL_CLASS, dv), data (static_cast<mxArray **> (mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) { } - mxArray_cell (mwSize m, mwSize n) - : mxArray_matlab (mxCELL_CLASS, m, n), + mxArray_cell (bool interleaved, mwSize m, mwSize n) + : mxArray_matlab (interleaved, mxCELL_CLASS, m, n), data (static_cast<mxArray **> (mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) { } @@ -2021,54 +2690,76 @@ // ------------------------------------------------------------------ -mxArray::mxArray (const octave_value& ov) - : rep (new mxArray_octave_value (ov)), name (nullptr) { } - -mxArray::mxArray (mxClassID id, mwSize ndims, const mwSize *dims, - mxComplexity flag, bool init) - : rep (new mxArray_number (id, ndims, dims, flag, init)), name (nullptr) { } - -mxArray::mxArray (mxClassID id, const dim_vector& dv, mxComplexity flag) - : rep (new mxArray_number (id, dv, flag)), name (nullptr) { } - -mxArray::mxArray (mxClassID id, mwSize m, mwSize n, +mxArray::mxArray (bool interleaved, const octave_value& ov) + : rep (create_rep (interleaved, ov)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mxClassID id, mwSize ndims, + const mwSize *dims, mxComplexity flag, bool init) + : rep (create_rep (interleaved, id, ndims, dims, flag, init)), + name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mxClassID id, const dim_vector& dv, + mxComplexity flag) + : rep (create_rep (interleaved, id, dv, flag)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mxClassID id, mwSize m, mwSize n, mxComplexity flag, bool init) - : rep (new mxArray_number (id, m, n, flag, init)), name (nullptr) { } - -mxArray::mxArray (mxClassID id, double val) - : rep (new mxArray_number (id, val)), name (nullptr) { } - -mxArray::mxArray (mxClassID id, mxLogical val) - : rep (new mxArray_number (id, val)), name (nullptr) { } - -mxArray::mxArray (const char *str) - : rep (new mxArray_number (str)), name (nullptr) { } - -mxArray::mxArray (mwSize m, const char **str) - : rep (new mxArray_number (m, str)), name (nullptr) { } - -mxArray::mxArray (mxClassID id, mwSize m, mwSize n, mwSize nzmax, - mxComplexity flag) - : rep (new mxArray_sparse (id, m, n, nzmax, flag)), name (nullptr) { } - -mxArray::mxArray (mwSize ndims, const mwSize *dims, int num_keys, + : rep (create_rep (interleaved, id, m, n, flag, init)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mxClassID id, double val) + : rep (create_rep (interleaved, id, val)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mxClassID id, mxLogical val) + : rep (create_rep (interleaved, id, val)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, const char *str) + : rep (create_rep (interleaved, str)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mwSize m, const char **str) + : rep (create_rep (interleaved, m, str)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mxClassID id, mwSize m, mwSize n, + mwSize nzmax, mxComplexity flag) + : rep (create_rep (interleaved, id, m, n, nzmax, flag)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mwSize ndims, const mwSize *dims, + int num_keys, const char **keys) - : rep (new mxArray_struct (ndims, dims, num_keys, keys)), name (nullptr) { } - -mxArray::mxArray (const dim_vector& dv, int num_keys, const char **keys) - : rep (new mxArray_struct (dv, num_keys, keys)), name (nullptr) { } - -mxArray::mxArray (mwSize m, mwSize n, int num_keys, const char **keys) - : rep (new mxArray_struct (m, n, num_keys, keys)), name (nullptr) { } - -mxArray::mxArray (mwSize ndims, const mwSize *dims) - : rep (new mxArray_cell (ndims, dims)), name (nullptr) { } - -mxArray::mxArray (const dim_vector& dv) - : rep (new mxArray_cell (dv)), name (nullptr) { } - -mxArray::mxArray (mwSize m, mwSize n) - : rep (new mxArray_cell (m, n)), name (nullptr) { } + : rep (new mxArray_struct (interleaved, ndims, dims, num_keys, keys)), + name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, const dim_vector& dv, int num_keys, + const char **keys) + : rep (new mxArray_struct (interleaved, dv, num_keys, keys)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mwSize m, mwSize n, int num_keys, + const char **keys) + : rep (new mxArray_struct (interleaved, m, n, num_keys, keys)), + name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mwSize ndims, const mwSize *dims) + : rep (new mxArray_cell (interleaved, ndims, dims)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, const dim_vector& dv) + : rep (new mxArray_cell (interleaved, dv)), name (nullptr) +{ } + +mxArray::mxArray (bool interleaved, mwSize m, mwSize n) + : rep (new mxArray_cell (interleaved, m, n)), name (nullptr) +{ } mxArray::~mxArray (void) { @@ -2100,6 +2791,64 @@ return rep->as_octave_value (); } +mxArray_base * +mxArray::create_rep (bool interleaved, const octave_value& ov) +{ + return new mxArray_octave_value (interleaved, ov); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, mxClassID id, mwSize ndims, + const mwSize *dims, mxComplexity flag, bool init) +{ + return new mxArray_number (interleaved, id, ndims, dims, flag, init); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, mxClassID id, const dim_vector& dv, + mxComplexity flag) +{ + return new mxArray_number (interleaved, id, dv, flag); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, mxClassID id, mwSize m, mwSize n, + mxComplexity flag, bool init) +{ + return new mxArray_number (interleaved, id, m, n, flag, init); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, mxClassID id, double val) +{ + return new mxArray_number (interleaved, id, val); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, mxClassID id, mxLogical val) +{ + return new mxArray_number (interleaved, id, val); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, const char *str) +{ + return new mxArray_number (interleaved, str); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, mwSize m, const char **str) +{ + return new mxArray_number (interleaved, m, str); +} + +mxArray_base * +mxArray::create_rep (bool interleaved, mxClassID id, mwSize m, mwSize n, + mwSize nzmax, mxComplexity flag) +{ + return new mxArray_sparse (interleaved, id, m, n, nzmax, flag); +} + void mxArray::maybe_mutate (void) const { @@ -2130,7 +2879,7 @@ { public: - mex (octave_mex_function *f) + mex (octave_mex_function& f) : curr_mex_fcn (f), memlist (), arraylist (), fname (nullptr) { } // No copying! @@ -2363,7 +3112,9 @@ // freed on exit unless marked as persistent. mxArray * make_value (const octave_value& ov) { - return mark_array (new mxArray (ov)); + bool interleaved = curr_mex_fcn.use_interleaved_complex (); + + return mark_array (new mxArray (interleaved, ov)); } // Free an array and its contents. @@ -2387,7 +3138,7 @@ return inlist; } - octave_mex_function * current_mex_function (void) const + octave_mex_function& current_mex_function (void) const { return curr_mex_fcn; } @@ -2398,7 +3149,7 @@ private: // Pointer to the mex function that corresponds to this mex context. - octave_mex_function *curr_mex_fcn; + octave_mex_function& curr_mex_fcn; // List of memory resources that need to be freed upon exit. std::set<void *> memlist; @@ -2438,7 +3189,6 @@ else warning ("%s: value not marked", function_name ()); #endif - } }; @@ -2478,8 +3228,9 @@ return ptr; } -static inline void * -maybe_unmark (void *ptr) +template <typename T> +static inline T * +maybe_unmark (T *ptr) { if (mex_context) mex_context->unmark (ptr); @@ -2580,116 +3331,235 @@ // Constructors. mxArray * +mxCreateCellArray_interleaved (mwSize ndims, const mwSize *dims) +{ + return maybe_mark_array (new mxArray (true, ndims, dims)); +} + +mxArray * mxCreateCellArray (mwSize ndims, const mwSize *dims) { - return maybe_mark_array (new mxArray (ndims, dims)); + return maybe_mark_array (new mxArray (false, ndims, dims)); +} + +mxArray * +mxCreateCellMatrix_interleaved (mwSize m, mwSize n) +{ + return maybe_mark_array (new mxArray (true, m, n)); } mxArray * mxCreateCellMatrix (mwSize m, mwSize n) { - return maybe_mark_array (new mxArray (m, n)); + return maybe_mark_array (new mxArray (false, m, n)); +} + +mxArray * +mxCreateCharArray_interleaved (mwSize ndims, const mwSize *dims) +{ + return maybe_mark_array (new mxArray (true, mxCHAR_CLASS, ndims, dims)); } mxArray * mxCreateCharArray (mwSize ndims, const mwSize *dims) { - return maybe_mark_array (new mxArray (mxCHAR_CLASS, ndims, dims)); + return maybe_mark_array (new mxArray (false, mxCHAR_CLASS, ndims, dims)); +} + +mxArray * +mxCreateCharMatrixFromStrings_interleaved (mwSize m, const char **str) +{ + return maybe_mark_array (new mxArray (true, m, str)); } mxArray * mxCreateCharMatrixFromStrings (mwSize m, const char **str) { - return maybe_mark_array (new mxArray (m, str)); + return maybe_mark_array (new mxArray (false, m, str)); +} + +mxArray * +mxCreateDoubleMatrix_interleaved (mwSize m, mwSize n, mxComplexity flag) +{ + return maybe_mark_array (new mxArray (true, mxDOUBLE_CLASS, m, n, flag)); } mxArray * mxCreateDoubleMatrix (mwSize m, mwSize n, mxComplexity flag) { - return maybe_mark_array (new mxArray (mxDOUBLE_CLASS, m, n, flag)); + return maybe_mark_array (new mxArray (false, mxDOUBLE_CLASS, m, n, flag)); +} + +mxArray * +mxCreateDoubleScalar_interleaved (double val) +{ + return maybe_mark_array (new mxArray (true, mxDOUBLE_CLASS, val)); } mxArray * mxCreateDoubleScalar (double val) { - return maybe_mark_array (new mxArray (mxDOUBLE_CLASS, val)); + return maybe_mark_array (new mxArray (false, mxDOUBLE_CLASS, val)); +} + +mxArray * +mxCreateLogicalArray_interleaved (mwSize ndims, const mwSize *dims) +{ + return maybe_mark_array (new mxArray (true, mxLOGICAL_CLASS, ndims, dims)); } mxArray * mxCreateLogicalArray (mwSize ndims, const mwSize *dims) { - return maybe_mark_array (new mxArray (mxLOGICAL_CLASS, ndims, dims)); + return maybe_mark_array (new mxArray (false, mxLOGICAL_CLASS, ndims, dims)); +} + +mxArray * +mxCreateLogicalMatrix_interleaved (mwSize m, mwSize n) +{ + return maybe_mark_array (new mxArray (true, mxLOGICAL_CLASS, m, n)); } mxArray * mxCreateLogicalMatrix (mwSize m, mwSize n) { - return maybe_mark_array (new mxArray (mxLOGICAL_CLASS, m, n)); + return maybe_mark_array (new mxArray (false, mxLOGICAL_CLASS, m, n)); +} + +mxArray * +mxCreateLogicalScalar_interleaved (mxLogical val) +{ + return maybe_mark_array (new mxArray (true, mxLOGICAL_CLASS, val)); } mxArray * mxCreateLogicalScalar (mxLogical val) { - return maybe_mark_array (new mxArray (mxLOGICAL_CLASS, val)); + return maybe_mark_array (new mxArray (false, mxLOGICAL_CLASS, val)); +} + +mxArray * +mxCreateNumericArray_interleaved (mwSize ndims, const mwSize *dims, + mxClassID class_id, mxComplexity flag) +{ + return maybe_mark_array (new mxArray (true, class_id, ndims, dims, flag)); } mxArray * -mxCreateNumericArray (mwSize ndims, const mwSize *dims, mxClassID class_id, - mxComplexity flag) -{ - return maybe_mark_array (new mxArray (class_id, ndims, dims, flag)); +mxCreateNumericArray (mwSize ndims, const mwSize *dims, + mxClassID class_id, mxComplexity flag) +{ + return maybe_mark_array (new mxArray (false, class_id, ndims, dims, flag)); +} + +mxArray * +mxCreateNumericMatrix_interleaved (mwSize m, mwSize n, mxClassID class_id, + mxComplexity flag) +{ + return maybe_mark_array (new mxArray (true, class_id, m, n, flag)); } mxArray * mxCreateNumericMatrix (mwSize m, mwSize n, mxClassID class_id, - mxComplexity flag) -{ - return maybe_mark_array (new mxArray (class_id, m, n, flag)); + mxComplexity flag) +{ + return maybe_mark_array (new mxArray (false, class_id, m, n, flag)); +} + +mxArray * +mxCreateUninitNumericArray_interleaved (mwSize ndims, const mwSize *dims, + mxClassID class_id, mxComplexity flag) +{ + return maybe_mark_array (new mxArray (true, class_id, ndims, dims, flag, + false)); } mxArray * mxCreateUninitNumericArray (mwSize ndims, const mwSize *dims, - mxClassID class_id, mxComplexity flag) -{ - return maybe_mark_array (new mxArray (class_id, ndims, dims, flag, false)); + mxClassID class_id, mxComplexity flag) +{ + return maybe_mark_array (new mxArray (false, class_id, ndims, dims, flag, + false)); +} + +mxArray * +mxCreateUninitNumericMatrix_interleaved (mwSize m, mwSize n, + mxClassID class_id, mxComplexity flag) +{ + return maybe_mark_array (new mxArray (true, class_id, m, n, flag, false)); } mxArray * mxCreateUninitNumericMatrix (mwSize m, mwSize n, mxClassID class_id, - mxComplexity flag) -{ - return maybe_mark_array (new mxArray (class_id, m, n, flag, false)); + mxComplexity flag) +{ + return maybe_mark_array (new mxArray (false, class_id, m, n, flag, false)); +} + +mxArray * +mxCreateSparse_interleaved (mwSize m, mwSize n, mwSize nzmax, mxComplexity flag) +{ + return maybe_mark_array (new mxArray (true, mxDOUBLE_CLASS, m, n, nzmax, + flag)); } mxArray * mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, mxComplexity flag) { - return maybe_mark_array (new mxArray (mxDOUBLE_CLASS, m, n, nzmax, flag)); + return maybe_mark_array (new mxArray (false, mxDOUBLE_CLASS, m, n, nzmax, + flag)); +} + +mxArray * +mxCreateSparseLogicalMatrix_interleaved (mwSize m, mwSize n, mwSize nzmax) +{ + return maybe_mark_array (new mxArray (true, mxLOGICAL_CLASS, m, n, nzmax)); } mxArray * mxCreateSparseLogicalMatrix (mwSize m, mwSize n, mwSize nzmax) { - return maybe_mark_array (new mxArray (mxLOGICAL_CLASS, m, n, nzmax)); + return maybe_mark_array (new mxArray (false, mxLOGICAL_CLASS, m, n, nzmax)); +} + +mxArray * +mxCreateString_interleaved (const char *str) +{ + return maybe_mark_array (new mxArray (true, str)); } mxArray * mxCreateString (const char *str) { - return maybe_mark_array (new mxArray (str)); + return maybe_mark_array (new mxArray (false, str)); +} + +mxArray * +mxCreateStructArray_interleaved (mwSize ndims, const mwSize *dims, + int num_keys, const char **keys) +{ + return maybe_mark_array (new mxArray (true, ndims, dims, num_keys, keys)); } mxArray * mxCreateStructArray (mwSize ndims, const mwSize *dims, int num_keys, - const char **keys) -{ - return maybe_mark_array (new mxArray (ndims, dims, num_keys, keys)); + const char **keys) +{ + return maybe_mark_array (new mxArray (false, ndims, dims, num_keys, keys)); } mxArray * -mxCreateStructMatrix (mwSize m, mwSize n, int num_keys, const char **keys) -{ - return maybe_mark_array (new mxArray (m, n, num_keys, keys)); +mxCreateStructMatrix_interleaved (mwSize m, mwSize n, int num_keys, + const char **keys) +{ + return maybe_mark_array (new mxArray (true, m, n, num_keys, keys)); +} + +mxArray * +mxCreateStructMatrix (mwSize m, mwSize n, int num_keys, + const char **keys) +{ + return maybe_mark_array (new mxArray (false, m, n, num_keys, keys)); } // Copy constructor. @@ -2918,12 +3788,6 @@ return static_cast<double *> (ptr->get_data ()); } -double * -mxGetPi (const mxArray *ptr) -{ - return static_cast<double *> (ptr->get_imag_data ()); -} - double mxGetScalar (const mxArray *ptr) { @@ -2951,12 +3815,121 @@ return ptr->get_data (); } +double * +mxGetPi (const mxArray *ptr) +{ + return static_cast<double *> (ptr->get_imag_data ()); +} + void * mxGetImagData (const mxArray *ptr) { return ptr->get_imag_data (); } +mxDouble * mxGetDoubles (const mxArray *ptr) +{ + return ptr->get_doubles (); +} + +mxSingle * mxGetSingles (const mxArray *ptr) +{ + return ptr->get_singles (); +} + +mxInt8 * mxGetInt8s (const mxArray *ptr) +{ + return ptr->get_int8s (); +} + +mxInt16 * mxGetInt16s (const mxArray *ptr) +{ + return ptr->get_int16s (); +} + +mxInt32 * mxGetInt32s (const mxArray *ptr) +{ + return ptr->get_int32s (); +} + +mxInt64 * mxGetInt64s (const mxArray *ptr) +{ + return ptr->get_int64s (); +} + +mxUint8 * mxGetUint8s (const mxArray *ptr) +{ + return ptr->get_uint8s (); +} + +mxUint16 * mxGetUint16s (const mxArray *ptr) +{ + return ptr->get_uint16s (); +} + +mxUint32 * mxGetUint32s (const mxArray *ptr) +{ + return ptr->get_uint32s (); +} + +mxUint64 * mxGetUint64s (const mxArray *ptr) +{ + return ptr->get_uint64s (); +} + +mxComplexDouble * mxGetComplexDoubles (const mxArray *ptr) +{ + return ptr->get_complex_doubles (); +} + +mxComplexSingle * mxGetComplexSingles (const mxArray *ptr) +{ + return ptr->get_complex_singles (); +} + +#if 0 +/* We don't have these yet. */ +mxComplexInt8 * mxGetComplexInt8s (const mxArray *ptr) +{ + return ptr->get_complex_int8s (); +} + +mxComplexInt16 * mxGetComplexInt16s (const mxArray *ptr) +{ + return ptr->get_complex_int16s (); +} + +mxComplexInt32 * mxGetComplexInt32s (const mxArray *ptr) +{ + return ptr->get_complex_int32s (); +} + +mxComplexInt64 * mxGetComplexInt64s (const mxArray *ptr) +{ + return ptr->get_complex_int64s (); +} + +mxComplexUint8 * mxGetComplexUint8s (const mxArray *ptr) +{ + return ptr->get_complex_uint8s (); +} + +mxComplexUint16 * mxGetComplexUint16s (const mxArray *ptr) +{ + return ptr->get_complex_uint16s (); +} + +mxComplexUint32 * mxGetComplexUint32s (const mxArray *ptr) +{ + return ptr->get_complex_uint32s (); +} + +mxComplexUint64 * mxGetComplexUint64s (const mxArray *ptr) +{ + return ptr->get_complex_uint64s (); +} +#endif + // Data setters. void mxSetPr (mxArray *ptr, double *pr) @@ -2965,18 +3938,121 @@ } void +mxSetData (mxArray *ptr, void *pr) +{ + ptr->set_data (maybe_unmark (pr)); +} + +int mxSetDoubles (mxArray *ptr, mxDouble *data) +{ + return ptr->set_doubles (maybe_unmark (data)); +} + +int mxSetSingles (mxArray *ptr, mxSingle *data) +{ + return ptr->set_singles (maybe_unmark (data)); +} + +int mxSetInt8s (mxArray *ptr, mxInt8 *data) +{ + return ptr->set_int8s (maybe_unmark (data)); +} + +int mxSetInt16s (mxArray *ptr, mxInt16 *data) +{ + return ptr->set_int16s (maybe_unmark (data)); +} + +int mxSetInt32s (mxArray *ptr, mxInt32 *data) +{ + return ptr->set_int32s (maybe_unmark (data)); +} + +int mxSetInt64s (mxArray *ptr, mxInt64 *data) +{ + return ptr->set_int64s (maybe_unmark (data)); +} + +int mxSetUint8s (mxArray *ptr, mxUint8 *data) +{ + return ptr->set_uint8s (maybe_unmark (data)); +} + +int mxSetUint16s (mxArray *ptr, mxUint16 *data) +{ + return ptr->set_uint16s (maybe_unmark (data)); +} + +int mxSetUint32s (mxArray *ptr, mxUint32 *data) +{ + return ptr->set_uint32s (maybe_unmark (data)); +} + +int mxSetUint64s (mxArray *ptr, mxUint64 *data) +{ + return ptr->set_uint64s (maybe_unmark (data)); +} + +int mxSetComplexDoubles (mxArray *ptr, mxComplexDouble *data) +{ + return ptr->set_complex_doubles (maybe_unmark (data)); +} + +int mxSetComplexSingles (mxArray *ptr, mxComplexSingle *data) +{ + return ptr->set_complex_singles (maybe_unmark (data)); +} + +#if 0 +/* We don't have these yet. */ +int mxSetComplexInt8s (mxArray *ptr, mxComplexInt8 *data) +{ + return ptr->set_complex_int8s (maybe_unmark (data)); +} + +int mxSetComplexInt16s (mxArray *ptr, mxComplexInt16 *data) +{ + return ptr->set_complex_int16s (maybe_unmark (data)); +} + +int mxSetComplexInt32s (mxArray *ptr, mxComplexInt32 *data) +{ + return ptr->set_complex_int32s (maybe_unmark (data)); +} + +int mxSetComplexInt64s (mxArray *ptr, mxComplexInt64 *data) +{ + return ptr->set_complex_int64s (maybe_unmark (data)); +} + +int mxSetComplexUint8s (mxArray *ptr, mxComplexUint8 *data) +{ + return ptr->set_complex_uint8s (maybe_unmark (data)); +} + +int mxSetComplexUint16s (mxArray *ptr, mxComplexUint16 *data) +{ + return ptr->set_complex_uint16s (maybe_unmark (data)); +} + +int mxSetComplexUint32s (mxArray *ptr, mxComplexUint32 *data) +{ + return ptr->set_complex_uint32s (maybe_unmark (data)); +} + +int mxSetComplexUint64s (mxArray *ptr, mxComplexUint64 *data) +{ + return ptr->set_complex_uint64s (maybe_unmark (data)); +} +#endif + +void mxSetPi (mxArray *ptr, double *pi) { ptr->set_imag_data (maybe_unmark (pi)); } void -mxSetData (mxArray *ptr, void *pr) -{ - ptr->set_data (maybe_unmark (pr)); -} - -void mxSetImagData (mxArray *ptr, void *pi) { ptr->set_imag_data (maybe_unmark (pi)); @@ -3177,7 +4253,7 @@ // Save old mex pointer. frame.protect_var (mex_context); - mex context (&mex_fcn); + mex context (mex_fcn); for (int i = 0; i < nargin; i++) argin[i] = context.make_value (args(i)); @@ -3619,17 +4695,28 @@ { if (mex_context) { - octave_mex_function *curr_mex_fcn = mex_context->current_mex_function (); - - assert (curr_mex_fcn); - - curr_mex_fcn->atexit (f); + octave_mex_function& curr_mex_fcn = mex_context->current_mex_function (); + + curr_mex_fcn.atexit (f); } return 0; } const mxArray * +mexGet_interleaved (double handle, const char *property) +{ + mxArray *m = nullptr; + + octave_value ret = get_property_from_handle (handle, property, "mexGet"); + + if (ret.is_defined ()) + m = ret.as_mxArray (true); + + return m; +} + +const mxArray * mexGet (double handle, const char *property) { mxArray *m = nullptr; @@ -3637,7 +4724,7 @@ octave_value ret = get_property_from_handle (handle, property, "mexGet"); if (ret.is_defined ()) - m = ret.as_mxArray (); + m = ret.as_mxArray (false); return m; }
--- a/libinterp/corefcn/mexproto.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/mexproto.h Fri May 22 11:06:58 2020 +0200 @@ -61,10 +61,19 @@ # include <stdbool.h> #endif +#if ! defined (MX_HAS_INTERLEAVED_COMPLEX) +# define MX_HAS_INTERLEAVED_COMPLEX 0 +#endif + #define MXARRAY_TYPEDEFS_ONLY #include "mxarray.h" #undef MXARRAY_TYPEDEFS_ONLY +/* Prototype for the gateway function. */ + +extern void mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]); + /* Interface to the interpreter. */ extern OCTINTERP_API const char * mexFunctionName (void); @@ -98,8 +107,12 @@ extern OCTINTERP_API int mexPutVariable (const char *space, const char *name, const mxArray *ptr); +#if MX_HAS_INTERLEAVED_COMPLEX +# define mexGet mexGet_interleaved +#endif extern OCTINTERP_API const mxArray * mexGet (double handle, const char *property); + extern OCTINTERP_API int mexSet (double handle, const char *property, mxArray *val); @@ -131,6 +144,27 @@ extern OCTINTERP_API void mxFree (void *ptr); /* Constructors. */ +#if MX_HAS_INTERLEAVED_COMPLEX +# define mxCreateCellArray mxCreateCellArray_interleaved +# define mxCreateCellMatrix mxCreateCellMatrix_interleaved +# define mxCreateCharArray mxCreateCharArray_interleaved +# define mxCreateCharMatrixFromStrings mxCreateCharMatrixFromStrings_interleaved +# define mxCreateDoubleMatrix mxCreateDoubleMatrix_interleaved +# define mxCreateDoubleScalar mxCreateDoubleScalar_interleaved +# define mxCreateLogicalArray mxCreateLogicalArray_interleaved +# define mxCreateLogicalMatrix mxCreateLogicalMatrix_interleaved +# define mxCreateLogicalScalar mxCreateLogicalScalar_interleaved +# define mxCreateNumericArray mxCreateNumericArray_interleaved +# define mxCreateNumericMatrix mxCreateNumericMatrix_interleaved +# define mxCreateUninitNumericArray mxCreateUninitNumericArray_interleaved +# define mxCreateUninitNumericMatrix mxCreateUninitNumericMatrix_interleaved +# define mxCreateSparse mxCreateSparse_interleaved +# define mxCreateSparseLogicalMatrix mxCreateSparseLogicalMatrix_interleaved +# define mxCreateString mxCreateString_interleaved +# define mxCreateStructArray mxCreateStructArray_interleaved +# define mxCreateStructMatrix mxCreateStructMatrix_interleaved +#endif + extern OCTINTERP_API mxArray * mxCreateCellArray (mwSize ndims, const mwSize *dims); extern OCTINTERP_API mxArray * mxCreateCellMatrix (mwSize m, mwSize n); @@ -227,20 +261,79 @@ extern OCTINTERP_API int mxSetDimensions (mxArray *ptr, const mwSize *dims, mwSize ndims); +#if MX_HAS_INTERLEAVED_COMPLEX +extern OCTINTERP_API int mxMakeArrayReal (mxArray *ptr); +extern OCTINTERP_API int mxMakeArrayComplex (mxArray *ptr); +#endif + /* Data extractors. */ -extern OCTINTERP_API double * mxGetPi (const mxArray *ptr); extern OCTINTERP_API double * mxGetPr (const mxArray *ptr); extern OCTINTERP_API double mxGetScalar (const mxArray *ptr); extern OCTINTERP_API mxChar * mxGetChars (const mxArray *ptr); extern OCTINTERP_API mxLogical * mxGetLogicals (const mxArray *ptr); extern OCTINTERP_API void * mxGetData (const mxArray *ptr); +#if MX_HAS_INTERLEAVED_COMPLEX +extern OCTINTERP_API mxDouble * mxGetDoubles (const mxArray *p); +extern OCTINTERP_API mxSingle * mxGetSingles (const mxArray *p); +extern OCTINTERP_API mxInt8 * mxGetInt8s (const mxArray *p); +extern OCTINTERP_API mxInt16 * mxGetInt16s (const mxArray *p); +extern OCTINTERP_API mxInt32 * mxGetInt32s (const mxArray *p); +extern OCTINTERP_API mxInt64 * mxGetInt64s (const mxArray *p); +extern OCTINTERP_API mxUint8 * mxGetUint8s (const mxArray *p); +extern OCTINTERP_API mxUint16 * mxGetUint16s (const mxArray *p); +extern OCTINTERP_API mxUint32 * mxGetUint32s (const mxArray *p); +extern OCTINTERP_API mxUint64 * mxGetUint64s (const mxArray *p); + +extern OCTINTERP_API mxComplexDouble * mxGetComplexDoubles (const mxArray *p); +extern OCTINTERP_API mxComplexSingle * mxGetComplexSingles (const mxArray *p); +#if 0 +/* We don't have these yet. */ +extern OCTINTERP_API mxComplexInt8 * mxGetComplexInt8s (const mxArray *p); +extern OCTINTERP_API mxComplexInt16 * mxGetComplexInt16s (const mxArray *p); +extern OCTINTERP_API mxComplexInt32 * mxGetComplexInt32s (const mxArray *p); +extern OCTINTERP_API mxComplexInt64 * mxGetComplexInt64s (const mxArray *p); +extern OCTINTERP_API mxComplexUint8 * mxGetComplexUint8s (const mxArray *p); +extern OCTINTERP_API mxComplexUint16 * mxGetComplexUint16s (const mxArray *p); +extern OCTINTERP_API mxComplexUint32 * mxGetComplexUint32s (const mxArray *p); +extern OCTINTERP_API mxComplexUint64 * mxGetComplexUint64s (const mxArray *p); +#endif +#else +extern OCTINTERP_API double * mxGetPi (const mxArray *ptr); extern OCTINTERP_API void * mxGetImagData (const mxArray *ptr); +#endif /* Data setters. */ extern OCTINTERP_API void mxSetPr (mxArray *ptr, double *pr); +extern OCTINTERP_API void mxSetData (mxArray *ptr, void *data); +#if MX_HAS_INTERLEAVED_COMPLEX +extern OCTINTERP_API int mxSetDoubles (mxArray *p, mxDouble *d); +extern OCTINTERP_API int mxSetSingles (mxArray *p, mxSingle *d); +extern OCTINTERP_API int mxSetInt8s (mxArray *p, mxInt8 *d); +extern OCTINTERP_API int mxSetInt16s (mxArray *p, mxInt16 *d); +extern OCTINTERP_API int mxSetInt32s (mxArray *p, mxInt32 *d); +extern OCTINTERP_API int mxSetInt64s (mxArray *p, mxInt64 *d); +extern OCTINTERP_API int mxSetUint8s (mxArray *p, mxUint8 *d); +extern OCTINTERP_API int mxSetUint16s (mxArray *p, mxUint16 *d); +extern OCTINTERP_API int mxSetUint32s (mxArray *p, mxUint32 *d); +extern OCTINTERP_API int mxSetUint64s (mxArray *p, mxUint64 *d); + +extern OCTINTERP_API int mxSetComplexDoubles (mxArray *p, mxComplexDouble *d); +extern OCTINTERP_API int mxSetComplexSingles (mxArray *p, mxComplexSingle *d); +#if 0 +/* We don't have these yet. */ +extern OCTINTERP_API int mxSetComplexInt8s (mxArray *p, mxComplexInt8 *d); +extern OCTINTERP_API int mxSetComplexInt16s (mxArray *p, mxComplexInt16 *d); +extern OCTINTERP_API int mxSetComplexInt32s (mxArray *p, mxComplexInt32 *d); +extern OCTINTERP_API int mxSetComplexInt64s (mxArray *p, mxComplexInt64 *d); +extern OCTINTERP_API int mxSetComplexUint8s (mxArray *p, mxComplexUint8 *d); +extern OCTINTERP_API int mxSetComplexUint16s (mxArray *p, mxComplexUint16 *d); +extern OCTINTERP_API int mxSetComplexUint32s (mxArray *p, mxComplexUint32 *d); +extern OCTINTERP_API int mxSetComplexUint64s (mxArray *p, mxComplexUint64 *d); +#endif +#else extern OCTINTERP_API void mxSetPi (mxArray *ptr, double *pi); -extern OCTINTERP_API void mxSetData (mxArray *ptr, void *data); extern OCTINTERP_API void mxSetImagData (mxArray *ptr, void *pi); +#endif /* Classes. */ extern OCTINTERP_API mxClassID mxGetClassID (const mxArray *ptr);
--- a/libinterp/corefcn/mk-mxarray-h.in.sh Wed May 06 10:05:36 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -#! /bin/sh -# -######################################################################## -# -# Copyright (C) 2016-2020 The Octave Project Developers -# -# See the file COPYRIGHT.md in the top-level directory of this -# distribution or <https://octave.org/copyright/>. -# -# 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/>. -# -######################################################################## - -: ${SED=@SED@} - -OCTAVE_IDX_TYPE="@OCTAVE_IDX_TYPE@" - -$SED \ - -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by mx-mxarray-h.|" \ - -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libinterp/corefcn/mk-mxtypes-h.in.sh Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,34 @@ +#! /bin/sh +# +######################################################################## +# +# Copyright (C) 2016-2020 The Octave Project Developers +# +# See the file COPYRIGHT.md in the top-level directory of this +# distribution or <https://octave.org/copyright/>. +# +# 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/>. +# +######################################################################## + +: ${SED=@SED@} + +OCTAVE_IDX_TYPE="@OCTAVE_IDX_TYPE@" + +$SED \ + -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by mx-mxtypes-h.sh|" \ + -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|"
--- a/libinterp/corefcn/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/module.mk Fri May 22 11:06:58 2020 +0200 @@ -58,6 +58,7 @@ %reldir%/ls-utils.h \ %reldir%/mex.h \ %reldir%/mexproto.h \ + %reldir%/mxarray.h \ %reldir%/oct-errno.h \ %reldir%/oct-fstrm.h \ %reldir%/oct-handle.h \ @@ -91,7 +92,6 @@ %reldir%/sysdep.h \ %reldir%/text-engine.h \ %reldir%/text-renderer.h \ - %reldir%/txt-eng.h \ %reldir%/url-handle-manager.h \ %reldir%/utils.h \ %reldir%/variables.h \ @@ -300,8 +300,8 @@ fi && \ mv $@-t $@ -%reldir%/mxarray.h: %reldir%/mxarray.in.h %reldir%/mk-mxarray-h.sh | %reldir%/$(octave_dirstamp) - $(AM_V_GEN)$(call simple-filter-rule,%reldir%/mk-mxarray-h.sh) +%reldir%/mxtypes.h: %reldir%/mxtypes.in.h %reldir%/mk-mxtypes-h.sh | %reldir%/$(octave_dirstamp) + $(AM_V_GEN)$(call simple-filter-rule,%reldir%/mk-mxtypes-h.sh) %reldir%/oct-tex-lexer.ll: %reldir%/oct-tex-lexer.in.ll %reldir%/oct-tex-symbols.in | %reldir%/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ @@ -334,11 +334,11 @@ %reldir%/genprops.awk \ %reldir%/graphics.in.h \ %reldir%/mk-errno-list.sh \ - %reldir%/mk-mxarray-h.in.sh \ - %reldir%/mxarray.in.h \ + %reldir%/mk-mxtypes-h.in.sh \ + %reldir%/mxtypes.in.h \ %reldir%/oct-errno.in.cc \ %reldir%/oct-tex-lexer.in.ll \ %reldir%/oct-tex-symbols.in GEN_CONFIG_SHELL += \ - %reldir%/mk-mxarray-h.sh + %reldir%/mk-mxtypes-h.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libinterp/corefcn/mxarray.h Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,746 @@ +//////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2001-2020 The Octave Project Developers +// +// See the file COPYRIGHT.md in the top-level directory of this +// distribution or <https://octave.org/copyright/>. +// +// 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/>. +// +//////////////////////////////////////////////////////////////////////// + +/* + +Part of this code was originally distributed as part of Octave Forge under +the following terms: + +Author: Paul Kienzle +I grant this code to the public domain. +2001-03-22 + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR OR 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. + +*/ + +#if ! defined (octave_mxarray_h) +#define octave_mxarray_h 1 + +#include "octave-config.h" + +#include "mxtypes.h" + +#if ! defined (MXARRAY_TYPEDEFS_ONLY) + +#include <cstring> +#include "error.h" + +class octave_value; +class dim_vector; + +#define DO_MUTABLE_METHOD(RET_T, METHOD_CALL) \ + RET_T retval = rep->METHOD_CALL; \ + \ + if (rep->mutation_needed ()) \ + { \ + maybe_mutate (); \ + retval = rep->METHOD_CALL; \ + } \ + \ + return retval + +#define DO_VOID_MUTABLE_METHOD(METHOD_CALL) \ + rep->METHOD_CALL; \ + \ + if (rep->mutation_needed ()) \ + { \ + maybe_mutate (); \ + rep->METHOD_CALL; \ + } + +class mxArray; + +// A class to provide the default implementation of some of the +// virtual functions declared in the mxArray class. + +class mxArray_base +{ +protected: + + mxArray_base (bool interleaved); + +public: + + virtual mxArray_base * dup (void) const = 0; + + virtual mxArray * as_mxArray (void) const { return nullptr; } + + virtual ~mxArray_base (void) = default; + + virtual bool is_octave_value (void) const { return false; } + + virtual int iscell (void) const = 0; + + virtual int is_char (void) const = 0; + + virtual int is_class (const char *name_arg) const + { + int retval = 0; + + const char *cname = get_class_name (); + + if (cname && name_arg) + retval = ! strcmp (cname, name_arg); + + return retval; + } + + virtual int is_complex (void) const = 0; + + virtual int is_double (void) const = 0; + + virtual int is_function_handle (void) const = 0; + + virtual int is_int16 (void) const = 0; + + virtual int is_int32 (void) const = 0; + + virtual int is_int64 (void) const = 0; + + virtual int is_int8 (void) const = 0; + + virtual int is_logical (void) const = 0; + + virtual int is_numeric (void) const = 0; + + virtual int is_single (void) const = 0; + + virtual int is_sparse (void) const = 0; + + virtual int is_struct (void) const = 0; + + virtual int is_uint16 (void) const = 0; + + virtual int is_uint32 (void) const = 0; + + virtual int is_uint64 (void) const = 0; + + virtual int is_uint8 (void) const = 0; + + virtual int is_logical_scalar (void) const + { + return is_logical () && get_number_of_elements () == 1; + } + + virtual int is_logical_scalar_true (void) const = 0; + + virtual mwSize get_m (void) const = 0; + + virtual mwSize get_n (void) const = 0; + + virtual mwSize * get_dimensions (void) const = 0; + + virtual mwSize get_number_of_dimensions (void) const = 0; + + virtual void set_m (mwSize m) = 0; + + virtual void set_n (mwSize n) = 0; + + virtual int set_dimensions (mwSize *dims_arg, mwSize ndims_arg) = 0; + + virtual mwSize get_number_of_elements (void) const = 0; + + virtual int isempty (void) const = 0; + + virtual bool is_scalar (void) const = 0; + + virtual mxClassID get_class_id (void) const = 0; + + virtual const char * get_class_name (void) const = 0; + + virtual void set_class_name (const char *name_arg) = 0; + + // The following functions aren't pure virtual because they are only + // valid for one type. Making them pure virtual would mean that they + // have to be implemented for all derived types, and all of those + // would need to throw errors instead of just doing it once here. + + virtual mxArray * + get_property (mwIndex /*idx*/, const char * /*pname*/) const + { + return nullptr; + } + + virtual void set_property (mwIndex /*idx*/, const char * /*pname*/, + const mxArray * /*pval*/) + { + err_invalid_type ("set_property"); + } + + virtual mxArray * get_cell (mwIndex /*idx*/) const + { + err_invalid_type ("get_cell"); + } + + virtual void set_cell (mwIndex idx, mxArray *val) = 0; + + virtual double get_scalar (void) const = 0; + + virtual void * get_data (void) const = 0; + + virtual mxDouble * get_doubles (void) const = 0; + virtual mxSingle * get_singles (void) const = 0; + virtual mxInt8 * get_int8s (void) const = 0; + virtual mxInt16 * get_int16s (void) const = 0; + virtual mxInt32 * get_int32s (void) const = 0; + virtual mxInt64 * get_int64s (void) const = 0; + virtual mxUint8 * get_uint8s (void) const = 0; + virtual mxUint16 * get_uint16s (void) const = 0; + virtual mxUint32 * get_uint32s (void) const = 0; + virtual mxUint64 * get_uint64s (void) const = 0; + + virtual mxComplexDouble * get_complex_doubles (void) const = 0; + virtual mxComplexSingle * get_complex_singles (void) const = 0; +#if 0 + /* We don't have these yet. */ + virtual mxComplexInt8 * get_complex_int8s (void) const = 0; + virtual mxComplexInt16 * get_complex_int16s (void) const = 0; + virtual mxComplexInt32 * get_complex_int32s (void) const = 0; + virtual mxComplexInt64 * get_complex_int64s (void) const = 0; + virtual mxComplexUint8 * get_complex_uint8s (void) const = 0; + virtual mxComplexUint16 * get_complex_uint16s (void) const = 0; + virtual mxComplexUint32 * get_complex_uint32s (void) const = 0; + virtual mxComplexUint64 * get_complex_uint64s (void) const = 0; +#endif + + virtual void * get_imag_data (void) const = 0; + + virtual void set_data (void *pr) = 0; + + virtual int set_doubles (mxDouble *data) = 0; + virtual int set_singles (mxSingle *data) = 0; + virtual int set_int8s (mxInt8 *data) = 0; + virtual int set_int16s (mxInt16 *data) = 0; + virtual int set_int32s (mxInt32 *data) = 0; + virtual int set_int64s (mxInt64 *data) = 0; + virtual int set_uint8s (mxUint8 *data) = 0; + virtual int set_uint16s (mxUint16 *data) = 0; + virtual int set_uint32s (mxUint32 *data) = 0; + virtual int set_uint64s (mxUint64 *data) = 0; + + virtual int set_complex_doubles (mxComplexDouble *data) = 0; + virtual int set_complex_singles (mxComplexSingle *data) = 0; +#if 0 + /* We don't have these yet. */ + virtual int set_complex_int8s (mxComplexInt8 *data) = 0; + virtual int set_complex_int16s (mxComplexInt16 *data) = 0; + virtual int set_complex_int32s (mxComplexInt32 *data) = 0; + virtual int set_complex_int64s (mxComplexInt64 *data) = 0; + virtual int set_complex_uint8s (mxComplexUint8 *data) = 0; + virtual int set_complex_uint16s (mxComplexUint16 *data) = 0; + virtual int set_complex_uint32s (mxComplexUint32 *data) = 0; + virtual int set_complex_uint64s (mxComplexUint64 *data) = 0; +#endif + + virtual void set_imag_data (void *pi) = 0; + + virtual mwIndex * get_ir (void) const = 0; + + virtual mwIndex * get_jc (void) const = 0; + + virtual mwSize get_nzmax (void) const = 0; + + virtual void set_ir (mwIndex *ir) = 0; + + virtual void set_jc (mwIndex *jc) = 0; + + virtual void set_nzmax (mwSize nzmax) = 0; + + virtual int add_field (const char *key) = 0; + + virtual void remove_field (int key_num) = 0; + + virtual mxArray * get_field_by_number (mwIndex index, int key_num) const = 0; + + virtual void + set_field_by_number (mwIndex index, int key_num, mxArray *val) = 0; + + virtual int get_number_of_fields (void) const = 0; + + virtual const char * get_field_name_by_number (int key_num) const = 0; + + virtual int get_field_number (const char *key) const = 0; + + virtual int get_string (char *buf, mwSize buflen) const = 0; + + virtual char * array_to_string (void) const = 0; + + virtual mwIndex calc_single_subscript (mwSize nsubs, mwIndex *subs) const = 0; + + virtual size_t get_element_size (void) const = 0; + + virtual bool mutation_needed (void) const { return false; } + + virtual mxArray * mutate (void) const { return nullptr; } + + virtual octave_value as_octave_value (void) const = 0; + +protected: + + // If TRUE, we are using interleaved storage for complex numeric arrays. + bool m_interleaved; + + mxArray_base (const mxArray_base&) = default; + + size_t get_numeric_element_size (size_t size) const + { + return (m_interleaved + ? is_complex () ? 2 * size : size + : size); + } + + OCTAVE_NORETURN void err_invalid_type (const char *op) const + { + error ("%s: invalid type for mxArray::%s", get_class_name (), op); + } +}; + +// The main interface class. The representation can be based on an +// octave_value object or a separate object that tries to reproduce +// the semantics of mxArray objects in Matlab more directly. + +class mxArray +{ +public: + + mxArray (bool interleaved, const octave_value& ov); + + mxArray (bool interleaved, mxClassID id, mwSize ndims, const mwSize *dims, + mxComplexity flag = mxREAL, bool init = true); + + mxArray (bool interleaved, mxClassID id, const dim_vector& dv, + mxComplexity flag = mxREAL); + + mxArray (bool interleaved, mxClassID id, mwSize m, mwSize n, + mxComplexity flag = mxREAL, bool init = true); + + mxArray (bool interleaved, mxClassID id, double val); + + mxArray (bool interleaved, mxClassID id, mxLogical val); + + mxArray (bool interleaved, const char *str); + + mxArray (bool interleaved, mwSize m, const char **str); + + mxArray (bool interleaved, mxClassID id, mwSize m, mwSize n, mwSize nzmax, + mxComplexity flag = mxREAL); + + mxArray (bool interleaved, mwSize ndims, const mwSize *dims, int num_keys, + const char **keys); + + mxArray (bool interleaved, const dim_vector& dv, int num_keys, + const char **keys); + + mxArray (bool interleaved, mwSize m, mwSize n, int num_keys, + const char **keys); + + mxArray (bool interleaved, mwSize ndims, const mwSize *dims); + + mxArray (bool interleaved, const dim_vector& dv); + + mxArray (bool interleaved, mwSize m, mwSize n); + + mxArray * dup (void) const + { + mxArray *retval = rep->as_mxArray (); + + if (retval) + retval->set_name (name); + else + { + mxArray_base *new_rep = rep->dup (); + + retval = new mxArray (new_rep, name); + } + + return retval; + } + + // No copying! + + mxArray (const mxArray&) = delete; + + mxArray& operator = (const mxArray&) = delete; + + ~mxArray (void); + + bool is_octave_value (void) const { return rep->is_octave_value (); } + + int iscell (void) const { return rep->iscell (); } + + int is_char (void) const { return rep->is_char (); } + + int is_class (const char *name_arg) const { return rep->is_class (name_arg); } + + int is_complex (void) const { return rep->is_complex (); } + + int is_double (void) const { return rep->is_double (); } + + int is_function_handle (void) const { return rep->is_function_handle (); } + + int is_int16 (void) const { return rep->is_int16 (); } + + int is_int32 (void) const { return rep->is_int32 (); } + + int is_int64 (void) const { return rep->is_int64 (); } + + int is_int8 (void) const { return rep->is_int8 (); } + + int is_logical (void) const { return rep->is_logical (); } + + int is_numeric (void) const { return rep->is_numeric (); } + + int is_single (void) const { return rep->is_single (); } + + int is_sparse (void) const { return rep->is_sparse (); } + + int is_struct (void) const { return rep->is_struct (); } + + int is_uint16 (void) const { return rep->is_uint16 (); } + + int is_uint32 (void) const { return rep->is_uint32 (); } + + int is_uint64 (void) const { return rep->is_uint64 (); } + + int is_uint8 (void) const { return rep->is_uint8 (); } + + int is_logical_scalar (void) const { return rep->is_logical_scalar (); } + + int is_logical_scalar_true (void) const + { return rep->is_logical_scalar_true (); } + + mwSize get_m (void) const { return rep->get_m (); } + + mwSize get_n (void) const { return rep->get_n (); } + + mwSize * get_dimensions (void) const { return rep->get_dimensions (); } + + mwSize get_number_of_dimensions (void) const + { return rep->get_number_of_dimensions (); } + + void set_m (mwSize m) { DO_VOID_MUTABLE_METHOD (set_m (m)); } + + void set_n (mwSize n) { DO_VOID_MUTABLE_METHOD (set_n (n)); } + + int set_dimensions (mwSize *dims_arg, mwSize ndims_arg) + { DO_MUTABLE_METHOD (int, set_dimensions (dims_arg, ndims_arg)); } + + mwSize get_number_of_elements (void) const + { return rep->get_number_of_elements (); } + + int isempty (void) const { return get_number_of_elements () == 0; } + + bool is_scalar (void) const { return rep->is_scalar (); } + + const char * get_name (void) const { return name; } + + void set_name (const char *name_arg); + + mxClassID get_class_id (void) const { return rep->get_class_id (); } + + const char * get_class_name (void) const { return rep->get_class_name (); } + + mxArray * get_property (mwIndex idx, const char *pname) const + { return rep->get_property (idx, pname); } + + void set_property (mwIndex idx, const char *pname, const mxArray *pval) + { rep->set_property (idx, pname, pval); } + + void set_class_name (const char *name_arg) + { DO_VOID_MUTABLE_METHOD (set_class_name (name_arg)); } + + mxArray * get_cell (mwIndex idx) const + { DO_MUTABLE_METHOD (mxArray *, get_cell (idx)); } + + void set_cell (mwIndex idx, mxArray *val) + { DO_VOID_MUTABLE_METHOD (set_cell (idx, val)); } + + double get_scalar (void) const { return rep->get_scalar (); } + + void * get_data (void) const { DO_MUTABLE_METHOD (void *, get_data ()); } + + mxDouble * get_doubles (void) const + { DO_MUTABLE_METHOD (mxDouble *, get_doubles ()); } + + mxSingle * get_singles (void) const + { DO_MUTABLE_METHOD (mxSingle *, get_singles ()); } + + mxInt8 * get_int8s (void) const + { DO_MUTABLE_METHOD (mxInt8 *, get_int8s ()); } + + mxInt16 * get_int16s (void) const + { DO_MUTABLE_METHOD (mxInt16 *, get_int16s ()); } + + mxInt32 * get_int32s (void) const + { DO_MUTABLE_METHOD (mxInt32 *, get_int32s ()); } + + mxInt64 * get_int64s (void) const + { DO_MUTABLE_METHOD (mxInt64 *, get_int64s ()); } + + mxUint8 * get_uint8s (void) const + { DO_MUTABLE_METHOD (mxUint8 *, get_uint8s ()); } + + mxUint16 * get_uint16s (void) const + { DO_MUTABLE_METHOD (mxUint16 *, get_uint16s ()); } + + mxUint32 * get_uint32s (void) const + { DO_MUTABLE_METHOD (mxUint32 *, get_uint32s ()); } + + mxUint64 * get_uint64s (void) const + { DO_MUTABLE_METHOD (mxUint64 *, get_uint64s ()); } + + mxComplexDouble * get_complex_doubles (void) const + { DO_MUTABLE_METHOD (mxComplexDouble *, get_complex_doubles ()); } + + mxComplexSingle * get_complex_singles (void) const + { DO_MUTABLE_METHOD (mxComplexSingle *, get_complex_singles ()); } + +#if 0 + /* We don't have these yet. */ + mxComplexInt8 * get_complex_int8s (void) const + { DO_MUTABLE_METHOD (mxComplexInt8 *, get_complex_int8s ()); } + + mxComplexInt16 * get_complex_int16s (void) const + { DO_MUTABLE_METHOD (mxComplexInt16 *, get_complex_int16s ()); } + + mxComplexInt32 * get_complex_int32s (void) const + { DO_MUTABLE_METHOD (mxComplexInt32 *, get_complex_int32s ()); } + + mxComplexInt64 * get_complex_int64s (void) const + { DO_MUTABLE_METHOD (mxComplexInt64 *, get_complex_int64s ()); } + + mxComplexUint8 * get_complex_uint8s (void) const + { DO_MUTABLE_METHOD (mxComplexUint8 *, get_complex_uint8s ()); } + + mxComplexUint16 * get_complex_uint16s (void) const + { DO_MUTABLE_METHOD (mxComplexUint16 *, get_complex_uint16s ()); } + + mxComplexUint32 * get_complex_uint32s (void) const + { DO_MUTABLE_METHOD (mxComplexUint32 *, get_complex_uint32s ()); } + + mxComplexUint64 * get_complex_uint64s (void) const + { DO_MUTABLE_METHOD (mxComplexUint64 *, get_complex_uint64s ()); } +#endif + + void * get_imag_data (void) const + { DO_MUTABLE_METHOD (void *, get_imag_data ()); } + + void set_data (void *pr) { DO_VOID_MUTABLE_METHOD (set_data (pr)); } + + int set_doubles (mxDouble *data) + { DO_MUTABLE_METHOD (int, set_doubles (data)); } + + int set_singles (mxSingle *data) + { DO_MUTABLE_METHOD (int, set_singles (data)); } + + int set_int8s (mxInt8 *data) + { DO_MUTABLE_METHOD (int, set_int8s (data)); } + + int set_int16s (mxInt16 *data) + { DO_MUTABLE_METHOD (int, set_int16s (data)); } + + int set_int32s (mxInt32 *data) + { DO_MUTABLE_METHOD (int, set_int32s (data)); } + + int set_int64s (mxInt64 *data) + { DO_MUTABLE_METHOD (int, set_int64s (data)); } + + int set_uint8s (mxUint8 *data) + { DO_MUTABLE_METHOD (int, set_uint8s (data)); } + + int set_uint16s (mxUint16 *data) + { DO_MUTABLE_METHOD (int, set_uint16s (data)); } + + int set_uint32s (mxUint32 *data) + { DO_MUTABLE_METHOD (int, set_uint32s (data)); } + + int set_uint64s (mxUint64 *data) + { DO_MUTABLE_METHOD (int, set_uint64s (data)); } + + int set_complex_doubles (mxComplexDouble *data) + { DO_MUTABLE_METHOD (int, set_complex_doubles (data)); } + + int set_complex_singles (mxComplexSingle *data) + { DO_MUTABLE_METHOD (int, set_complex_singles (data)); } + +#if 0 + /* We don't have these yet. */ + int set_complex_int8s (mxComplexInt8 *data) + { DO_MUTABLE_METHOD (int, set_complex_int8s (data)); } + + int set_complex_int16s (mxComplexInt16 *data) + { DO_MUTABLE_METHOD (int, set_complex_int16s (data)); } + + int set_complex_int32s (mxComplexInt32 *data) + { DO_MUTABLE_METHOD (int, set_complex_int32s (data)); } + + int set_complex_int64s (mxComplexInt64 *data) + { DO_MUTABLE_METHOD (int, set_complex_int64s (data)); } + + int set_complex_uint8s (mxComplexUint8 *data) + { DO_MUTABLE_METHOD (int, set_complex_uint8s (data)); } + + int set_complex_uint16s (mxComplexUint16 *data) + { DO_MUTABLE_METHOD (int, set_complex_uint16s (data)); } + + int set_complex_uint32s (mxComplexUint32 *data) + { DO_MUTABLE_METHOD (int, set_complex_uint32s (data)); } + + int set_complex_uint64s (mxComplexUint64 *data) + { DO_MUTABLE_METHOD (int, set_complex_uint64s (data)); } +#endif + + void set_imag_data (void *pi) { DO_VOID_MUTABLE_METHOD (set_imag_data (pi)); } + + mwIndex * get_ir (void) const { DO_MUTABLE_METHOD (mwIndex *, get_ir ()); } + + mwIndex * get_jc (void) const { DO_MUTABLE_METHOD (mwIndex *, get_jc ()); } + + mwSize get_nzmax (void) const { return rep->get_nzmax (); } + + void set_ir (mwIndex *ir) { DO_VOID_MUTABLE_METHOD (set_ir (ir)); } + + void set_jc (mwIndex *jc) { DO_VOID_MUTABLE_METHOD (set_jc (jc)); } + + void set_nzmax (mwSize nzmax) { DO_VOID_MUTABLE_METHOD (set_nzmax (nzmax)); } + + int add_field (const char *key) { DO_MUTABLE_METHOD (int, add_field (key)); } + + void remove_field (int key_num) + { DO_VOID_MUTABLE_METHOD (remove_field (key_num)); } + + mxArray * get_field_by_number (mwIndex index, int key_num) const + { DO_MUTABLE_METHOD (mxArray *, get_field_by_number (index, key_num)); } + + void set_field_by_number (mwIndex index, int key_num, mxArray *val) + { DO_VOID_MUTABLE_METHOD (set_field_by_number (index, key_num, val)); } + + int get_number_of_fields (void) const { return rep->get_number_of_fields (); } + + const char * get_field_name_by_number (int key_num) const + { DO_MUTABLE_METHOD (const char*, get_field_name_by_number (key_num)); } + + int get_field_number (const char *key) const + { DO_MUTABLE_METHOD (int, get_field_number (key)); } + + int get_string (char *buf, mwSize buflen) const + { return rep->get_string (buf, buflen); } + + char * array_to_string (void) const { return rep->array_to_string (); } + + mwIndex calc_single_subscript (mwSize nsubs, mwIndex *subs) const + { return rep->calc_single_subscript (nsubs, subs); } + + size_t get_element_size (void) const { return rep->get_element_size (); } + + bool mutation_needed (void) const { return rep->mutation_needed (); } + + mxArray * mutate (void) const { return rep->mutate (); } + + static void * malloc (size_t n); + + static void * calloc (size_t n, size_t t); + + static char * strsave (const char *str) + { + char *retval = nullptr; + + if (str) + { + mwSize sz = sizeof (mxChar) * (strlen (str) + 1); + + retval = static_cast<char *> (mxArray::malloc (sz)); + + if (retval) + strcpy (retval, str); + } + + return retval; + } + + static octave_value + as_octave_value (const mxArray *ptr, bool null_is_empty = true); + + octave_value as_octave_value (void) const; + +private: + + mutable mxArray_base *rep; + + char *name; + + mxArray (mxArray_base *r, const char *n) + : rep (r), name (mxArray::strsave (n)) { } + + static mxArray_base * + create_rep (bool interleaved, const octave_value& ov); + + static mxArray_base * + create_rep (bool interleaved, mxClassID id, mwSize ndims, + const mwSize *dims, mxComplexity flag, bool init); + + static mxArray_base * + create_rep (bool interleaved, mxClassID id, const dim_vector& dv, + mxComplexity flag); + + static mxArray_base * + create_rep (bool interleaved, mxClassID id, mwSize m, mwSize n, + mxComplexity flag, bool init); + + static mxArray_base * + create_rep (bool interleaved, mxClassID id, double val); + + static mxArray_base * + create_rep (bool interleaved, mxClassID id, mxLogical val); + + static mxArray_base * + create_rep (bool interleaved, const char *str); + + static mxArray_base * + create_rep (bool interleaved, mwSize m, const char **str); + + static mxArray_base * + create_rep (bool interleaved, mxClassID id, mwSize m, mwSize n, + mwSize nzmax, mxComplexity flag); + + void maybe_mutate (void) const; +}; + +#undef DO_MUTABLE_METHOD +#undef DO_VOID_MUTABLE_METHOD + +#endif +#endif
--- a/libinterp/corefcn/mxarray.in.h Wed May 06 10:05:36 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,570 +0,0 @@ -// %NO_EDIT_WARNING% - -//////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2001-2020 The Octave Project Developers -// -// See the file COPYRIGHT.md in the top-level directory of this -// distribution or <https://octave.org/copyright/>. -// -// 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/>. -// -//////////////////////////////////////////////////////////////////////// - -/* - -Part of this code was originally distributed as part of Octave Forge under -the following terms: - -Author: Paul Kienzle -I grant this code to the public domain. -2001-03-22 - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR OR 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. - -*/ - -#if ! defined (octave_mxarray_h) -#define octave_mxarray_h 1 - -#include "octave-config.h" - -typedef enum -{ - mxUNKNOWN_CLASS = 0, - mxCELL_CLASS, - mxSTRUCT_CLASS, - mxLOGICAL_CLASS, - mxCHAR_CLASS, - mxVOID_CLASS, - mxDOUBLE_CLASS, - mxSINGLE_CLASS, - mxINT8_CLASS, - mxUINT8_CLASS, - mxINT16_CLASS, - mxUINT16_CLASS, - mxINT32_CLASS, - mxUINT32_CLASS, - mxINT64_CLASS, - mxUINT64_CLASS, - mxFUNCTION_CLASS -} -mxClassID; - -typedef enum -{ - mxREAL = 0, - mxCOMPLEX = 1 -} -mxComplexity; - -/* Matlab uses a wide char (uint16) internally, but Octave uses plain char. */ -/* typedef Uint16 mxChar; */ -typedef char mxChar; - -typedef unsigned char mxLogical; - -/* - * FIXME: Mathworks says mwSize, mwIndex should be int generally. - * But on 64-bit systems, or when mex -largeArrayDims is used, it is size_t. - * mwSignedIndex is supposed to be ptrdiff_t. All of this is confusing. - * Its better to conform to the same indexing as the rest of Octave. - */ -typedef %OCTAVE_IDX_TYPE% mwSize; -typedef %OCTAVE_IDX_TYPE% mwIndex; -typedef %OCTAVE_IDX_TYPE% mwSignedIndex; - -#if ! defined (MXARRAY_TYPEDEFS_ONLY) - -#include <cstring> -#include "error.h" - -class octave_value; -class dim_vector; - -#define DO_MUTABLE_METHOD(RET_T, METHOD_CALL) \ - RET_T retval = rep->METHOD_CALL; \ - \ - if (rep->mutation_needed ()) \ - { \ - maybe_mutate (); \ - retval = rep->METHOD_CALL; \ - } \ - \ - return retval - -#define DO_VOID_MUTABLE_METHOD(METHOD_CALL) \ - rep->METHOD_CALL; \ - \ - if (rep->mutation_needed ()) \ - { \ - maybe_mutate (); \ - rep->METHOD_CALL; \ - } - -class mxArray; - -// A class to provide the default implementation of some of the -// virtual functions declared in the mxArray class. - -class mxArray_base -{ -protected: - - mxArray_base (void) { } - -public: - - virtual mxArray_base * dup (void) const = 0; - - virtual mxArray * as_mxArray (void) const { return nullptr; } - - virtual ~mxArray_base (void) = default; - - virtual bool is_octave_value (void) const { return false; } - - virtual int iscell (void) const = 0; - - virtual int is_char (void) const = 0; - - virtual int is_class (const char *name_arg) const - { - int retval = 0; - - const char *cname = get_class_name (); - - if (cname && name_arg) - retval = ! strcmp (cname, name_arg); - - return retval; - } - - virtual int is_complex (void) const = 0; - - virtual int is_double (void) const = 0; - - virtual int is_function_handle (void) const = 0; - - virtual int is_int16 (void) const = 0; - - virtual int is_int32 (void) const = 0; - - virtual int is_int64 (void) const = 0; - - virtual int is_int8 (void) const = 0; - - virtual int is_logical (void) const = 0; - - virtual int is_numeric (void) const = 0; - - virtual int is_single (void) const = 0; - - virtual int is_sparse (void) const = 0; - - virtual int is_struct (void) const = 0; - - virtual int is_uint16 (void) const = 0; - - virtual int is_uint32 (void) const = 0; - - virtual int is_uint64 (void) const = 0; - - virtual int is_uint8 (void) const = 0; - - virtual int is_logical_scalar (void) const - { - return is_logical () && get_number_of_elements () == 1; - } - - virtual int is_logical_scalar_true (void) const = 0; - - virtual mwSize get_m (void) const = 0; - - virtual mwSize get_n (void) const = 0; - - virtual mwSize * get_dimensions (void) const = 0; - - virtual mwSize get_number_of_dimensions (void) const = 0; - - virtual void set_m (mwSize m) = 0; - - virtual void set_n (mwSize n) = 0; - - virtual int set_dimensions (mwSize *dims_arg, mwSize ndims_arg) = 0; - - virtual mwSize get_number_of_elements (void) const = 0; - - virtual int isempty (void) const = 0; - - virtual bool is_scalar (void) const = 0; - - virtual mxClassID get_class_id (void) const = 0; - - virtual const char * get_class_name (void) const = 0; - - virtual void set_class_name (const char *name_arg) = 0; - - // The following functions aren't pure virtual because they are only - // valid for one type. Making them pure virtual would mean that they - // have to be implemented for all derived types, and all of those - // would need to throw errors instead of just doing it once here. - - virtual mxArray * - get_property (mwIndex /*idx*/, const char * /*pname*/) const - { - return nullptr; - } - - virtual void set_property (mwIndex /*idx*/, const char * /*pname*/, - const mxArray * /*pval*/) - { - err_invalid_type (); - } - - virtual mxArray * get_cell (mwIndex /*idx*/) const - { - err_invalid_type (); - } - - virtual void set_cell (mwIndex idx, mxArray *val) = 0; - - virtual double get_scalar (void) const = 0; - - virtual void * get_data (void) const = 0; - - virtual void * get_imag_data (void) const = 0; - - virtual void set_data (void *pr) = 0; - - virtual void set_imag_data (void *pi) = 0; - - virtual mwIndex * get_ir (void) const = 0; - - virtual mwIndex * get_jc (void) const = 0; - - virtual mwSize get_nzmax (void) const = 0; - - virtual void set_ir (mwIndex *ir) = 0; - - virtual void set_jc (mwIndex *jc) = 0; - - virtual void set_nzmax (mwSize nzmax) = 0; - - virtual int add_field (const char *key) = 0; - - virtual void remove_field (int key_num) = 0; - - virtual mxArray * get_field_by_number (mwIndex index, int key_num) const = 0; - - virtual void - set_field_by_number (mwIndex index, int key_num, mxArray *val) = 0; - - virtual int get_number_of_fields (void) const = 0; - - virtual const char * get_field_name_by_number (int key_num) const = 0; - - virtual int get_field_number (const char *key) const = 0; - - virtual int get_string (char *buf, mwSize buflen) const = 0; - - virtual char * array_to_string (void) const = 0; - - virtual mwIndex calc_single_subscript (mwSize nsubs, mwIndex *subs) const = 0; - - virtual size_t get_element_size (void) const = 0; - - virtual bool mutation_needed (void) const { return false; } - - virtual mxArray * mutate (void) const { return nullptr; } - - virtual octave_value as_octave_value (void) const = 0; - -protected: - - mxArray_base (const mxArray_base&) { } - - OCTAVE_NORETURN void err_invalid_type (void) const - { - error ("invalid type for operation"); - } -}; - -// The main interface class. The representation can be based on an -// octave_value object or a separate object that tries to reproduce -// the semantics of mxArray objects in Matlab more directly. - -class mxArray -{ -public: - - mxArray (const octave_value& ov); - - mxArray (mxClassID id, mwSize ndims, const mwSize *dims, - mxComplexity flag = mxREAL, bool init = true); - - mxArray (mxClassID id, const dim_vector& dv, mxComplexity flag = mxREAL); - - mxArray (mxClassID id, mwSize m, mwSize n, - mxComplexity flag = mxREAL, bool init = true); - - mxArray (mxClassID id, double val); - - mxArray (mxClassID id, mxLogical val); - - mxArray (const char *str); - - mxArray (mwSize m, const char **str); - - mxArray (mxClassID id, mwSize m, mwSize n, mwSize nzmax, - mxComplexity flag = mxREAL); - - mxArray (mwSize ndims, const mwSize *dims, int num_keys, const char **keys); - - mxArray (const dim_vector& dv, int num_keys, const char **keys); - - mxArray (mwSize m, mwSize n, int num_keys, const char **keys); - - mxArray (mwSize ndims, const mwSize *dims); - - mxArray (const dim_vector& dv); - - mxArray (mwSize m, mwSize n); - - mxArray * dup (void) const - { - mxArray *retval = rep->as_mxArray (); - - if (retval) - retval->set_name (name); - else - { - mxArray_base *new_rep = rep->dup (); - - retval = new mxArray (new_rep, name); - } - - return retval; - } - - // No copying! - - mxArray (const mxArray&) = delete; - - mxArray& operator = (const mxArray&) = delete; - - ~mxArray (void); - - bool is_octave_value (void) const { return rep->is_octave_value (); } - - int iscell (void) const { return rep->iscell (); } - - int is_char (void) const { return rep->is_char (); } - - int is_class (const char *name_arg) const { return rep->is_class (name_arg); } - - int is_complex (void) const { return rep->is_complex (); } - - int is_double (void) const { return rep->is_double (); } - - int is_function_handle (void) const { return rep->is_function_handle (); } - - int is_int16 (void) const { return rep->is_int16 (); } - - int is_int32 (void) const { return rep->is_int32 (); } - - int is_int64 (void) const { return rep->is_int64 (); } - - int is_int8 (void) const { return rep->is_int8 (); } - - int is_logical (void) const { return rep->is_logical (); } - - int is_numeric (void) const { return rep->is_numeric (); } - - int is_single (void) const { return rep->is_single (); } - - int is_sparse (void) const { return rep->is_sparse (); } - - int is_struct (void) const { return rep->is_struct (); } - - int is_uint16 (void) const { return rep->is_uint16 (); } - - int is_uint32 (void) const { return rep->is_uint32 (); } - - int is_uint64 (void) const { return rep->is_uint64 (); } - - int is_uint8 (void) const { return rep->is_uint8 (); } - - int is_logical_scalar (void) const { return rep->is_logical_scalar (); } - - int is_logical_scalar_true (void) const - { return rep->is_logical_scalar_true (); } - - mwSize get_m (void) const { return rep->get_m (); } - - mwSize get_n (void) const { return rep->get_n (); } - - mwSize * get_dimensions (void) const { return rep->get_dimensions (); } - - mwSize get_number_of_dimensions (void) const - { return rep->get_number_of_dimensions (); } - - void set_m (mwSize m) { DO_VOID_MUTABLE_METHOD (set_m (m)); } - - void set_n (mwSize n) { DO_VOID_MUTABLE_METHOD (set_n (n)); } - - int set_dimensions (mwSize *dims_arg, mwSize ndims_arg) - { DO_MUTABLE_METHOD (int, set_dimensions (dims_arg, ndims_arg)); } - - mwSize get_number_of_elements (void) const - { return rep->get_number_of_elements (); } - - int isempty (void) const { return get_number_of_elements () == 0; } - - bool is_scalar (void) const { return rep->is_scalar (); } - - const char * get_name (void) const { return name; } - - void set_name (const char *name_arg); - - mxClassID get_class_id (void) const { return rep->get_class_id (); } - - const char * get_class_name (void) const { return rep->get_class_name (); } - - mxArray * get_property (mwIndex idx, const char *pname) const - { return rep->get_property (idx, pname); } - - void set_property (mwIndex idx, const char *pname, const mxArray *pval) - { rep->set_property (idx, pname, pval); } - - void set_class_name (const char *name_arg) - { DO_VOID_MUTABLE_METHOD (set_class_name (name_arg)); } - - mxArray * get_cell (mwIndex idx) const - { DO_MUTABLE_METHOD (mxArray *, get_cell (idx)); } - - void set_cell (mwIndex idx, mxArray *val) - { DO_VOID_MUTABLE_METHOD (set_cell (idx, val)); } - - double get_scalar (void) const { return rep->get_scalar (); } - - void * get_data (void) const { DO_MUTABLE_METHOD (void *, get_data ()); } - - void * get_imag_data (void) const - { DO_MUTABLE_METHOD (void *, get_imag_data ()); } - - void set_data (void *pr) { DO_VOID_MUTABLE_METHOD (set_data (pr)); } - - void set_imag_data (void *pi) { DO_VOID_MUTABLE_METHOD (set_imag_data (pi)); } - - mwIndex * get_ir (void) const { DO_MUTABLE_METHOD (mwIndex *, get_ir ()); } - - mwIndex * get_jc (void) const { DO_MUTABLE_METHOD (mwIndex *, get_jc ()); } - - mwSize get_nzmax (void) const { return rep->get_nzmax (); } - - void set_ir (mwIndex *ir) { DO_VOID_MUTABLE_METHOD (set_ir (ir)); } - - void set_jc (mwIndex *jc) { DO_VOID_MUTABLE_METHOD (set_jc (jc)); } - - void set_nzmax (mwSize nzmax) { DO_VOID_MUTABLE_METHOD (set_nzmax (nzmax)); } - - int add_field (const char *key) { DO_MUTABLE_METHOD (int, add_field (key)); } - - void remove_field (int key_num) - { DO_VOID_MUTABLE_METHOD (remove_field (key_num)); } - - mxArray * get_field_by_number (mwIndex index, int key_num) const - { DO_MUTABLE_METHOD (mxArray *, get_field_by_number (index, key_num)); } - - void set_field_by_number (mwIndex index, int key_num, mxArray *val) - { DO_VOID_MUTABLE_METHOD (set_field_by_number (index, key_num, val)); } - - int get_number_of_fields (void) const { return rep->get_number_of_fields (); } - - const char * get_field_name_by_number (int key_num) const - { DO_MUTABLE_METHOD (const char*, get_field_name_by_number (key_num)); } - - int get_field_number (const char *key) const - { DO_MUTABLE_METHOD (int, get_field_number (key)); } - - int get_string (char *buf, mwSize buflen) const - { return rep->get_string (buf, buflen); } - - char * array_to_string (void) const { return rep->array_to_string (); } - - mwIndex calc_single_subscript (mwSize nsubs, mwIndex *subs) const - { return rep->calc_single_subscript (nsubs, subs); } - - size_t get_element_size (void) const { return rep->get_element_size (); } - - bool mutation_needed (void) const { return rep->mutation_needed (); } - - mxArray * mutate (void) const { return rep->mutate (); } - - static void * malloc (size_t n); - - static void * calloc (size_t n, size_t t); - - static char * strsave (const char *str) - { - char *retval = nullptr; - - if (str) - { - mwSize sz = sizeof (mxChar) * (strlen (str) + 1); - - retval = static_cast<char *> (mxArray::malloc (sz)); - - if (retval) - strcpy (retval, str); - } - - return retval; - } - - static octave_value - as_octave_value (const mxArray *ptr, bool null_is_empty = true); - - octave_value as_octave_value (void) const; - -private: - - mutable mxArray_base *rep; - - char *name; - - mxArray (mxArray_base *r, const char *n) - : rep (r), name (mxArray::strsave (n)) { } - - void maybe_mutate (void) const; -}; - -#undef DO_MUTABLE_METHOD -#undef DO_VOID_MUTABLE_METHOD - -#endif -#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libinterp/corefcn/mxtypes.in.h Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,128 @@ +// %NO_EDIT_WARNING% + +//////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2001-2020 The Octave Project Developers +// +// See the file COPYRIGHT.md in the top-level directory of this +// distribution or <https://octave.org/copyright/>. +// +// 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/>. +// +//////////////////////////////////////////////////////////////////////// + +/* + +Part of this code was originally distributed as part of Octave Forge under +the following terms: + +Author: Paul Kienzle +I grant this code to the public domain. +2001-03-22 + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR OR 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. + +*/ + +#if ! defined (octave_mxtypes_h) +#define octave_mxtypes_h 1 + +#include "octave-config.h" + +typedef enum +{ + mxUNKNOWN_CLASS = 0, + mxCELL_CLASS, + mxSTRUCT_CLASS, + mxLOGICAL_CLASS, + mxCHAR_CLASS, + mxVOID_CLASS, + mxDOUBLE_CLASS, + mxSINGLE_CLASS, + mxINT8_CLASS, + mxUINT8_CLASS, + mxINT16_CLASS, + mxUINT16_CLASS, + mxINT32_CLASS, + mxUINT32_CLASS, + mxINT64_CLASS, + mxUINT64_CLASS, + mxFUNCTION_CLASS +} +mxClassID; + +typedef enum +{ + mxREAL = 0, + mxCOMPLEX = 1 +} +mxComplexity; + +/* Matlab uses a wide char (uint16) internally, but Octave uses plain char. */ +/* typedef Uint16 mxChar; */ +typedef char mxChar; + +typedef unsigned char mxLogical; + +typedef double mxDouble; +typedef float mxSingle; + +typedef int8_t mxInt8; +typedef int16_t mxInt16; +typedef int32_t mxInt32; +typedef int64_t mxInt64; + +typedef uint8_t mxUint8; +typedef uint16_t mxUint16; +typedef uint32_t mxUint32; +typedef uint64_t mxUint64; + +typedef struct { mxDouble real; mxDouble imag; } mxComplexDouble; +typedef struct { mxSingle real; mxSingle imag; } mxComplexSingle; + +/* We don't have these yet but we can define the types. */ +typedef struct { mxInt8 real; mxInt8 imag; } mxComplexInt8; +typedef struct { mxInt16 real; mxInt16 imag; } mxComplexInt16; +typedef struct { mxInt32 real; mxInt32 imag; } mxComplexInt32; +typedef struct { mxInt64 real; mxInt64 imag; } mxComplexInt64; + +typedef struct { mxUint8 real; mxUint8 imag; } mxComplexUint8; +typedef struct { mxUint16 real; mxUint16 imag; } mxComplexUint16; +typedef struct { mxUint32 real; mxUint32 imag; } mxComplexUint32; +typedef struct { mxUint64 real; mxUint64 imag; } mxComplexUint64; + +/* + * FIXME: Mathworks says mwSize, mwIndex should be int generally. + * But on 64-bit systems, or when mex -largeArrayDims is used, it is size_t. + * mwSignedIndex is supposed to be ptrdiff_t. All of this is confusing. + * Its better to conform to the same indexing as the rest of Octave. + */ +typedef %OCTAVE_IDX_TYPE% mwSize; +typedef %OCTAVE_IDX_TYPE% mwIndex; +typedef %OCTAVE_IDX_TYPE% mwSignedIndex; + +#endif
--- a/libinterp/corefcn/oct-stream.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/oct-stream.cc Fri May 22 11:06:58 2020 +0200 @@ -1914,7 +1914,7 @@ bool match_literal (delimited_stream& isp, const textscan_format_elt& elem); - int skip_whitespace (delimited_stream& is, bool EOLstop = false); + int skip_whitespace (delimited_stream& is, bool EOLstop = true); int skip_delim (delimited_stream& is); @@ -2472,7 +2472,7 @@ while (! ds.eof ()) { bool already_skipped_delim = false; - ts.skip_whitespace (ds); + ts.skip_whitespace (ds, false); ds.progress_benchmark (); ts.scan_complex (ds, *fmt_elts[0], val); if (ds.fail ()) @@ -3500,11 +3500,12 @@ elem = fmt_list.next (); char *pos = is.tellg (); - // FIXME: these conversions "ignore delimiters". Should they include - // delimiters at the start of the conversion, or can those be skipped? - if (elem->type != textscan_format_elt::literal_conversion - // && elem->type != '[' && elem->type != '^' && elem->type != 'c' - ) + // Skip delimiter before reading the next fmt conversion, + // unless the fmt is a string literal which begins with a delimiter, + // in which case the literal must match everything. Bug #58008 + if (elem->type != textscan_format_elt::literal_conversion) + skip_delim (is); + else if (! is_delim (elem->text[0])) skip_delim (is); if (is.eof ()) @@ -3892,8 +3893,8 @@ int textscan::skip_delim (delimited_stream& is) { - int c1 = skip_whitespace (is, true); // 'true': stop once EOL is read - if (delim_list.numel () == 0) // single character delimiter + int c1 = skip_whitespace (is); // Stop once EOL is read + if (delim_list.numel () == 0) // single character delimiter { if (is_delim (c1) || c1 == eol1 || c1 == eol2) { @@ -3943,7 +3944,7 @@ int prev = -1; // skip multiple delims. // Increment lines for each end-of-line seen; for \r\n, decrement - while (is && ((c1 = skip_whitespace (is, true)) + while (is && ((c1 = skip_whitespace (is)) != std::istream::traits_type::eof ()) && (((c1 == eol1 || c1 == eol2) && ++lines) || -1 != lookahead (is, delim_list, delim_len)))
--- a/libinterp/corefcn/syscalls.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/syscalls.cc Fri May 22 11:06:58 2020 +0200 @@ -377,9 +377,10 @@ */ -DEFMETHODX ("fcntl", Ffcntl, interp, args, , +DEFMETHODX ("fcntl", Ffcntl, interp, args, nargout, doc: /* -*- texinfo -*- -@deftypefn {} {[@var{err}, @var{msg}] =} fcntl (@var{fid}, @var{request}, @var{arg}) +@deftypefn {} {} fcntl (@var{fid}, @var{request}, @var{arg}) +@deftypefnx {} {[@var{status}, @var{msg}] =} fcntl (@var{fid}, @var{request}, @var{arg}) Change the properties of the open file @var{fid}. The following values may be passed as @var{request}: @@ -430,8 +431,8 @@ @w{@code{O_NONBLOCK}}. @end vtable -If successful, @var{err} is 0 and @var{msg} is an empty string. Otherwise, -@var{err} is nonzero and @var{msg} contains a system-dependent error +If successful, @var{status} is 0 and @var{msg} is an empty string. Otherwise, +@var{status} is -1 and @var{msg} contains a system-dependent error message. @seealso{fopen, dup2} @end deftypefn */) @@ -454,11 +455,25 @@ if (fid < 0) error ("fcntl: invalid file id"); + octave_value_list retval; std::string msg; int status = octave::sys::fcntl (fid, req, arg, msg); - return ovl (status, msg); + if (nargout == 0) + { + if (status < 0) + error ("fcntl: operation failed: %s", msg.c_str ()); + } + else + { + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); + } + + return retval; } DEFMETHODX ("fork", Ffork, interp, args, , @@ -591,26 +606,29 @@ return ovl (octave::sys::getuid ()); } -DEFUNX ("kill", Fkill, args, , +DEFUNX ("kill", Fkill, args, nargout, doc: /* -*- texinfo -*- -@deftypefn {} {[@var{err}, @var{msg}] =} kill (@var{pid}, @var{sig}) +@deftypefn {} {} kill (@var{pid}, @var{sig}) +@deftypefnx {} {[@var{status}, @var{msg}] =} kill (@var{pid}, @var{sig}) Send signal @var{sig} to process @var{pid}. If @var{pid} is positive, then signal @var{sig} is sent to @var{pid}. -If @var{pid} is 0, then signal @var{sig} is sent to every process -in the process group of the current process. +If @var{pid} is 0, then signal @var{sig} is sent to every process in the +process group of the current process. -If @var{pid} is -1, then signal @var{sig} is sent to every process -except process 1. +If @var{pid} is -1, then signal @var{sig} is sent to every process except +process 1. -If @var{pid} is less than -1, then signal @var{sig} is sent to every -process in the process group @var{-pid}. +If @var{pid} is less than -1, then signal @var{sig} is sent to every process in +the process group @var{-pid}. If @var{sig} is 0, then no signal is sent, but error checking is still performed. -Return 0 if successful, otherwise return -1. +If successful, @var{status} is 0 and @var{msg} is an empty string. +Otherwise, @var{status} is -1 and @var{msg} contains a system-dependent +error message. @end deftypefn */) { if (args.length () != 2) @@ -620,11 +638,25 @@ int sig = args(1).int_value (true); + octave_value_list retval; std::string msg; int status = octave::sys::kill (pid, sig, msg); - return ovl (status, msg); + if (nargout == 0) + { + if (status < 0) + error ("kill: operation failed: %s", msg.c_str ()); + } + else + { + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); + } + + return retval; } DEFUNX ("lstat", Flstat, args, , @@ -676,17 +708,17 @@ return retval; } -DEFUNX ("mkfifo", Fmkfifo, args, , +DEFUNX ("mkfifo", Fmkfifo, args, nargout, doc: /* -*- texinfo -*- -@deftypefn {} {@var{err} =} mkfifo (@var{name}, @var{mode}) -@deftypefnx {} {[@var{err}, @var{msg}] =} mkfifo (@var{name}, @var{mode}) +@deftypefn {} {} mkfifo (@var{name}, @var{mode}) +@deftypefnx {} {[@var{status}, @var{msg}] =} mkfifo (@var{name}, @var{mode}) Create a FIFO special file named @var{name} with file mode @var{mode}. @var{mode} is interpreted as an octal number and is subject to umask processing. The final calculated mode is @code{@var{mode} - @var{umask}}. -If successful, @var{err} is 0 and @var{msg} is an empty string. -Otherwise, @var{err} is nonzero and @var{msg} contains a system-dependent +If successful, @var{status} is 0 and @var{msg} is an empty string. +Otherwise, @var{status} is -1 and @var{msg} contains a system-dependent error message. @seealso{pipe, umask} @end deftypefn */) @@ -703,11 +735,25 @@ int mode = convert (octal_mode, 8, 10); + octave_value_list retval; std::string msg; int status = octave::sys::mkfifo (name, mode, msg); - return ovl (status, msg); + if (nargout == 0) + { + if (status < 0) + error ("mkfifo: operation failed: %s", msg.c_str ()); + } + else + { + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); + } + + return retval; } /* @@ -1073,13 +1119,14 @@ %! endif */ -DEFMETHODX ("unlink", Funlink, interp, args, , +DEFMETHODX ("unlink", Funlink, interp, args, nargout, doc: /* -*- texinfo -*- -@deftypefn {} {[@var{err}, @var{msg}] =} unlink (@var{file}) +@deftypefn {} {} unlink (@var{file}) +@deftypefnx {} {[@var{status}, @var{msg}] =} unlink (@var{file}) Delete the file named @var{file}. -If successful, @var{err} is 0 and @var{msg} is an empty string. -Otherwise, @var{err} is nonzero and @var{msg} contains a system-dependent +If successful, @var{status} is 0 and @var{msg} is an empty string. +Otherwise, @var{status} is -1 and @var{msg} contains a system-dependent error message. @seealso{delete, rmdir} @end deftypefn */) @@ -1089,6 +1136,7 @@ std::string name = args(0).xstring_value ("unlink: FILE must be a string"); + octave_value_list retval; std::string msg; octave::event_manager& evmgr = interp.get_event_manager (); @@ -1099,7 +1147,20 @@ evmgr.file_renamed (status == 0); - return ovl (status, msg); + if (nargout == 0) + { + if (status < 0) + error ("unlink: operation failed: %s", msg.c_str ()); + } + else + { + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); + } + + return retval; } /* @@ -1111,13 +1172,13 @@ %! endif %! fdisp (fid, pi); %! fclose (fid); -%! [err, msg] = unlink (file); -%! assert (err, 0); +%! [status, msg] = unlink (file); +%! assert (status, 0); %! assert (msg, ""); ## Test input validation -%!error unlink () -%!error unlink ("a", "b") +%!error <Invalid call> unlink () +%!error <Invalid call> unlink ("a", "b") %!error <FILE must be a string> unlink (123) */
--- a/libinterp/corefcn/sysdep.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/sysdep.h Fri May 22 11:06:58 2020 +0200 @@ -59,71 +59,4 @@ extern OCTINTERP_API bool drive_or_unc_share (const std::string&); } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::sysdep_init' instead") -inline void -sysdep_init (void) -{ - octave::sysdep_init (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::set_application_id' instead") -inline void -set_application_id (void) -{ - octave::set_application_id (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::sysdep_cleanup' instead") -inline void -sysdep_cleanup (void) -{ - octave::sysdep_cleanup (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::raw_mode' instead") -inline void -raw_mode (bool on, bool wait = true) -{ - octave::raw_mode (on, wait); -} - -OCTAVE_DEPRECATED (5, "use 'octave::popen' instead") -inline FILE * -octave_popen (const char *command, const char *mode) -{ - return octave::popen (command, mode); -} - -OCTAVE_DEPRECATED (5, "use 'octave::pclose' instead") -inline int -octave_pclose (FILE *f) -{ - return octave::pclose (f); -} - -OCTAVE_DEPRECATED (5, "use 'octave::kbhit' instead") -inline int -octave_kbhit (bool wait = true) -{ - return octave::kbhit (wait); -} - -OCTAVE_DEPRECATED (5, "use 'octave::get_P_tmpdir' instead") -inline std::string -get_P_tmpdir (void) -{ - return octave::get_P_tmpdir (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::same_file_internal' instead") -inline bool -same_file_internal (const std::string& a, const std::string& b) -{ - return octave::same_file_internal (a, b); -} - #endif - -#endif
--- a/libinterp/corefcn/text-engine.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/text-engine.h Fri May 22 11:06:58 2020 +0200 @@ -459,53 +459,4 @@ } } -#if defined (OCAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::text_element' instead") -typedef octave::text_element text_element; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_string' instead") -typedef octave::text_element_string text_element_string; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_symbol' instead") -typedef octave::text_element_symbol text_element_symbol; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_list' instead") -typedef octave::text_element_list text_element_list; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_subscript' instead") -typedef octave::text_element_subscript text_element_subscript; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_superscript' instead") -typedef octave::text_element_superscript text_element_superscript; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_combined' instead") -typedef octave::text_element_combined text_element_combined; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_fontstyle' instead") -typedef octave::text_element_fontstyle text_element_fontstyle; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_fontname' instead") -typedef octave::text_element_fontname text_element_fontname; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_fontsize' instead") -typedef octave::text_element_fontsize text_element_fontsize; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_color' instead") -typedef octave::text_element_color text_element_color; - -OCTAVE_DEPRECATED (5, "use 'octave::text_processor' instead") -typedef octave::text_processor text_processor; - -OCTAVE_DEPRECATED (5, "use 'octave::text_parser' instead") -typedef octave::text_parser text_parser; - -OCTAVE_DEPRECATED (5, "use 'octave::text_parser_none' instead") -typedef octave::text_parser_none text_parser_none; - -OCTAVE_DEPRECATED (5, "use 'octave::text_parser_tex' instead") -typedef octave::text_parser_tex text_parser_tex; - #endif - -#endif
--- a/libinterp/corefcn/tril.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/tril.cc Fri May 22 11:06:58 2020 +0200 @@ -209,8 +209,10 @@ dim_vector dims = arg.dims (); if (dims.ndims () != 2) error ("%s: need a 2-D matrix", name.c_str ()); - else if (k < -dims(0) || k > dims(1)) - error ("%s: requested diagonal out of range", name.c_str ()); + else if (k < -dims(0)) + k = -dims(0); + else if (k > dims(1)) + k = dims(1); octave_value retval; @@ -428,24 +430,51 @@ } /* -%!test +%!shared a, l2, l1, l0, lm1, lm2, lm3, lm4 %! a = [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12]; %! -%! l0 = [1, 0, 0; 4, 5, 0; 7, 8, 9; 10, 11, 12]; +%! l2 = [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12]; %! l1 = [1, 2, 0; 4, 5, 6; 7, 8, 9; 10, 11, 12]; -%! l2 = [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12]; +%! l0 = [1, 0, 0; 4, 5, 0; 7, 8, 9; 10, 11, 12]; %! lm1 = [0, 0, 0; 4, 0, 0; 7, 8, 0; 10, 11, 12]; %! lm2 = [0, 0, 0; 0, 0, 0; 7, 0, 0; 10, 11, 0]; %! lm3 = [0, 0, 0; 0, 0, 0; 0, 0, 0; 10, 0, 0]; %! lm4 = [0, 0, 0; 0, 0, 0; 0, 0, 0; 0, 0, 0]; %! -%! assert (tril (a, -4), lm4); -%! assert (tril (a, -3), lm3); -%! assert (tril (a, -2), lm2); -%! assert (tril (a, -1), lm1); -%! assert (tril (a), l0); -%! assert (tril (a, 1), l1); -%! assert (tril (a, 2), l2); +%!assert (tril (a, 3), l2); +%!assert (tril (a, 2), l2); +%!assert (tril (a, 1), l1); +%!assert (tril (a, 0), l0); +%!assert (tril (a), l0); +%!assert (tril (a, -1), lm1); +%!assert (tril (a, -2), lm2); +%!assert (tril (a, -3), lm3); +%!assert (tril (a, -4), lm4); +%!assert (tril (a, -5), lm4); + +%!shared a, u3, u2, u1, u0, um1, um2, um3 +%! +%! a = [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12]; +%! +%! u3 = [0, 0, 0; 0, 0, 0; 0, 0, 0; 0, 0, 0]; +%! u2 = [0, 0, 3; 0, 0, 0; 0, 0, 0; 0, 0, 0]; +%! u1 = [0, 2, 3; 0, 0, 6; 0, 0, 0; 0, 0, 0]; +%! u0 = [1, 2, 3; 0, 5, 6; 0, 0, 9; 0, 0, 0]; +%! um1 = [1, 2, 3; 4, 5, 6; 0, 8, 9; 0, 0, 12]; +%! um2 = [1, 2, 3; 4, 5, 6; 7, 8, 9; 0, 11, 12]; +%! um3 = [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12]; +%! +%!assert (triu (a, 4), u3); +%!assert (triu (a, 3), u3); +%!assert (triu (a, 2), u2); +%!assert (triu (a, 1), u1); +%!assert (triu (a, 0), u0); +%!assert (triu (a), u0); +%!assert (triu (a, -1), um1); +%!assert (triu (a, -2), um2); +%!assert (triu (a, -3), um3); +%!assert (triu (a, -4), um3); %!error tril () +%!error triu () */
--- a/libinterp/corefcn/txt-eng.h Wed May 06 10:05:36 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -//////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2018-2020 The Octave Project Developers -// -// See the file COPYRIGHT.md in the top-level directory of this -// distribution or <https://octave.org/copyright/>. -// -// This file is part of Octave. -// -// Octave is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Octave is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Octave; see the file COPYING. If not, see -// <https://www.gnu.org/licenses/>. -// -//////////////////////////////////////////////////////////////////////// - -#if ! defined (octave_txt_eng_h) -#define octave_txt_eng_h 1 - -#include "octave-config.h" - -// Deprecated in Octave 5. Remove in Octave 7 -#warning "txt-eng.h has been deprecated; use text-engine instead" - -#include "text-engine.h" - -#endif
--- a/libinterp/corefcn/utils.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/utils.cc Fri May 22 11:06:58 2020 +0200 @@ -1648,183 +1648,3 @@ %!error isstudent (1) */ - -// Always define these functions. The macro is intended to allow the -// declarations to be hidden, not so that Octave will not provide the -// functions if they are requested. - -// #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -#include "ov.h" -#include "ovl.h" -#include "str-vec.h" - -bool -valid_identifier (const char *s) -{ - return octave::valid_identifier (s); -} - -bool -valid_identifier (const std::string& s) -{ - return octave::valid_identifier (s); -} - -bool -same_file (const std::string& f, const std::string& g) -{ - return octave::same_file (f, g); -} - -int -almost_match (const std::string& std, const std::string& s, - int min_match_len, int case_sens) -{ - return octave::almost_match (std, s, min_match_len, case_sens); -} - -int -keyword_almost_match (const char * const *std, int *min_len, - const std::string& s, int min_toks_to_match, - int max_toks) -{ - return octave::keyword_almost_match (std, min_len, s, min_toks_to_match, - max_toks); -} - -std::string -search_path_for_file (const std::string& path, const string_vector& names) -{ - return octave::search_path_for_file (path, names); -} - -string_vector -search_path_for_all_files (const std::string& path, const string_vector& names) -{ - return octave::search_path_for_all_files (path, names); -} - -std::string -file_in_path (const std::string& name, const std::string& suffix) -{ - return octave::file_in_path (name, suffix); -} - -std::string -find_data_file_in_load_path (const std::string& fcn, const std::string& file, - bool require_regular_file) -{ - return octave::find_data_file_in_load_path (fcn, file, require_regular_file); -} - -std::string -contents_file_in_path (const std::string& s) -{ - return octave::contents_file_in_path (s); -} - -std::string -fcn_file_in_path (const std::string& s) -{ - return octave::fcn_file_in_path (s); -} - -std::string -do_string_escapes (const std::string& s) -{ - return octave::do_string_escapes (s); -} - -const char * -undo_string_escape (char c) -{ - return octave::undo_string_escape (c); -} - -std::string -undo_string_escapes (const std::string& s) -{ - return octave::undo_string_escapes (s); -} - -void -check_dimensions (dim_vector& dim, const char *warnfor) -{ - return octave::check_dimensions (dim, warnfor); -} - -void -get_dimensions (const octave_value& a, const char *warn_for, - dim_vector& dim) -{ - return octave::get_dimensions (a, warn_for, dim); -} - -void -get_dimensions (const octave_value& a, const octave_value& b, - const char *warn_for, octave_idx_type& nr, - octave_idx_type& nc) -{ - return octave::get_dimensions (a, b, warn_for, nr, nc); -} - -void -get_dimensions (const octave_value& a, const char *warn_for, - octave_idx_type& nr, octave_idx_type& nc) -{ - return octave::get_dimensions (a, warn_for, nr, nc); -} - -octave_idx_type -dims_to_numel (const dim_vector& dims, const octave_value_list& idx) -{ - return octave::dims_to_numel (dims, idx); -} - -Matrix -identity_matrix (octave_idx_type nr, octave_idx_type nc) -{ - return octave::identity_matrix (nr, nc); -} - -FloatMatrix -float_identity_matrix (octave_idx_type nr, octave_idx_type nc) -{ - return octave::float_identity_matrix (nr, nc); -} - -size_t -octave_vformat (std::ostream& os, const char *fmt, va_list args) -{ - return octave::vformat (os, fmt, args); -} - -std::string -octave_vasprintf (const char *fmt, va_list args) -{ - return octave::vasprintf (fmt, args); -} - -void -octave_sleep (double seconds) -{ - octave::sleep (seconds); -} - -octave_value_list -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args, - int nargout) -{ - return octave::do_simple_cellfun (fun, fun_name, args, nargout); -} - -octave_value -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args) -{ - return octave::do_simple_cellfun (fun, fun_name, args); -} - -// #endif
--- a/libinterp/corefcn/utils.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/utils.h Fri May 22 11:06:58 2020 +0200 @@ -141,139 +141,4 @@ const char *fun_name, const octave_value_list& args); } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::valid_identifier' instead") -extern OCTINTERP_API bool -valid_identifier (const char *s); - -OCTAVE_DEPRECATED (5, "use 'octave::valid_identifier' instead") -extern OCTINTERP_API bool -valid_identifier (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::same_file' instead") -extern OCTINTERP_API bool -same_file (const std::string& f, const std::string& g); - -OCTAVE_DEPRECATED (5, "use 'octave::almost_match' instead") -extern OCTINTERP_API int -almost_match (const std::string& std, const std::string& s, - int min_match_len = 1, int case_sens = 1); - -OCTAVE_DEPRECATED (5, "use 'octave::keyword_almost_match' instead") -extern OCTINTERP_API int -keyword_almost_match (const char * const *std, int *min_len, - const std::string& s, int min_toks_to_match, - int max_toks); - -OCTAVE_DEPRECATED (5, "use 'octave::search_path_for_file' instead") -extern OCTINTERP_API std::string -search_path_for_file (const std::string& path, const string_vector& names); - -OCTAVE_DEPRECATED (5, "use 'octave::search_path_for_all_files' instead") -extern OCTINTERP_API string_vector -search_path_for_all_files (const std::string& path, const string_vector& names); - -OCTAVE_DEPRECATED (5, "use 'octave::file_in_path' instead") -extern OCTINTERP_API std::string -file_in_path (const std::string& name, const std::string& suffix); - -OCTAVE_DEPRECATED (5, "use 'octave::find_data_file_in_load_path ' instead") -extern OCTINTERP_API std::string -find_data_file_in_load_path (const std::string& fcn, const std::string& file, - bool require_regular_file = false); - -OCTAVE_DEPRECATED (5, "use 'octave::contents_file_in_path' instead") -extern OCTINTERP_API std::string -contents_file_in_path (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::fcn_file_in_path' instead") -extern OCTINTERP_API std::string -fcn_file_in_path (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::do_string_escapes' instead") -extern OCTINTERP_API std::string -do_string_escapes (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::undo_string_escape' instead") -extern OCTINTERP_API const char * -undo_string_escape (char c); - -OCTAVE_DEPRECATED (5, "use 'octave::undo_string_escapes' instead") -extern OCTINTERP_API std::string -undo_string_escapes (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::check_dimensions' instead") -extern OCTINTERP_API void -check_dimensions (dim_vector& dim, const char *warnfor); - -OCTAVE_DEPRECATED (5, "use 'octave::get_dimensions' instead") -extern OCTINTERP_API void -get_dimensions (const octave_value& a, const char *warn_for, - dim_vector& dim); - -OCTAVE_DEPRECATED (5, "use 'octave::get_dimensions' instead") -extern OCTINTERP_API void -get_dimensions (const octave_value& a, const octave_value& b, - const char *warn_for, octave_idx_type& nr, - octave_idx_type& nc); - -OCTAVE_DEPRECATED (5, "use 'octave::get_dimensions' instead") -extern OCTINTERP_API void -get_dimensions (const octave_value& a, const char *warn_for, - octave_idx_type& nr, octave_idx_type& nc); - -OCTAVE_DEPRECATED (5, "use 'octave::dims_to_numel' instead") -extern OCTINTERP_API octave_idx_type -dims_to_numel (const dim_vector& dims, const octave_value_list& idx); - -OCTAVE_DEPRECATED (5, "use 'octave::identity_matrix' instead") -extern OCTINTERP_API Matrix -identity_matrix (octave_idx_type nr, octave_idx_type nc); - -OCTAVE_DEPRECATED (5, "use 'octave::float_identity_matrix' instead") -extern OCTINTERP_API FloatMatrix -float_identity_matrix (octave_idx_type nr, octave_idx_type nc); - -template <typename ... Args> -OCTAVE_DEPRECATED (5, "use 'octave::format' instead") -size_t -octave_format (std::ostream& os, const char *fmt, Args&& ... args) -{ - return octave::format (os, fmt, std::forward<Args> (args) ...); -} - -OCTAVE_DEPRECATED (5, "use 'octave::vformat' instead") -extern OCTINTERP_API size_t -octave_vformat (std::ostream& os, const char *fmt, va_list args); - -OCTAVE_DEPRECATED (5, "use 'octave::vasprintf' instead") -extern OCTINTERP_API std::string -octave_vasprintf (const char *fmt, va_list args); - -template <typename ... Args> -OCTAVE_DEPRECATED (5, "use 'octave::asprintf' instead") -std::string -octave_asprintf (const char *fmt, Args&& ... args) -{ - return octave::asprintf (fmt, std::forward<Args> (args) ...); -} - -OCTAVE_DEPRECATED (5, "use 'octave::sleep' instead") -extern OCTINTERP_API void -octave_sleep (double seconds); - -OCTAVE_DEPRECATED (5, "use 'octave::do_simple_cellfun' instead") -extern OCTINTERP_API octave_value_list -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args, - int nargout); - -OCTAVE_DEPRECATED (5, "use 'octave::do_simple_cellfun' instead") -extern OCTINTERP_API octave_value -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args); - #endif - -#endif
--- a/libinterp/corefcn/variables.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/variables.cc Fri May 22 11:06:58 2020 +0200 @@ -1467,42 +1467,3 @@ { return SET_INTERNAL_VARIABLE (missing_component_hook); } - -// The following function is deprecated. - -string_vector -get_struct_elts (const std::string& text) -{ - int n = 1; - - size_t pos = 0; - - size_t len = text.length (); - - while ((pos = text.find ('.', pos)) != std::string::npos) - { - if (++pos == len) - break; - - n++; - } - - string_vector retval (n); - - pos = 0; - - for (int i = 0; i < n; i++) - { - len = text.find ('.', pos); - - if (len != std::string::npos) - len -= pos; - - retval[i] = text.substr (pos, len); - - if (len != std::string::npos) - pos += len + 1; - } - - return retval; -}
--- a/libinterp/corefcn/variables.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/corefcn/variables.h Fri May 22 11:06:58 2020 +0200 @@ -116,8 +116,4 @@ extern OCTINTERP_API std::string maybe_missing_function_hook (const std::string& name); -OCTAVE_DEPRECATED (5, "this function will be removed in a future version of Octave") -extern OCTINTERP_API string_vector -get_struct_elts (const std::string& text); - #endif
--- a/libinterp/dldfcn/__init_fltk__.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/dldfcn/__init_fltk__.cc Fri May 22 11:06:58 2020 +0200 @@ -2490,22 +2490,21 @@ // autoloaded functions in the PKG_ADD file and will not be visible to // the interpreter. +#if defined (HAVE_FLTK) static octave_value_list F__fltk_check__ (octave::interpreter& interp, const octave_value_list&, int) { -#if defined (HAVE_FLTK) Fl::check (); if (Vdrawnow_requested) Fdrawnow (interp); return octave_value_list (); -#else octave_unused_parameter (interp); err_disabled_feature ("__fltk_check__", "OpenGL and FLTK"); +} #endif -} // Initialize the fltk graphics toolkit.
--- a/libinterp/dldfcn/audiodevinfo.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/dldfcn/audiodevinfo.cc Fri May 22 11:06:58 2020 +0200 @@ -1959,6 +1959,7 @@ retval = recorder; #else + octave_unused_parameter (interp); octave_unused_parameter (args); err_disabled_feature ("__recorder_audiorecorder__",
--- a/libinterp/dldfcn/gzip.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/dldfcn/gzip.cc Fri May 22 11:06:58 2020 +0200 @@ -700,7 +700,7 @@ %! test_function (test_dir, z) %! unwind_protect_cleanup %! confirm_recursive_rmdir (false, "local"); -%! rmdir (test_dir, "s"); +%! sts = rmdir (test_dir, "s"); %! end_unwind_protect %! endfor %!endfunction @@ -840,7 +840,7 @@ %! unwind_protect_cleanup %! confirm_recursive_rmdir (false, "local"); %! for idx = 1:numel(out_dirs) -%! rmdir (out_dirs{idx}, "s"); +%! sts = rmdir (out_dirs{idx}, "s"); %! endfor %! end_unwind_protect %!endfunction
--- a/libinterp/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/module.mk Fri May 22 11:06:58 2020 +0200 @@ -33,7 +33,7 @@ %reldir%/corefcn/default-defs.h \ %reldir%/corefcn/graphics-props.cc \ %reldir%/corefcn/graphics.h \ - %reldir%/corefcn/mxarray.h \ + %reldir%/corefcn/mxtypes.h \ %reldir%/corefcn/oct-tex-parser.h \ %reldir%/corefcn/oct-tex-symbols.cc \ %reldir%/parse-tree/oct-gperf.h \ @@ -66,7 +66,7 @@ %reldir%/corefcn/default-defs.h \ %reldir%/corefcn/graphics-props.cc \ %reldir%/corefcn/graphics.h \ - %reldir%/corefcn/mxarray.h \ + %reldir%/corefcn/mxtypes.h \ %reldir%/corefcn/oct-errno.cc \ %reldir%/liboctinterp-build-info.cc \ %reldir%/operators/ops.cc @@ -99,7 +99,7 @@ %reldir%/builtin-defun-decls.h \ %reldir%/corefcn/graphics-props.cc \ %reldir%/corefcn/graphics.h \ - %reldir%/corefcn/mxarray.h + %reldir%/corefcn/mxtypes.h DIST_SRC += \ %reldir%/octave.cc \ @@ -129,7 +129,7 @@ %reldir%/builtins.cc \ %reldir%/corefcn/default-defs.h \ %reldir%/corefcn/graphics.h \ - %reldir%/corefcn/mxarray.h \ + %reldir%/corefcn/mxtypes.h \ %reldir%/corefcn/oct-errno.cc \ %reldir%/liboctinterp-build-info.cc \ %reldir%/operators/ops.cc
--- a/libinterp/octave-value/ov-base-diag.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-base-diag.cc Fri May 22 11:06:58 2020 +0200 @@ -543,9 +543,9 @@ template <typename DMT, typename MT> mxArray * -octave_base_diag<DMT, MT>::as_mxArray (void) const +octave_base_diag<DMT, MT>::as_mxArray (bool interleaved) const { - return to_dense ().as_mxArray (); + return to_dense ().as_mxArray (interleaved); } template <typename DMT, typename MT>
--- a/libinterp/octave-value/ov-base-diag.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-base-diag.h Fri May 22 11:06:58 2020 +0200 @@ -224,7 +224,7 @@ oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const; - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; bool print_as_scalar (void) const;
--- a/libinterp/octave-value/ov-base.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-base.cc Fri May 22 11:06:58 2020 +0200 @@ -974,7 +974,7 @@ } mxArray * -octave_base_value::as_mxArray (void) const +octave_base_value::as_mxArray (bool) const { return nullptr; }
--- a/libinterp/octave-value/ov-base.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-base.h Fri May 22 11:06:58 2020 +0200 @@ -697,7 +697,7 @@ virtual octave_idx_type * mex_get_jc (void) const { return nullptr; } - virtual mxArray * as_mxArray (void) const; + virtual mxArray * as_mxArray (bool interleaved) const; virtual octave_value diag (octave_idx_type k = 0) const;
--- a/libinterp/octave-value/ov-bool-mat.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-bool-mat.cc Fri May 22 11:06:58 2020 +0200 @@ -566,18 +566,18 @@ } mxArray * -octave_bool_matrix::as_mxArray (void) const +octave_bool_matrix::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxLOGICAL_CLASS, dims (), mxREAL); + mxArray *retval = new mxArray (interleaved, mxLOGICAL_CLASS, dims (), mxREAL); - bool *pr = static_cast<bool *> (retval->get_data ()); + mxLogical *pd = static_cast<mxLogical *> (retval->get_data ()); mwSize nel = numel (); - const bool *p = matrix.data (); + const bool *pdata = matrix.data (); for (mwIndex i = 0; i < nel; i++) - pr[i] = p[i]; + pd[i] = pdata[i]; return retval; }
--- a/libinterp/octave-value/ov-bool-mat.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-bool-mat.h Fri May 22 11:06:58 2020 +0200 @@ -233,7 +233,7 @@ // You should not use it anywhere else. void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; // Mapper functions are converted to double for treatment octave_value map (unary_mapper_t umap) const
--- a/libinterp/octave-value/ov-bool-sparse.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-bool-sparse.cc Fri May 22 11:06:58 2020 +0200 @@ -802,23 +802,34 @@ } mxArray * -octave_sparse_bool_matrix::as_mxArray (void) const +octave_sparse_bool_matrix::as_mxArray (bool interleaved) const { mwSize nz = nzmax (); - mxArray *retval = new mxArray (mxLOGICAL_CLASS, rows (), columns (), - nz, mxREAL); - bool *pr = static_cast<bool *> (retval->get_data ()); + mwSize nr = rows (); + mwSize nc = columns (); + + mxArray *retval = new mxArray (interleaved, mxLOGICAL_CLASS, nr, nc, nz, + mxREAL); + + mxLogical *pd = static_cast<mxLogical *> (retval->get_data ()); mwIndex *ir = retval->get_ir (); - mwIndex *jc = retval->get_jc (); + + const bool *pdata = matrix.data (); + const octave_idx_type *pridx = matrix.ridx (); for (mwIndex i = 0; i < nz; i++) { - pr[i] = matrix.data (i); - ir[i] = matrix.ridx (i); + pd[i] = pdata[i]; + + ir[i] = pridx[i]; } - for (mwIndex i = 0; i < columns () + 1; i++) - jc[i] = matrix.cidx (i); + mwIndex *jc = retval->get_jc (); + + const octave_idx_type *pcidx = matrix.cidx (); + + for (mwIndex i = 0; i < nc + 1; i++) + jc[i] = pcidx[i]; return retval; }
--- a/libinterp/octave-value/ov-bool-sparse.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-bool-sparse.h Fri May 22 11:06:58 2020 +0200 @@ -143,7 +143,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; // Mapper functions are converted to double for treatment octave_value map (unary_mapper_t umap) const
--- a/libinterp/octave-value/ov-bool.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-bool.cc Fri May 22 11:06:58 2020 +0200 @@ -312,13 +312,13 @@ } mxArray * -octave_bool::as_mxArray (void) const +octave_bool::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxLOGICAL_CLASS, 1, 1, mxREAL); + mxArray *retval = new mxArray (interleaved, mxLOGICAL_CLASS, 1, 1, mxREAL); - bool *pr = static_cast<bool *> (retval->get_data ()); + mxLogical *pd = static_cast<mxLogical *> (retval->get_data ()); - pr[0] = scalar; + pd[0] = scalar; return retval; }
--- a/libinterp/octave-value/ov-bool.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-bool.h Fri May 22 11:06:58 2020 +0200 @@ -246,7 +246,7 @@ skip, flt_fmt); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; // Mapper functions are converted to double for treatment octave_value map (unary_mapper_t umap) const
--- a/libinterp/octave-value/ov-cell.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-cell.cc Fri May 22 11:06:58 2020 +0200 @@ -1410,9 +1410,9 @@ */ mxArray * -octave_cell::as_mxArray (void) const +octave_cell::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (dims ()); + mxArray *retval = new mxArray (interleaved, dims ()); mxArray **elts = static_cast<mxArray **> (retval->get_data ()); @@ -1421,7 +1421,7 @@ const octave_value *p = matrix.data (); for (mwIndex i = 0; i < nel; i++) - elts[i] = new mxArray (p[i]); + elts[i] = new mxArray (interleaved, p[i]); return retval; }
--- a/libinterp/octave-value/ov-cell.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-cell.h Fri May 22 11:06:58 2020 +0200 @@ -172,7 +172,7 @@ octave_value map (unary_mapper_t umap) const; - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else.
--- a/libinterp/octave-value/ov-ch-mat.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-ch-mat.cc Fri May 22 11:06:58 2020 +0200 @@ -222,18 +222,18 @@ } mxArray * -octave_char_matrix::as_mxArray (void) const +octave_char_matrix::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxCHAR_CLASS, dims (), mxREAL); + mxArray *retval = new mxArray (interleaved, mxCHAR_CLASS, dims (), mxREAL); - mxChar *pr = static_cast<mxChar *> (retval->get_data ()); + mxChar *pd = static_cast<mxChar *> (retval->get_data ()); mwSize nel = numel (); - const char *p = matrix.data (); + const char *pdata = matrix.data (); for (mwIndex i = 0; i < nel; i++) - pr[i] = p[i]; + pd[i] = pdata[i]; return retval; }
--- a/libinterp/octave-value/ov-ch-mat.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-ch-mat.h Fri May 22 11:06:58 2020 +0200 @@ -167,7 +167,7 @@ // You should not use it anywhere else. void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const; };
--- a/libinterp/octave-value/ov-class.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-class.cc Fri May 22 11:06:58 2020 +0200 @@ -1637,7 +1637,7 @@ } mxArray * -octave_class::as_mxArray (void) const +octave_class::as_mxArray (bool) const { err_wrong_type_arg ("octave_class::as_mxArray ()", type_name ()); }
--- a/libinterp/octave-value/ov-class.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-class.h Fri May 22 11:06:58 2020 +0200 @@ -200,7 +200,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; private: octave_map map;
--- a/libinterp/octave-value/ov-complex.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-complex.cc Fri May 22 11:06:58 2020 +0200 @@ -472,15 +472,26 @@ } mxArray * -octave_complex::as_mxArray (void) const +octave_complex::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxDOUBLE_CLASS, 1, 1, mxCOMPLEX); + mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, 1, 1, mxCOMPLEX); + + if (interleaved) + { + mxComplexDouble *pd + = reinterpret_cast<mxComplexDouble *> (retval->get_complex_doubles ()); - double *pr = static_cast<double *> (retval->get_data ()); - double *pi = static_cast<double *> (retval->get_imag_data ()); + pd[0].real = scalar.real (); + pd[0].imag = scalar.imag (); + } + else + { + mxDouble *pr = static_cast<mxDouble *> (retval->get_data ()); + mxDouble *pi = static_cast<mxDouble *> (retval->get_imag_data ()); - pr[0] = scalar.real (); - pi[0] = scalar.imag (); + pr[0] = scalar.real (); + pi[0] = scalar.imag (); + } return retval; }
--- a/libinterp/octave-value/ov-complex.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-complex.h Fri May 22 11:06:58 2020 +0200 @@ -195,7 +195,7 @@ skip, flt_fmt); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-cx-mat.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-cx-mat.cc Fri May 22 11:06:58 2020 +0200 @@ -724,21 +724,36 @@ } mxArray * -octave_complex_matrix::as_mxArray (void) const +octave_complex_matrix::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxCOMPLEX); - - double *pr = static_cast<double *> (retval->get_data ()); - double *pi = static_cast<double *> (retval->get_imag_data ()); + mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, dims (), + mxCOMPLEX); mwSize nel = numel (); - const Complex *p = matrix.data (); + const Complex *pdata = matrix.data (); + + if (interleaved) + { + mxComplexDouble *pd + = static_cast<mxComplexDouble *> (retval->get_data ()); - for (mwIndex i = 0; i < nel; i++) + for (mwIndex i = 0; i < nel; i++) + { + pd[i].real = pdata[i].real (); + pd[i].imag = pdata[i].imag (); + } + } + else { - pr[i] = std::real (p[i]); - pi[i] = std::imag (p[i]); + mxDouble *pr = static_cast<mxDouble *> (retval->get_data ()); + mxDouble *pi = static_cast<mxDouble *> (retval->get_imag_data ()); + + for (mwIndex i = 0; i < nel; i++) + { + pr[i] = pdata[i].real (); + pi[i] = pdata[i].imag (); + } } return retval;
--- a/libinterp/octave-value/ov-cx-mat.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-cx-mat.h Fri May 22 11:06:58 2020 +0200 @@ -175,7 +175,7 @@ void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-cx-sparse.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-cx-sparse.cc Fri May 22 11:06:58 2020 +0200 @@ -874,26 +874,53 @@ } mxArray * -octave_sparse_complex_matrix::as_mxArray (void) const +octave_sparse_complex_matrix::as_mxArray (bool interleaved) const { mwSize nz = nzmax (); - mxArray *retval = new mxArray (mxDOUBLE_CLASS, rows (), columns (), - nz, mxCOMPLEX); - double *pr = static_cast<double *> (retval->get_data ()); - double *pi = static_cast<double *> (retval->get_imag_data ()); + mwSize nr = rows (); + mwSize nc = columns (); + + mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, nr, nc, nz, + mxCOMPLEX); + mwIndex *ir = retval->get_ir (); + + const Complex *pdata = matrix.data (); + const octave_idx_type *pridx = matrix.ridx (); + + if (interleaved) + { + mxComplexDouble *pd + = static_cast<mxComplexDouble *> (retval->get_data ()); + + for (mwIndex i = 0; i < nz; i++) + { + pd[i].real = pdata[i].real (); + pd[i].imag = pdata[i].imag (); + + ir[i] = pridx[i]; + } + } + else + { + mxDouble *pr = static_cast<mxDouble *> (retval->get_data ()); + mxDouble *pi = static_cast<mxDouble *> (retval->get_imag_data ()); + + for (mwIndex i = 0; i < nz; i++) + { + pr[i] = pdata[i].real (); + pi[i] = pdata[i].imag (); + + ir[i] = pridx[i]; + } + } + mwIndex *jc = retval->get_jc (); - for (mwIndex i = 0; i < nz; i++) - { - Complex val = matrix.data (i); - pr[i] = val.real (); - pi[i] = val.imag (); - ir[i] = matrix.ridx (i); - } + const octave_idx_type *pcidx = matrix.cidx (); - for (mwIndex i = 0; i < columns () + 1; i++) - jc[i] = matrix.cidx (i); + for (mwIndex i = 0; i < nc + 1; i++) + jc[i] = pcidx[i]; return retval; }
--- a/libinterp/octave-value/ov-cx-sparse.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-cx-sparse.h Fri May 22 11:06:58 2020 +0200 @@ -149,7 +149,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-float.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-float.cc Fri May 22 11:06:58 2020 +0200 @@ -335,13 +335,13 @@ } mxArray * -octave_float_scalar::as_mxArray (void) const +octave_float_scalar::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxSINGLE_CLASS, 1, 1, mxREAL); + mxArray *retval = new mxArray (interleaved, mxSINGLE_CLASS, 1, 1, mxREAL); - float *pr = static_cast<float *> (retval->get_data ()); + mxSingle *pd = static_cast<mxSingle *> (retval->get_data ()); - pr[0] = scalar; + pd[0] = scalar; return retval; }
--- a/libinterp/octave-value/ov-float.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-float.h Fri May 22 11:06:58 2020 +0200 @@ -266,7 +266,7 @@ skip, flt_fmt); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-flt-complex.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-flt-complex.cc Fri May 22 11:06:58 2020 +0200 @@ -414,15 +414,26 @@ } mxArray * -octave_float_complex::as_mxArray (void) const +octave_float_complex::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxSINGLE_CLASS, 1, 1, mxCOMPLEX); + mxArray *retval = new mxArray (interleaved, mxSINGLE_CLASS, 1, 1, mxCOMPLEX); + + if (interleaved) + { + mxComplexSingle *pd + = static_cast<mxComplexSingle *> (retval->get_data ()); - float *pr = static_cast<float *> (retval->get_data ()); - float *pi = static_cast<float *> (retval->get_imag_data ()); + pd[0].real = scalar.real (); + pd[0].imag = scalar.imag (); + } + else + { + mxSingle *pr = static_cast<mxSingle *> (retval->get_data ()); + mxSingle *pi = static_cast<mxSingle *> (retval->get_imag_data ()); - pr[0] = scalar.real (); - pi[0] = scalar.imag (); + pr[0] = scalar.real (); + pi[0] = scalar.imag (); + } return retval; }
--- a/libinterp/octave-value/ov-flt-complex.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-flt-complex.h Fri May 22 11:06:58 2020 +0200 @@ -191,7 +191,7 @@ skip, flt_fmt); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-flt-cx-mat.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Fri May 22 11:06:58 2020 +0200 @@ -676,21 +676,36 @@ } mxArray * -octave_float_complex_matrix::as_mxArray (void) const +octave_float_complex_matrix::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxSINGLE_CLASS, dims (), mxCOMPLEX); - - float *pr = static_cast<float *> (retval->get_data ()); - float *pi = static_cast<float *> (retval->get_imag_data ()); + mxArray *retval = new mxArray (interleaved, mxSINGLE_CLASS, dims (), + mxCOMPLEX); mwSize nel = numel (); - const FloatComplex *p = matrix.data (); + const FloatComplex *pdata = matrix.data (); + + if (interleaved) + { + mxComplexSingle *pd + = static_cast<mxComplexSingle *> (retval->get_data ()); - for (mwIndex i = 0; i < nel; i++) + for (mwIndex i = 0; i < nel; i++) + { + pd[i].real = pdata[i].real (); + pd[i].imag = pdata[i].imag (); + } + } + else { - pr[i] = std::real (p[i]); - pi[i] = std::imag (p[i]); + mxSingle *pr = static_cast<mxSingle *> (retval->get_data ()); + mxSingle *pi = static_cast<mxSingle *> (retval->get_imag_data ()); + + for (mwIndex i = 0; i < nel; i++) + { + pr[i] = pdata[i].real (); + pi[i] = pdata[i].imag (); + } } return retval;
--- a/libinterp/octave-value/ov-flt-cx-mat.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-flt-cx-mat.h Fri May 22 11:06:58 2020 +0200 @@ -171,7 +171,7 @@ void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-flt-re-mat.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Fri May 22 11:06:58 2020 +0200 @@ -717,18 +717,18 @@ } mxArray * -octave_float_matrix::as_mxArray (void) const +octave_float_matrix::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxSINGLE_CLASS, dims (), mxREAL); + mxArray *retval = new mxArray (interleaved, mxSINGLE_CLASS, dims (), mxREAL); - float *pr = static_cast<float *> (retval->get_data ()); + mxSingle *pd = static_cast<mxSingle *> (retval->get_data ()); mwSize nel = numel (); - const float *p = matrix.data (); + const float *pdata = matrix.data (); for (mwIndex i = 0; i < nel; i++) - pr[i] = p[i]; + pd[i] = pdata[i]; return retval; }
--- a/libinterp/octave-value/ov-flt-re-mat.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-flt-re-mat.h Fri May 22 11:06:58 2020 +0200 @@ -217,7 +217,7 @@ // You should not use it anywhere else. void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-intx.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-intx.h Fri May 22 11:06:58 2020 +0200 @@ -315,19 +315,20 @@ // You should not use it anywhere else. void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray * as_mxArray (void) const + mxArray * as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (OCTAVE_INT_MX_CLASS, dims (), mxREAL); + mxArray *retval = new mxArray (interleaved, OCTAVE_INT_MX_CLASS, dims (), + mxREAL); - OCTAVE_INT_T::val_type *pr = static_cast<OCTAVE_INT_T::val_type *> - (retval->get_data ()); + OCTAVE_INT_T::val_type *pd + = static_cast<OCTAVE_INT_T::val_type *> (retval->get_data ()); mwSize nel = numel (); - const OCTAVE_INT_T *p = matrix.data (); + const OCTAVE_INT_T *pdata = matrix.data (); for (mwIndex i = 0; i < nel; i++) - pr[i] = p[i].value (); + pd[i] = pdata[i].value (); return retval; } @@ -637,14 +638,15 @@ // You should not use it anywhere else. void * mex_get_data (void) const { return scalar.mex_get_data (); } - mxArray * as_mxArray (void) const + mxArray * as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (OCTAVE_INT_MX_CLASS, 1, 1, mxREAL); + mxArray *retval = new mxArray (interleaved, OCTAVE_INT_MX_CLASS, 1, 1, + mxREAL); - OCTAVE_INT_T::val_type *pr = static_cast<OCTAVE_INT_T::val_type *> - (retval->get_data ()); + OCTAVE_INT_T::val_type *pd + = static_cast<OCTAVE_INT_T::val_type *> (retval->get_data ()); - pr[0] = scalar.value (); + pd[0] = scalar.value (); return retval; }
--- a/libinterp/octave-value/ov-lazy-idx.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-lazy-idx.h Fri May 22 11:06:58 2020 +0200 @@ -241,9 +241,9 @@ return make_value ().mex_get_data (); } - mxArray * as_mxArray (void) const + mxArray * as_mxArray (bool interleaved) const { - return make_value ().as_mxArray (); + return make_value ().as_mxArray (interleaved); } octave_value map (unary_mapper_t umap) const
--- a/libinterp/octave-value/ov-mex-fcn.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-mex-fcn.cc Fri May 22 11:06:58 2020 +0200 @@ -46,10 +46,11 @@ "mex function", "mex function"); octave_mex_function::octave_mex_function - (void *fptr, bool fmex, const octave::dynamic_library& shl, + (void *fptr, bool interleaved, bool fmex, const octave::dynamic_library& shl, const std::string& nm) : octave_function (nm), m_mex_fcn_ptr (fptr), m_exit_fcn_ptr (nullptr), - m_is_fmex (fmex), m_sh_lib (shl) + m_sh_lib (shl), m_interleaved (interleaved), m_is_fmex (fmex), + m_is_system_fcn_file (false) { mark_fcn_file_up_to_date (time_parsed ());
--- a/libinterp/octave-value/ov-mex-fcn.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-mex-fcn.h Fri May 22 11:06:58 2020 +0200 @@ -52,10 +52,12 @@ public: octave_mex_function (void) - : m_mex_fcn_ptr (), m_exit_fcn_ptr (), m_is_fmex (), m_sh_lib (), - m_time_checked (), m_is_system_fcn_file () { } + : m_mex_fcn_ptr (nullptr), m_exit_fcn_ptr (nullptr), m_sh_lib (), + m_time_checked (), m_interleaved (false), m_is_fmex (false), + m_is_system_fcn_file (false) + { } - octave_mex_function (void *fptr, bool fmex, + octave_mex_function (void *fptr, bool interleaved, bool fmex, const octave::dynamic_library& shl, const std::string& nm = ""); @@ -88,6 +90,8 @@ bool is_mex_function (void) const { return true; } + bool use_interleaved_complex (void) const { return m_interleaved; } + // We don't need to override both forms of the call method. The using // declaration will avoid warnings about partially-overloaded virtual // functions. @@ -111,14 +115,16 @@ void (*m_exit_fcn_ptr) (void); - bool m_is_fmex; - octave::dynamic_library m_sh_lib; // The time the file was last checked to see if it needs to be // parsed again. mutable octave::sys::time m_time_checked; + bool m_interleaved; + + bool m_is_fmex; + // True if this function came from a file that is considered to be a // system function. This affects whether we check the time stamp // on the file to see if it has changed.
--- a/libinterp/octave-value/ov-perm.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-perm.cc Fri May 22 11:06:58 2020 +0200 @@ -434,9 +434,9 @@ } mxArray * -octave_perm_matrix::as_mxArray (void) const +octave_perm_matrix::as_mxArray (bool interleaved) const { - return to_dense ().as_mxArray (); + return to_dense ().as_mxArray (interleaved); } bool
--- a/libinterp/octave-value/ov-perm.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-perm.h Fri May 22 11:06:58 2020 +0200 @@ -240,7 +240,7 @@ oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const; - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; bool print_as_scalar (void) const;
--- a/libinterp/octave-value/ov-range.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-range.cc Fri May 22 11:06:58 2020 +0200 @@ -771,20 +771,20 @@ } mxArray * -octave_range::as_mxArray (void) const +octave_range::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxREAL); + mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, dims (), mxREAL); - double *pr = static_cast<double *> (retval->get_data ()); + mxDouble *pd = static_cast<mxDouble *> (retval->get_data ()); mwSize nel = numel (); Matrix m = matrix_value (); - const double *p = m.data (); + const double *pdata = m.data (); for (mwSize i = 0; i < nel; i++) - pr[i] = p[i]; + pd[i] = pdata[i]; return retval; }
--- a/libinterp/octave-value/ov-range.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-range.h Fri May 22 11:06:58 2020 +0200 @@ -306,7 +306,7 @@ return os.write (matrix_value (), block_size, output_type, skip, flt_fmt); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const {
--- a/libinterp/octave-value/ov-re-mat.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-re-mat.cc Fri May 22 11:06:58 2020 +0200 @@ -844,18 +844,18 @@ } mxArray * -octave_matrix::as_mxArray (void) const +octave_matrix::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxREAL); + mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, dims (), mxREAL); - double *pr = static_cast<double *> (retval->get_data ()); + mxDouble *pd = static_cast<mxDouble *> (retval->get_data ()); mwSize nel = numel (); - const double *p = matrix.data (); + const double *pdata = matrix.data (); for (mwIndex i = 0; i < nel; i++) - pr[i] = p[i]; + pd[i] = pdata[i]; return retval; }
--- a/libinterp/octave-value/ov-re-mat.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-re-mat.h Fri May 22 11:06:58 2020 +0200 @@ -241,7 +241,7 @@ // You should not use it anywhere else. void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-re-sparse.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-re-sparse.cc Fri May 22 11:06:58 2020 +0200 @@ -861,24 +861,34 @@ } mxArray * -octave_sparse_matrix::as_mxArray (void) const +octave_sparse_matrix::as_mxArray (bool interleaved) const { mwSize nz = nzmax (); mwSize nr = rows (); mwSize nc = columns (); - mxArray *retval = new mxArray (mxDOUBLE_CLASS, nr, nc, nz, mxREAL); - double *pr = static_cast<double *> (retval->get_data ()); + + mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, nr, nc, nz, + mxREAL); + + mxDouble *pd = static_cast<mxDouble *> (retval->get_data ()); mwIndex *ir = retval->get_ir (); - mwIndex *jc = retval->get_jc (); + + const double *pdata = matrix.data (); + const octave_idx_type *pridx = matrix.ridx (); for (mwIndex i = 0; i < nz; i++) { - pr[i] = matrix.data (i); - ir[i] = matrix.ridx (i); + pd[i] = pdata[i]; + + ir[i] = pridx[i]; } + mwIndex *jc = retval->get_jc (); + + const octave_idx_type *pcidx = matrix.cidx (); + for (mwIndex i = 0; i < nc + 1; i++) - jc[i] = matrix.cidx (i); + jc[i] = pcidx[i]; return retval; }
--- a/libinterp/octave-value/ov-re-sparse.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-re-sparse.h Fri May 22 11:06:58 2020 +0200 @@ -152,7 +152,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-scalar.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-scalar.cc Fri May 22 11:06:58 2020 +0200 @@ -356,13 +356,13 @@ } mxArray * -octave_scalar::as_mxArray (void) const +octave_scalar::as_mxArray (bool interleaved) const { - mxArray *retval = new mxArray (mxDOUBLE_CLASS, 1, 1, mxREAL); + mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, 1, 1, mxREAL); - double *pr = static_cast<double *> (retval->get_data ()); + mxDouble *pd = static_cast<mxDouble *> (retval->get_data ()); - pr[0] = scalar; + pd[0] = scalar; return retval; }
--- a/libinterp/octave-value/ov-scalar.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-scalar.h Fri May 22 11:06:58 2020 +0200 @@ -269,7 +269,7 @@ skip, flt_fmt); } - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-struct.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-struct.cc Fri May 22 11:06:58 2020 +0200 @@ -1011,7 +1011,7 @@ } mxArray * -octave_struct::as_mxArray (void) const +octave_struct::as_mxArray (bool interleaved) const { int nf = nfields (); string_vector kv = map_keys (); @@ -1021,7 +1021,7 @@ for (int i = 0; i < nf; i++) f[i] = kv[i].c_str (); - mxArray *retval = new mxArray (dims (), nf, f); + mxArray *retval = new mxArray (interleaved, dims (), nf, f); mxArray **elts = static_cast<mxArray **> (retval->get_data ()); @@ -1037,7 +1037,7 @@ mwIndex k = 0; for (mwIndex j = i; j < ntot; j += nf) - elts[j] = new mxArray (p[k++]); + elts[j] = new mxArray (interleaved, p[k++]); } return retval; @@ -1629,7 +1629,7 @@ } mxArray * -octave_scalar_struct::as_mxArray (void) const +octave_scalar_struct::as_mxArray (bool interleaved) const { int nf = nfields (); string_vector kv = map_keys (); @@ -1639,7 +1639,7 @@ for (int i = 0; i < nf; i++) f[i] = kv[i].c_str (); - mxArray *retval = new mxArray (dims (), nf, f); + mxArray *retval = new mxArray (interleaved, dims (), nf, f); mxArray **elts = static_cast<mxArray **> (retval->get_data ()); @@ -1655,7 +1655,7 @@ mwIndex k = 0; for (mwIndex j = i; j < ntot; j += nf) - elts[j] = new mxArray (p[k++]); + elts[j] = new mxArray (interleaved, p[k++]); } return retval;
--- a/libinterp/octave-value/ov-struct.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov-struct.h Fri May 22 11:06:58 2020 +0200 @@ -150,7 +150,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; octave_value fast_elem_extract (octave_idx_type n) const; @@ -274,7 +274,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray * as_mxArray (void) const; + mxArray * as_mxArray (bool interleaved) const; bool fast_elem_insert_self (void *where, builtin_type_t btyp) const;
--- a/libinterp/octave-value/ov.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov.cc Fri May 22 11:06:58 2020 +0200 @@ -2626,6 +2626,75 @@ rep->print_info (os, prefix + ' '); } +void * +octave_value::mex_get_data (mxClassID class_id, mxComplexity complexity) const +{ + // If class_id is set to mxUNKNOWN_CLASS, return data for any type. + // Otherwise, require that REP matches the requested type and + // complexity. + + if (class_id != mxUNKNOWN_CLASS) + { + bool type_ok = false; + + switch (class_id) + { + case mxDOUBLE_CLASS: + type_ok = is_double_type (); + break; + + case mxSINGLE_CLASS: + type_ok = is_single_type (); + break; + + case mxINT8_CLASS: + type_ok = is_int8_type (); + break; + + case mxINT16_CLASS: + type_ok = is_int16_type (); + break; + + case mxINT32_CLASS: + type_ok = is_int32_type (); + break; + + case mxINT64_CLASS: + type_ok = is_int64_type (); + break; + + case mxUINT8_CLASS: + type_ok = is_uint8_type (); + break; + + case mxUINT16_CLASS: + type_ok = is_uint16_type (); + break; + + case mxUINT32_CLASS: + type_ok = is_uint32_type (); + break; + + case mxUINT64_CLASS: + type_ok = is_uint64_type (); + break; + + default: + // We only expect to see numeric types explicitly requested. + error ("mex_get_data: unexpected type requested"); + break; + } + + if (! type_ok) + error ("mex_get_data: type mismatch"); + + if (complexity == mxCOMPLEX && ! iscomplex ()) + error ("mex_get_data: objectis not complex as requested"); + } + + return rep->mex_get_data (); +} + OCTAVE_NORETURN static void err_unary_op (const std::string& on, const std::string& tn) {
--- a/libinterp/octave-value/ov.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/octave-value/ov.h Fri May 22 11:06:58 2020 +0200 @@ -60,6 +60,8 @@ class octave_fcn_inline; class octave_value_list; +#include "mxtypes.h" + #include "oct-stream.h" #include "ov-base.h" @@ -1326,13 +1328,15 @@ // Unsafe. These functions exist to support the MEX interface. // You should not use them anywhere else. - void * mex_get_data (void) const { return rep->mex_get_data (); } + void * mex_get_data (mxClassID class_id = mxUNKNOWN_CLASS, + mxComplexity complexity = mxREAL) const; octave_idx_type * mex_get_ir (void) const { return rep->mex_get_ir (); } octave_idx_type * mex_get_jc (void) const { return rep->mex_get_jc (); } - mxArray * as_mxArray (void) const { return rep->as_mxArray (); } + mxArray * as_mxArray (bool interleaved = false) const + { return rep->as_mxArray (interleaved); } octave_value diag (octave_idx_type k = 0) const { return rep->diag (k); }
--- a/libinterp/parse-tree/bp-table.cc Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/bp-table.cc Fri May 22 11:06:58 2020 +0200 @@ -997,12 +997,4 @@ return retval; } - - octave_user_code * - get_user_code (const std::string& fname) - { - tree_evaluator& tw = __get_evaluator__ ("get_user_code"); - - return tw.get_user_code (fname); - } }
--- a/libinterp/parse-tree/bp-table.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/bp-table.h Fri May 22 11:06:58 2020 +0200 @@ -164,9 +164,6 @@ intmap remove_all_breakpoints_in_file_1 (octave_user_code *fcn, const std::string& fname); }; - - OCTAVE_DEPRECATED (5, "use 'octave::get_user_code' instead") - extern octave_user_code * get_user_code (const std::string& fname = ""); } #endif
--- a/libinterp/parse-tree/oct-parse.yy Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/oct-parse.yy Fri May 22 11:06:58 2020 +0200 @@ -5344,23 +5344,6 @@ namespace octave { - octave_value_list - eval_string (const std::string& eval_str, bool silent, - int& parse_status, int nargout) - { - interpreter& interp = __get_interpreter__ ("eval_string"); - - return interp.eval_string (eval_str, silent, parse_status, nargout); - } - - octave_value - eval_string (const std::string& eval_str, bool silent, int& parse_status) - { - interpreter& interp = __get_interpreter__ ("eval_string"); - - return interp.eval_string (eval_str, silent, parse_status); - } - void cleanup_statement_list (tree_statement_list **lst) {
--- a/libinterp/parse-tree/parse.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/parse.h Fri May 22 11:06:58 2020 +0200 @@ -689,14 +689,6 @@ extern OCTINTERP_API octave_value_list feval (const octave_value_list& args, int nargout = 0); - OCTAVE_DEPRECATED (5, "use 'octave::interpreter::eval_string' instead") - extern OCTINTERP_API octave_value_list - eval_string (const std::string&, bool silent, int& parse_status, int nargout); - - OCTAVE_DEPRECATED (5, "use 'octave::interpreter::eval_string' instead") - extern OCTINTERP_API octave_value - eval_string (const std::string&, bool silent, int& parse_status); - extern OCTINTERP_API void cleanup_statement_list (tree_statement_list **lst); }
--- a/libinterp/parse-tree/pt-arg-list.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/pt-arg-list.h Fri May 22 11:06:58 2020 +0200 @@ -128,10 +128,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -// tree_argument_list is derived from a template. - #endif - -#endif
--- a/libinterp/parse-tree/pt-classdef.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/pt-classdef.h Fri May 22 11:06:58 2020 +0200 @@ -829,10 +829,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -// Hmm, a lot of these are templates, so not sure how to typedef them. - #endif - -#endif
--- a/libinterp/parse-tree/pt-misc.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/pt-misc.h Fri May 22 11:06:58 2020 +0200 @@ -115,10 +115,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -// tree_parameter_list is derived from a template. - #endif - -#endif
--- a/libinterp/parse-tree/token.h Wed May 06 10:05:36 2020 +0200 +++ b/libinterp/parse-tree/token.h Fri May 22 11:06:58 2020 +0200 @@ -123,12 +123,6 @@ return m_type_tag == keyword_token || m_type_tag == ettype_token; } - OCTAVE_DEPRECATED (5, "use 'octave::iskeyword' instead") - bool is_keyword (void) const - { - return iskeyword (); - } - bool is_symbol (void) const { return m_type_tag == sym_rec_token;
--- a/liboctave/wrappers/unistr-wrappers.c Wed May 06 10:05:36 2020 +0200 +++ b/liboctave/wrappers/unistr-wrappers.c Fri May 22 11:06:58 2020 +0200 @@ -49,6 +49,27 @@ return u8_strmbtouc (puc, src); } +uint8_t * +octave_u16_to_u8_wrapper (const uint16_t *src, size_t src_len, + uint8_t *result_buf, size_t *lengthp) +{ + return u16_to_u8 (src, src_len, result_buf, lengthp); +} + +uint8_t * +octave_u32_to_u8_wrapper (const uint32_t *src, size_t src_len, + uint8_t *result_buf, size_t *lengthp) +{ + return u32_to_u8 (src, src_len, result_buf, lengthp); +} + +uint16_t * +octave_u8_to_u16_wrapper (const uint8_t *src, size_t src_len, + uint16_t *result_buf, size_t *lengthp) +{ + return u8_to_u16 (src, src_len, result_buf, lengthp); +} + uint32_t * octave_u8_to_u32_wrapper (const uint8_t *src, size_t src_len, uint32_t *result_buf, size_t *lengthp)
--- a/liboctave/wrappers/unistr-wrappers.h Wed May 06 10:05:36 2020 +0200 +++ b/liboctave/wrappers/unistr-wrappers.h Fri May 22 11:06:58 2020 +0200 @@ -39,6 +39,18 @@ extern int octave_u8_strmbtouc_wrapper (uint32_t *puc, const uint8_t *src); +extern uint8_t * +octave_u16_to_u8_wrapper (const uint16_t *src, size_t src_len, + uint8_t *result_buf, size_t *lengthp); + +extern uint8_t * +octave_u32_to_u8_wrapper (const uint32_t *src, size_t src_len, + uint8_t *result_buf, size_t *lengthp); + +extern uint16_t * +octave_u8_to_u16_wrapper (const uint8_t *src, size_t src_len, + uint16_t *result_buf, size_t *lengthp); + extern uint32_t * octave_u8_to_u32_wrapper (const uint8_t *src, size_t src_len, uint32_t *result_buf, size_t *lengthp);
--- a/m4/acinclude.m4 Wed May 06 10:05:36 2020 +0200 +++ b/m4/acinclude.m4 Fri May 22 11:06:58 2020 +0200 @@ -301,86 +301,6 @@ fi ]) dnl -dnl Check whether the Qt class QAbstractItemModel exists and has the -dnl beginResetModel and endResetModel member functions. These member -dnl functions were introduced in Qt 4.6. -dnl -dnl FIXME: Delete this entirely when we can safely assume that Qt 4.6 or later -dnl is in use everywhere, or when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL], [ - AC_CACHE_CHECK([for QAbstractItemModel::beginResetModel in <QAbstractItemModel>], - [octave_cv_func_qabstractitemmodel_beginresetmodel], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QAbstractItemModel> - class item_model : public QAbstractItemModel - { - public: - item_model (QObject *parent = 0) : QAbstractItemModel (parent) {} - ~item_model () {} - QModelIndex index (int, int, const QModelIndex& m) const { return m; } - QModelIndex parent (const QModelIndex& m) const { return m; } - int columnCount (const QModelIndex&) const { return 0; } - int rowCount (const QModelIndex&) const { return 0; } - QVariant data (const QModelIndex&, int) const { return QVariant(); } - void update_model () - { - this->beginResetModel (); - this->endResetModel (); - } - }; - ]], [[ - item_model model; - model.update_model (); - ]])], - octave_cv_func_qabstractitemmodel_beginresetmodel=yes, - octave_cv_func_qabstractitemmodel_beginresetmodel=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qabstractitemmodel_beginresetmodel = yes; then - AC_DEFINE(HAVE_QABSTRACTITEMMODEL_BEGINRESETMODEL, 1, - [Define to 1 if you have the `QAbstractItemModel::beginResetModel' member function.]) - fi -]) -dnl -dnl Check whether the Qt QComboBox class has the setCurrentText -dnl function. This function was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QCOMBOBOX_SETCURRENTTEXT], [ - AC_CACHE_CHECK([for QComboBox::setCurrentText], - [octave_cv_func_qcombobox_setcurrenttext], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CPPFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QComboBox> - ]], [[ - QComboBox combo_box (nullptr); - combo_box.setCurrentText ("text"); - ]])], - octave_cv_func_qcombobox_setcurrenttext=yes, - octave_cv_func_qcombobox_setcurrenttext=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qcombobox_setcurrenttext = yes; then - AC_DEFINE(HAVE_QCOMBOBOX_SETCURRENTTEXT, 1, - [Define to 1 if you have the `QComboBox::setCurrentText' member function.]) - fi -]) -dnl dnl Check whether the Qt QGuiApplication class has the setDesktopFileName dnl static member function. This function was introduced in Qt 5.7. dnl @@ -411,99 +331,6 @@ fi ]) dnl -dnl Check whether the Qt QHeaderView class has the setSectionResizeMode -dnl function. This function was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE], [ - AC_CACHE_CHECK([for QHeaderView::setSectionResizeMode], - [octave_cv_func_qheaderview_setsectionresizemode], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CPPFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QHeaderView> - ]], [[ - QHeaderView header_view (Qt::Horizontal); - header_view.setSectionResizeMode (QHeaderView::Interactive); - ]])], - octave_cv_func_qheaderview_setsectionresizemode=yes, - octave_cv_func_qheaderview_setsectionresizemode=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qheaderview_setsectionresizemode = yes; then - AC_DEFINE(HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE, 1, - [Define to 1 if you have the `QHeaderView::setSectionResizeMode' member function.]) - fi -]) -dnl -dnl Check whether the Qt QHeaderView class has the setSectionsClickable -dnl function. This function was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE], [ - AC_CACHE_CHECK([for QHeaderView::setSectionsClickable], - [octave_cv_func_qheaderview_setsectionsclickable], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CPPFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QHeaderView> - ]], [[ - QHeaderView header_view (Qt::Horizontal); - header_view.setSectionsClickable (true); - ]])], - octave_cv_func_qheaderview_setsectionsclickable=yes, - octave_cv_func_qheaderview_setsectionsclickable=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qheaderview_setsectionsclickable = yes; then - AC_DEFINE(HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE, 1, - [Define to 1 if you have the `QHeaderView::setSectionsClickable' member function.]) - fi -]) -dnl -dnl Check whether the Qt QHeaderView class has the setSectionsMovable -dnl function. This function was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE], [ - AC_CACHE_CHECK([for QHeaderView::setSectionsMovable], - [octave_cv_func_qheaderview_setsectionsmovable], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CPPFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QHeaderView> - ]], [[ - QHeaderView header_view (Qt::Horizontal); - header_view.setSectionsMovable (true); - ]])], - octave_cv_func_qheaderview_setsectionsmovable=yes, - octave_cv_func_qheaderview_setsectionsmovable=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qheaderview_setsectionsmovable = yes; then - AC_DEFINE(HAVE_QHEADERVIEW_SETSECTIONSMOVABLE, 1, - [Define to 1 if you have the `QHeaderView::setSectionsMovable' member function.]) - fi -]) -dnl dnl Check whether the Qt QHelpSearchQueryWidget class has the searchInput dnl member function. This function was introduced in Qt 5.9. dnl @@ -536,133 +363,6 @@ fi ]) dnl -dnl Check whether the Qt function qInstallMessageHandler is available. -dnl This function was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER], [ - AC_CACHE_CHECK([for qInstallMessageHandler], - [octave_cv_func_qinstallmessagehandler], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CPPFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QtGlobal> - ]], [[ - qInstallMessageHandler (nullptr); - ]])], - octave_cv_func_qinstallmessagehandler=yes, - octave_cv_func_qinstallmessagehandler=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qinstallmessagehandler = yes; then - AC_DEFINE(HAVE_QINSTALLMESSAGEHANDLER, 1, - [Define to 1 if you have the `qInstallMessageHandler' function.]) - fi -]) -dnl -dnl Check whether the Qt class QLineEdit has the setPlaceholderText member -dnl function. This member function was introduced in Qt 4.7. -dnl -dnl FIXME: Delete this entirely when we can safely assume that Qt 4.7 or later -dnl is in use everywhere, or when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT], [ - AC_CACHE_CHECK([for QLineEdit::setPlaceholderText in <QLinedEdit>], - [octave_cv_func_qlineedit_setplaceholdertext], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CPPFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QLineEdit> - ]], [[ - QLineEdit line_edit; - line_edit.setPlaceholderText ("placeholder text"); - ]])], - octave_cv_func_qlineedit_setplaceholdertext=yes, - octave_cv_func_qlineedit_setplaceholdertext=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qlineedit_setplaceholdertext = yes; then - AC_DEFINE(HAVE_QLINEEDIT_SETPLACEHOLDERTEXT, 1, - [Define to 1 if you have the `QLineEdit::setPlaceholderText' member function.]) - fi -]) -dnl -dnl Check whether the Qt QMouseEvent class has the localPos function. -dnl This function was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS], [ - AC_CACHE_CHECK([for QMouseEvent::localPos], - [octave_cv_func_qmouseevent_localpos], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CPPFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QMouseEvent> - ]], [[ - QMouseEvent *event; - event->localPos (); - ]])], - octave_cv_func_qmouseevent_localpos=yes, - octave_cv_func_qmouseevent_localpos=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qmouseevent_localpos = yes; then - AC_DEFINE(HAVE_QMOUSEEVENT_LOCALPOS, 1, - [Define to 1 if you have the `QMouseEvent::localPos' member function.]) - fi -]) -dnl -dnl Check whether QObject::findChildren accepts Qt::FindChildOptions -dnl argument. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS], [ - AC_CACHE_CHECK([whether QObject::findChildren accepts Qt::FindChildOptions], - [octave_cv_func_qobject_findchildren_accepts_findchildoptions], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QList> - #include <QObject> - #include <QWidget> - ]], [[ - QObject obj; - QList<QWidget *> widgets - = obj.findChildren<QWidget *> ("name", Qt::FindDirectChildrenOnly); - ]])], - octave_cv_func_qobject_findchildren_accepts_findchildoptions=yes, - octave_cv_func_qobject_findchildren_accepts_findchildoptions=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qobject_findchildren_accepts_findchildoptions = yes; then - AC_DEFINE(QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS, 1, - [Define to 1 if 'QObject::findChildren' accepts 'Qt::FindChildOptions' argument.]) - fi -]) -dnl dnl Check whether the Qt class QScreen has the devicePixelRatio member function. dnl This member function was introduced in Qt 5.5. dnl @@ -693,112 +393,6 @@ fi ]) dnl -dnl Check whether the Qt class QTabWidget has the setMovable member function. -dnl This member function was introduced in Qt 4.5. -dnl -dnl FIXME: Delete this entirely when we can safely assume that Qt 4.5 or later -dnl is in use everywhere, or when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE], [ - AC_CACHE_CHECK([for QTabWidget::setMovable in <QTabWidget>], - [octave_cv_func_qtabwidget_setmovable], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QTabWidget> - class tab_widget : public QTabWidget - { - public: - tab_widget (QWidget *parent = 0) : QTabWidget (parent) { this->setMovable (true); } - ~tab_widget () {} - }; - ]], [[ - tab_widget tw; - ]])], - octave_cv_func_qtabwidget_setmovable=yes, - octave_cv_func_qtabwidget_setmovable=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qtabwidget_setmovable = yes; then - AC_DEFINE(HAVE_QTABWIDGET_SETMOVABLE, 1, - [Define to 1 if you have the `QTabWidget::setMovable' member function.]) - fi -]) -dnl -dnl Check whether the Qt class QWheelEvent has the angleDelta member function. -dnl This member function was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA], [ - AC_CACHE_CHECK([for QWheelEvent::angleDelta in <QWheelEvent>], - [octave_cv_func_qwheelevent_angledelta], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QWheelEvent> - class wheel_event : public QWheelEvent - { - public: - wheel_event (QWidget *parent = 0) : QWheelEvent (parent) { this->angleDelta (); } - ~wheel_event () {} - }; - ]], [[ - wheel_event tw; - ]])], - octave_cv_func_qwheelevent_angledelta=yes, - octave_cv_func_qwheelevent_angledelta=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qwheelevent_angledelta = yes; then - AC_DEFINE(HAVE_QWHEELEVENT_ANGLEDELTA, 1, - [Define to 1 if you have the `QWheelEvent::angleDelta' member function.]) - fi -]) -dnl -dnl Check whether Qt message handler function accepts QMessageLogContext -dnl argument. This change was introduced in Qt 5. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT], [ - AC_CACHE_CHECK([whether Qt message handler accepts QMessageLogContext], - [octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QtGlobal> - static void - msg_handler (QtMsgType, const QMessageLogContext &, const QString &) - { } - ]], [[ - QtMessageHandler fptr = msg_handler; - ]])], - octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext=yes, - octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext = yes; then - AC_DEFINE(QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT, 1, - [Define to 1 if Qt message handler accepts 'QMessageLogContext' argument.]) - fi -]) -dnl dnl Check whether HDF5 library has version 1.6 API functions. dnl AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [ @@ -852,7 +446,7 @@ no) ifelse([$#], 10, [AC_MSG_ERROR([--without-m4_tolower($1) specified but $2 is required.])], - [warn_$1="--without-m4_tolower($1) specified. Functions or features that depend on $2 will be disabled." + [warn_$1="" m4_toupper([$1])_LIBS=]) ;; yes | "") @@ -1580,68 +1174,6 @@ AC_SUBST(TERM_LIBS) ]) dnl -dnl Check whether the Qt class QFont has the ForceIntegerMetrics enumerated -dnl type member. This property was introduced in Qt 4.7. -dnl -dnl FIXME: Delete this entirely when we can safely assume that Qt 4.7 or later -dnl is in use everywhere, or when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS], [ - AC_CACHE_CHECK([for QFont::ForceIntegerMetrics in <QFont>], - [octave_cv_decl_qfont_force_integer_metrics], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QFont> - ]], [[ - QFont::StyleStrategy strategy = QFont::ForceIntegerMetrics; - ]])], - octave_cv_decl_qfont_force_integer_metrics=yes, - octave_cv_decl_qfont_force_integer_metrics=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_decl_qfont_force_integer_metrics = yes; then - AC_DEFINE(HAVE_QFONT_FORCE_INTEGER_METRICS, 1, - [Define to 1 if `ForceIntegerMetrics' is a member of `QFont'.]) - fi -]) -dnl -dnl Check whether the Qt class QFont has the Monospace enumerated type member. -dnl This property was introduced in Qt 4.7. -dnl -dnl FIXME: Delete this entirely when we can safely assume that Qt 4.7 or later -dnl is in use everywhere, or when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE], [ - AC_CACHE_CHECK([for QFont::Monospace in <QFont>], - [octave_cv_decl_qfont_monospace], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QFont> - ]], [[ - QFont::StyleHint hint = QFont::Monospace; - ]])], - octave_cv_decl_qfont_monospace=yes, - octave_cv_decl_qfont_monospace=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_decl_qfont_monospace = yes; then - AC_DEFINE(HAVE_QFONT_MONOSPACE, 1, - [Define to 1 if `Monospace' is a member of `QFont'.]) - fi -]) -dnl dnl Check for the Qhull version. dnl AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [ @@ -1696,9 +1228,6 @@ ## Check for Qt libraries case "$qt_version" in - 4) - octave_qscintilla_libnames="qscintilla2-qt4 qscintilla2_qt4 qt4scintilla2 qscintilla2" - ;; 5) octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2" ;; @@ -1824,11 +1353,6 @@ if test $build_qt_gui = yes; then BUILD_QT_SUMMARY_MSG="yes (version: $have_qt_version)" - if test x"$have_qt_version" = x4; then - AC_DEFINE(HAVE_QT4, 1, [Define to 1 if using Qt version 4.]) - warn_qt_ver="Use of Qt version 4 is deprecated. Support will be removed in Octave version 7." - OCTAVE_CONFIGURE_WARNING([warn_qt_ver]) - fi if test x"$have_qt_version" = x5; then AC_DEFINE(HAVE_QT5, 1, [Define to 1 if using Qt version 5.]) fi @@ -2036,10 +1560,6 @@ ## Check for Qt libraries case "$qt_version" in - 4) - QT_OPENGL_MODULE="QtOpenGL" - QT_MODULES="QtCore QtGui QtNetwork QtHelp QtXml" - ;; 5) QT_OPENGL_MODULE="Qt5OpenGL" QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5PrintSupport Qt5Help Qt5Xml" @@ -2091,14 +1611,6 @@ fi ;; esac - - if test $qt_version = 4; then - ## Check for Qt4 - if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then - build_qt_gui=no - warn_qt_version="Qt >= 4.0.0 not found; disabling Qt GUI" - fi - fi fi QT_TOOLS_AVAILABLE= @@ -2163,18 +1675,6 @@ fi if test $build_qt_gui = yes; then - OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL - - if test $octave_cv_func_qabstractitemmodel_beginresetmodel = no; then - build_qt_gui=no - warn_qt_abstract_item_model="QAbstractItemModel::beginResetModel not found; disabling Qt GUI" - ## Invalidate cache so that this test will be done again if we - ## perform the test with a different Qt version. - $as_unset octave_cv_func_qabstractitemmodel_beginresetmodel - fi - fi - - if test $build_qt_gui = yes; then ## We have what we need to build the Qt GUI. The remaining ## checks below are for optional features related to the Qt GUI. @@ -2192,23 +1692,9 @@ ## tests if they fail because we have already decided that the Qt ## version that we are testing now will be the one used. - OCTAVE_CHECK_FUNC_QCOMBOBOX_SETCURRENTTEXT OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME - OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE - OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE - OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT - OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER - OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT - OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS - OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO - OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE - OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT - OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA - OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS - OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE - OCTAVE_HAVE_QGUIAPPLICATION if test -n "$OPENGL_LIBS"; then OCTAVE_CHECK_QT_OPENGL_OK([build_qt_graphics=yes], @@ -2668,36 +2154,6 @@ fi ]) dnl -dnl Check whether the Qt class QGuiApplication exists. -dnl This class was introduced in Qt 5.0. -dnl -dnl FIXME: Delete this entirely when we drop support for Qt 4. -dnl -AC_DEFUN([OCTAVE_HAVE_QGUIAPPLICATION], [ - AC_CACHE_CHECK([for QGuiApplication], - [octave_cv_decl_qguiapplication], - [AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" - CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <QGuiApplication> - ]], [[ - QScreen *pscreen = QGuiApplication::primaryScreen (); - ]])], - octave_cv_decl_qguiapplication=yes, - octave_cv_decl_qguiapplication=no) - CPPFLAGS="$ac_octave_save_CPPFLAGS" - CXXFLAGS="$ac_octave_save_CXXFLAGS" - AC_LANG_POP(C++) - ]) - if test $octave_cv_decl_qguiapplication = yes; then - AC_DEFINE(HAVE_QGUIAPPLICATION, 1, - [Define to 1 if `QGuiApplication' class is available.]) - fi -]) -dnl dnl Check for IEEE 754 data format. dnl AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT], [
--- a/scripts/deprecated/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/scripts/deprecated/module.mk Fri May 22 11:06:58 2020 +0200 @@ -1,7 +1,6 @@ FCN_FILE_DIRS += %reldir% %canon_reldir%_FCN_FILES = \ - %reldir%/output_max_field_width.m \ %reldir%/runtests.m %canon_reldir%dir = $(fcnfiledir)/deprecated
--- a/scripts/deprecated/output_max_field_width.m Wed May 06 10:05:36 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -######################################################################## -## -## Copyright (C) 2018-2020 The Octave Project Developers -## -## See the file COPYRIGHT.md in the top-level directory of this -## distribution or <https://octave.org/copyright/>. -## -## 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{val} =} output_max_field_width () -## @deftypefnx {} {@var{old_val} =} output_max_field_width (@var{new_val}) -## @deftypefnx {} {} output_max_field_width (@var{new_val}, "local") -## -## @code{output_max_field_width} is deprecated and will be removed in Octave -## version 7. Use @code{output_precision} instead. -## -## Query or set the internal variable that specifies the maximum width -## of a numeric output field. -## -## When called from inside a function with the @qcode{"local"} option, the -## variable is changed locally for the function and any subroutines it calls. -## The original variable value is restored when exiting the function. -## @seealso{format, fixed_point_format, output_precision} -## @end deftypefn - -## FIXME: DEPRECATED: Remove in version 7. - -function retval = output_max_field_width (varargin) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "output_max_field_width is obsolete and will be removed from a future version of Octave, please use output_precision instead\n"); - endif - - retval = 20; - -endfunction
--- a/scripts/general/cart2pol.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/general/cart2pol.m Fri May 22 11:06:58 2020 +0200 @@ -28,21 +28,47 @@ ## @deftypefnx {} {[@var{theta}, @var{r}, @var{z}] =} cart2pol (@var{x}, @var{y}, @var{z}) ## @deftypefnx {} {[@var{theta}, @var{r}] =} cart2pol (@var{C}) ## @deftypefnx {} {[@var{theta}, @var{r}, @var{z}] =} cart2pol (@var{C}) -## @deftypefnx {} {@var{P} =} cart2pol (@dots{}) ## ## Transform Cartesian coordinates to polar or cylindrical coordinates. ## ## The inputs @var{x}, @var{y} (, and @var{z}) must be the same shape, or ## scalar. If called with a single matrix argument then each row of @var{C} -## represents the Cartesian coordinate (@var{x}, @var{y} (, @var{z})). +## represents the Cartesian coordinate pair (@var{x}, @var{y}) or triplet +## (@var{x}, @var{y}, @var{z}). ## -## @var{theta} describes the angle relative to the positive x-axis. +## The outputs @var{theta}, @var{r} (, and @var{z}) match the shape of the +## inputs. For a matrix input @var{C} the outputs will be column vectors with +## rows corresponding to the rows of the input matrix. +## +## @var{theta} describes the angle relative to the positive x-axis measured in +## the xy-plane. ## ## @var{r} is the distance to the z-axis @w{(0, 0, z)}. ## -## If only a single return argument is requested then return a matrix @var{P} -## where each row represents one polar/(cylindrical) coordinate -## (@var{theta}, @var{phi} (, @var{z})). +## @var{z}, if present, is unchanged by the transformation. +## +## The coordinate transformation is computed using: +## +## @tex +## $$ \theta = \arctan \left ( {y \over x} \right ) $$ +## $$ r = \sqrt{x^2 + y^2} $$ +## $$ z = z $$ +## @end tex +## @ifnottex +## +## @example +## @group +## @var{theta} = arctan (@var{y} / @var{x}) +## @var{r} = sqrt (@var{x}^2 + @var{y}^2) +## @var{z} = @var{z} +## @end group +## @end example +## +## @end ifnottex +## +## @c FIXME: Remove this note in Octave 9.1 (two releases after 7.1). +## Note: For @sc{matlab} compatibility, this function no longer returns a full +## coordinate matrix when called with a single return argument. ## @seealso{pol2cart, cart2sph, sph2cart} ## @end deftypefn @@ -53,44 +79,54 @@ endif if (nargin == 1) - if (! (isnumeric (x) && ismatrix (x) - && (columns (x) == 2 || columns (x) == 3))) - error ("cart2pol: matrix input must have 2 or 3 columns [X, Y (, Z)]"); + if (! (isnumeric (x) && ismatrix (x))) + error ("cart2pol: matrix input must be 2-D numeric array"); endif - if (columns (x) == 3) - z = x(:,3); + if (isvector (x)) + n = numel (x); + if (n != 2 && n != 3) + error ("cart2pol: matrix input must be a 2- or 3-element vector or a 2- or 3-column array"); + endif + if (n == 3) + z = x(3); + endif + y = x(2); + x = x(1); + else + ncols = columns (x); + if (ncols != 2 && ncols != 3) + error ("cart2pol: matrix input must be a 2- or 3-element vector or a 2- or 3-column array"); + endif + + if (ncols == 3) + z = x(:,3); + endif + y = x(:,2); + x = x(:,1); endif - y = x(:,2); - x = x(:,1); + elseif (nargin == 2) - if (! isnumeric (x) || ! isnumeric (y)) - error ("cart2pol: X, Y must be numeric arrays of the same size, or scalar"); + if (! (isnumeric (x) && isnumeric (y))) + error ("cart2pol: X, Y must be numeric arrays or scalars"); endif [err, x, y] = common_size (x, y); if (err) - error ("cart2pol: X, Y must be numeric arrays of the same size, or scalar"); + error ("cart2pol: X, Y must be the same size or scalars"); endif + elseif (nargin == 3) - if (! isnumeric (x) || ! isnumeric (y) || ! isnumeric (z)) - error ("cart2pol: X, Y, Z must be numeric arrays of the same size, or scalar"); + if (! (isnumeric (x) && isnumeric (y) && isnumeric (z))) + error ("cart2pol: X, Y, Z must be numeric arrays or scalars"); endif [err, x, y, z] = common_size (x, y, z); if (err) - error ("cart2pol: X, Y, Z must be numeric arrays of the same size, or scalar"); + error ("cart2pol: X, Y, Z must be the same size or scalars"); endif endif theta = atan2 (y, x); r = sqrt (x .^ 2 + y .^ 2); - if (nargout <= 1) - if (isempty (z)) - theta = [theta(:), r(:)]; - else - theta = [theta(:), r(:), z(:)]; - endif - endif - endfunction @@ -104,9 +140,16 @@ %!test %! x = [0, 1, 2]; %! y = [0, 1, 2]; -%! P = cart2pol (x, y); -%! assert (P(:,1), [0; pi/4; pi/4], sqrt (eps)); -%! assert (P(:,2), sqrt (2)*[0; 1; 2], sqrt (eps)); +%! [t, r] = cart2pol (x, y); +%! assert (t, [0, pi/4, pi/4], eps); +%! assert (r, sqrt (2)*[0, 1, 2], eps); + +%!test +%! x = [0, 1, 2]'; +%! y = [0, 1, 2]'; +%! [t, r] = cart2pol (x, y); +%! assert (t, [0; pi/4; pi/4], eps); +%! assert (r, sqrt (2)*[0; 1; 2], eps); %!test %! x = [0, 1, 2]; @@ -146,13 +189,23 @@ %!test %! C = [0, 0; 1, 1; 2, 2]; -%! P = [0, 0; pi/4, sqrt(2); pi/4, 2*sqrt(2)]; -%! assert (cart2pol (C), P, sqrt (eps)); +%! [t, r] = cart2pol (C); +%! assert (t, [0; 1; 1]*pi/4, eps); +%! assert (r, [0; 1; 2]*sqrt(2), eps); %!test %! C = [0, 0, 0; 1, 1, 1; 2, 2, 2]; -%! P = [0, 0, 0; pi/4, sqrt(2), 1; pi/4, 2*sqrt(2), 2]; -%! assert (cart2pol (C), P, sqrt (eps)); +%! [t, r, z] = cart2pol (C); +%! assert (t, [0; 1; 1]*pi/4, eps); +%! assert (r, [0; 1; 2]*sqrt(2), eps); +%! assert (z, [0; 1; 2]); + +%!test +%! C = [0, 0, 0; 1, 1, 1; 2, 2, 2;1, 1, 1]; +%! [t, r, z] = cart2pol (C); +%! assert (t, [0; 1; 1; 1]*pi/4, eps); +%! assert (r, [0; 1; 2; 1]*sqrt(2), eps); +%! assert (z, [0; 1; 2; 1]); %!test %! x = zeros (1, 1, 1, 2); @@ -179,15 +232,17 @@ ## Test input validation %!error cart2pol () %!error cart2pol (1,2,3,4) -%!error <matrix input must have 2 or 3 columns> cart2pol ({1,2,3}) -%!error <matrix input must have 2 or 3 columns> cart2pol (ones (3,3,2)) -%!error <matrix input must have 2 or 3 columns> cart2pol ([1]) -%!error <matrix input must have 2 or 3 columns> cart2pol ([1,2,3,4]) -%!error <numeric arrays of the same size> cart2pol ({1,2,3}, [1,2,3]) -%!error <numeric arrays of the same size> cart2pol ([1,2,3], {1,2,3}) -%!error <numeric arrays of the same size> cart2pol (ones (3,3,3), ones (3,2,3)) -%!error <numeric arrays of the same size> cart2pol ({1,2,3}, [1,2,3], [1,2,3]) -%!error <numeric arrays of the same size> cart2pol ([1,2,3], {1,2,3}, [1,2,3]) -%!error <numeric arrays of the same size> cart2pol ([1,2,3], [1,2,3], {1,2,3}) -%!error <numeric arrays of the same size> cart2pol (ones (3,3,3), 1, ones (3,2,3)) -%!error <numeric arrays of the same size> cart2pol (ones (3,3,3), ones (3,2,3), 1) +%!error <matrix input must be 2-D numeric array> cart2pol ({1,2,3}) +%!error <matrix input must be 2-D numeric array> cart2pol (ones (3,3,2)) +%!error <matrix input must be a 2- or 3-element> cart2pol ([1]) +%!error <matrix input must be a 2- or 3-element> cart2pol ([1,2,3,4]) +%!error <must be numeric arrays or scalars> cart2pol ({1,2,3}, [1,2,3]) +%!error <must be numeric arrays or scalars> cart2pol ([1,2,3], {1,2,3}) +%!error <must be the same size or scalars> cart2pol (ones (3,3,3), ones (3,2,3)) +%!error <must be the same size or scalars> cart2pol ([1; 1], [2, 2]) +%!error <must be the same size or scalars> cart2pol ([1; 1], [2, 2], [3, 3]) +%!error <must be numeric arrays or scalars> cart2pol ({1,2,3}, [1,2,3], [1,2,3]) +%!error <must be numeric arrays or scalars> cart2pol ([1,2,3], {1,2,3}, [1,2,3]) +%!error <must be numeric arrays or scalars> cart2pol ([1,2,3], [1,2,3], {1,2,3}) +%!error <must be the same size or scalars> cart2pol (ones (3,3,3), 1, ones (3,2,3)) +%!error <must be the same size or scalars> cart2pol (ones (3,3,3), ones (3,2,3), 1)
--- a/scripts/general/cart2sph.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/general/cart2sph.m Fri May 22 11:06:58 2020 +0200 @@ -26,22 +26,45 @@ ## -*- texinfo -*- ## @deftypefn {} {[@var{theta}, @var{phi}, @var{r}] =} cart2sph (@var{x}, @var{y}, @var{z}) ## @deftypefnx {} {[@var{theta}, @var{phi}, @var{r}] =} cart2sph (@var{C}) -## @deftypefnx {} {@var{S} =} cart2sph (@dots{}) ## Transform Cartesian coordinates to spherical coordinates. ## ## The inputs @var{x}, @var{y}, and @var{z} must be the same shape, or scalar. -## If called with a single matrix argument then each row of @var{C} represents -## the Cartesian coordinate (@var{x}, @var{y}, @var{z}). +## If called with a single matrix argument then each row of @var{C} must +## represent a Cartesian coordinate triplet (@var{x}, @var{y}, @var{z}). ## -## @var{theta} describes the angle relative to the positive x-axis. +## The outputs @var{theta}, @var{phi}, @var{r} match the shape of the inputs. +## For a matrix input @var{C} the outputs will be column vectors with rows +## corresponding to the rows of the input matrix. ## -## @var{phi} is the angle relative to the xy-plane. +## @var{theta} describes the azimuth angle relative to the positive x-axis +## measured in the xy-plane. +## +## @var{phi} is the elevation angle measured relative to the xy-plane. ## ## @var{r} is the distance to the origin @w{(0, 0, 0)}. ## -## If only a single return argument is requested then return a matrix @var{S} -## where each row represents one spherical coordinate -## (@var{theta}, @var{phi}, @var{r}). +## The coordinate transformation is computed using: +## +## @tex +## $$ \theta = \arctan \left ({y \over x} \right ) $$ +## $$ \phi = \arctan \left ( {z \over {\sqrt{x^2+y^2}}} \right ) $$ +## $$ r = \sqrt{x^2 + y^2 + z^2} $$ +## @end tex +## @ifnottex +## +## @example +## @group +## @var{theta} = arctan (@var{y} / @var{x}) +## @var{phi} = arctan (@var{z} / sqrt (@var{x}^2 + @var{y}^2)) +## @var{r} = sqrt (@var{x}^2 + @var{y}^2 + @var{z}^2) +## @end group +## @end example +## +## @end ifnottex +## +## @c FIXME: Remove this note in Octave 9.1 (two releases after 7.1). +## Note: For @sc{matlab} compatibility, this function no longer returns a full +## coordinate matrix when called with a single return argument. ## @seealso{sph2cart, cart2pol, pol2cart} ## @end deftypefn @@ -52,19 +75,29 @@ endif if (nargin == 1) - if (! (isnumeric (x) && ismatrix (x) && columns (x) == 3)) - error ("cart2sph: matrix input must have 3 columns [X, Y, Z]"); + if (! (isnumeric (x) && ismatrix (x))) + error ("cart2sph: matrix input C must be a 2-D numeric array"); + elseif (columns (x) != 3 && numel (x) != 3) + error ("cart2sph: matrix input C must be a 3-element vector or 3-column array"); endif - z = x(:,3); - y = x(:,2); - x = x(:,1); + + if (numel (x) == 3) + z = x(3); + y = x(2); + x = x(1); + else + z = x(:,3); + y = x(:,2); + x = x(:,1); + endif + else - if (! isnumeric (x) || ! isnumeric (y) || ! isnumeric (z)) - error ("cart2sph: X, Y, Z must be numeric arrays of the same size, or scalar"); + if (! (isnumeric (x) && isnumeric (y) && isnumeric (z))) + error ("cart2sph: X, Y, Z must be numeric arrays or scalars"); endif [err, x, y, z] = common_size (x, y, z); if (err) - error ("cart2sph: X, Y, Z must be numeric arrays of the same size, or scalar"); + error ("cart2sph: X, Y, Z must be the same size or scalars"); endif endif @@ -72,10 +105,6 @@ phi = atan2 (z, sqrt (x .^ 2 + y .^ 2)); r = sqrt (x .^ 2 + y .^ 2 + z .^ 2); - if (nargout <= 1) - theta = [theta(:), phi(:), r(:)]; - endif - endfunction @@ -89,13 +118,22 @@ %! assert (r, [0, 1, 2]*sqrt (3), eps); %!test +%! x = [0; 1; 2]; +%! y = [0; 1; 2]; +%! z = [0; 1; 2]; +%! [t, p, r] = cart2sph (x, y, z); +%! assert (t, [0; pi/4; pi/4], eps); +%! assert (p, [0; 1; 1] * atan (sqrt (0.5)), eps); +%! assert (r, [0; 1; 2] * sqrt (3), eps); + +%!test %! x = 0; %! y = [0, 1, 2]; %! z = [0, 1, 2]; -%! S = cart2sph (x, y, z); -%! assert (S(:,1), [0; 1; 1] * pi/2, eps); -%! assert (S(:,2), [0; 1; 1] * pi/4, eps); -%! assert (S(:,3), [0; 1; 2] * sqrt (2), eps); +%! [t, p, r] = cart2sph (x, y, z); +%! assert (t, [0, 1, 1] * pi/2, eps); +%! assert (p, [0, 1, 1] * pi/4, eps); +%! assert (r, [0, 1, 2] * sqrt (2), eps); %!test %! x = [0, 1, 2]; @@ -103,17 +141,17 @@ %! z = [0, 1, 2]; %! [t, p, r] = cart2sph (x, y, z); %! assert (t, [0, 0, 0]); -%! assert (p, [0, 1, 1] * pi/4); -%! assert (r, [0, 1, 2] * sqrt (2)); +%! assert (p, [0, 1, 1] * pi/4, eps); +%! assert (r, [0, 1, 2] * sqrt (2), eps); %!test %! x = [0, 1, 2]; %! y = [0, 1, 2]; %! z = 0; %! [t, p, r] = cart2sph (x, y, z); -%! assert (t, [0, 1, 1] * pi/4); +%! assert (t, [0, 1, 1] * pi/4, eps); %! assert (p, [0, 0, 0]); -%! assert (r, [0, 1, 2] * sqrt (2)); +%! assert (r, [0, 1, 2] * sqrt (2), eps); %!test %! x = 0; @@ -121,13 +159,22 @@ %! z = [0, 1, 2]; %! [t, p, r] = cart2sph (x, y, z); %! assert (t, [0, 0, 0]); -%! assert (p, [0, 1, 1] * pi/2); +%! assert (p, [0, 1, 1] * pi/2, eps); %! assert (r, [0, 1, 2]); %!test %! C = [0, 0, 0; 1, 0, 1; 2, 0, 2]; -%! S = [0, 0, 0; 0, pi/4, sqrt(2); 0, pi/4, 2*sqrt(2)]; -%! assert (cart2sph (C), S, eps); +%! [t, p, r] = cart2sph (C); +%! assert (t, [0; 0; 0]); +%! assert (p, [0; 1; 1] * pi/4, eps); +%! assert (r, [0; 1; 2] * sqrt (2), eps); + +%!test +%! C = [0, 0, 0; 1, 0, 1; 2, 0, 2; 1, 0, 1]; +%! [t, p, r] = cart2sph (C); +%! assert (t, [0; 0; 0; 0]); +%! assert (p, [0; 1; 1; 1] * pi/4, eps); +%! assert (r, [0; 1; 2; 1] * sqrt (2), eps); %!test %! [x, y, z] = meshgrid ([0, 1], [0, 1], [0, 1]); @@ -145,11 +192,13 @@ %!error cart2sph () %!error cart2sph (1,2) %!error cart2sph (1,2,3,4) -%!error <matrix input must have 3 columns> cart2sph ({1,2,3}) -%!error <matrix input must have 3 columns> cart2sph (ones (3,3,2)) -%!error <matrix input must have 3 columns> cart2sph ([1,2,3,4]) -%!error <numeric arrays of the same size> cart2sph ({1,2,3}, [1,2,3], [1,2,3]) -%!error <numeric arrays of the same size> cart2sph ([1,2,3], {1,2,3}, [1,2,3]) -%!error <numeric arrays of the same size> cart2sph ([1,2,3], [1,2,3], {1,2,3}) -%!error <numeric arrays of the same size> cart2sph (ones (3,3,3), 1, ones (3,2,3)) -%!error <numeric arrays of the same size> cart2sph (ones (3,3,3), ones (3,2,3), 1) +%!error <matrix input C must be a 2-D numeric array> cart2sph ({1,2,3}) +%!error <matrix input C must be a 2-D numeric array> cart2sph (ones (3,3,2)) +%!error <matrix input C must be a 3-element> cart2sph ([1,2,3,4]) +%!error <matrix input C must be a 3-element> cart2sph ([1,2,3,4; 1,2,3,4; 1,2,3,4]) +%!error <must be numeric arrays or scalars> cart2sph ({1,2,3}, [1,2,3], [1,2,3]) +%!error <must be numeric arrays or scalars> cart2sph ([1,2,3], {1,2,3}, [1,2,3]) +%!error <must be numeric arrays or scalars> cart2sph ([1,2,3], [1,2,3], {1,2,3}) +%!error <must be the same size or scalars> cart2sph ([1,2,3], [1,2,3], [1,2,3]') +%!error <must be the same size or scalars> cart2sph (ones (3,3,3), 1, ones (3,2,3)) +%!error <must be the same size or scalars> cart2sph (ones (3,3,3), ones (3,2,3), 1)
--- a/scripts/general/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/scripts/general/module.mk Fri May 22 11:06:58 2020 +0200 @@ -60,6 +60,7 @@ %reldir%/repelem.m \ %reldir%/repmat.m \ %reldir%/rescale.m \ + %reldir%/rng.m \ %reldir%/rot90.m \ %reldir%/rotdim.m \ %reldir%/shift.m \
--- a/scripts/general/pol2cart.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/general/pol2cart.m Fri May 22 11:06:58 2020 +0200 @@ -28,21 +28,43 @@ ## @deftypefnx {} {[@var{x}, @var{y}, @var{z}] =} pol2cart (@var{theta}, @var{r}, @var{z}) ## @deftypefnx {} {[@var{x}, @var{y}] =} pol2cart (@var{P}) ## @deftypefnx {} {[@var{x}, @var{y}, @var{z}] =} pol2cart (@var{P}) -## @deftypefnx {} {@var{C} =} pol2cart (@dots{}) ## Transform polar or cylindrical coordinates to Cartesian coordinates. ## ## The inputs @var{theta}, @var{r}, (and @var{z}) must be the same shape, or ## scalar. If called with a single matrix argument then each row of @var{P} -## represents the polar/(cylindrical) coordinate (@var{theta}, @var{r} -## (, @var{z})). +## represents the polar coordinate pair (@var{theta}, @var{r}) or the +## cylindrical triplet (@var{theta}, @var{r}, @var{z}). +## +## The outputs @var{x}, @var{y} (, and @var{z}) match the shape of the inputs. +## For a matrix input @var{P} the outputs will be column vectors with rows +## corresponding to the rows of the input matrix. ## -## @var{theta} describes the angle relative to the positive x-axis. +## @var{theta} describes the angle relative to the positive x-axis measured in +## the xy-plane. +## +## @var{r} is the distance to the z-axis @w{(0, 0, z)}. +## +## @var{z}, if present, is unchanged by the transformation. +## +## The coordinate transformation is computed using: ## -## @var{r} is the distance to the z-axis (0, 0, z). +## @tex +## $$ x = r \cos \theta $$ +## $$ y = r \sin \theta $$ +## $$ z = z $$ +## @end tex +## @ifnottex ## -## If only a single return argument is requested then return a matrix @var{C} -## where each row represents one Cartesian coordinate -## (@var{x}, @var{y} (, @var{z})). +## @example +## @var{x} = @var{r} * cos (@var{theta}) +## @var{y} = @var{r} * sin (@var{theta}) +## @var{z} = @var{z} +## @end example +## +## @end ifnottex +## @c FIXME: Remove this note in Octave 9.1 (two releases after 7.1). +## Note: For @sc{matlab} compatibility, this function no longer returns a full +## coordinate matrix when called with a single return argument. ## @seealso{cart2pol, sph2cart, cart2sph} ## @end deftypefn @@ -53,44 +75,55 @@ endif if (nargin == 1) - if (! (isnumeric (theta) && ismatrix (theta) - && (columns (theta) == 2 || columns (theta) == 3))) - error ("pol2cart: matrix input must have 2 or 3 columns [THETA, R (, Z)]"); + if (! (isnumeric (theta) && ismatrix (theta))) + error ("cart2pol: matrix input P must be 2-D numeric array"); endif - if (columns (theta) == 3) - z = theta(:,3); + if (isvector (theta)) + n = numel (theta); + if (n != 2 && n != 3) + error ("cart2pol: matrix input must be a 2- or 3-element vector or a 2- or 3-column array"); + endif + if (n == 3) + z = theta(3); + endif + r = theta(2); + theta = theta(1); + + else + ncols = columns(theta); + if (ncols != 2 && ncols != 3) + error ("cart2pol: matrix input must be a 2- or 3-element vector or a 2- or 3-column array"); + endif + + if (ncols == 3) + z = theta(:,3); + endif + r = theta(:,2); + theta = theta(:,1); endif - r = theta(:,2); - theta = theta(:,1); + elseif (nargin == 2) - if (! isnumeric (theta) || ! isnumeric (r)) - error ("pol2cart: THETA, R must be numeric arrays of the same size, or scalar"); + if (! (isnumeric (theta) && isnumeric (r))) + error ("pol2cart: THETA, R must be numeric arrays or scalars"); endif [err, theta, r] = common_size (theta, r); if (err) - error ("pol2cart: THETA, R must be numeric arrays of the same size, or scalar"); + error ("pol2cart: THETA, R must be the same size or scalars"); endif + elseif (nargin == 3) - if (! isnumeric (theta) || ! isnumeric (r) || ! isnumeric (z)) - error ("pol2cart: THETA, R, Z must be numeric arrays of the same size, or scalar"); + if (! (isnumeric (theta) && isnumeric (r) && isnumeric (z))) + error ("pol2cart: THETA, R, Z must be numeric arrays or scalars"); endif [err, theta, r, z] = common_size (theta, r, z); if (err) - error ("pol2cart: THETA, R, Z must be numeric arrays of the same size, or scalar"); + error ("pol2cart: THETA, R, Z must be the same size or scalars"); endif endif x = r .* cos (theta); y = r .* sin (theta); - if (nargout <= 1) - if (isempty (z)) - x = [x(:), y(:)]; - else - x = [x(:), y(:), z(:)]; - endif - endif - endfunction @@ -98,32 +131,42 @@ %! t = [0, 0.5, 1] * pi; %! r = 1; %! [x, y] = pol2cart (t, r); -%! assert (x, [1, 0, -1], sqrt (eps)); -%! assert (y, [0, 1, 0], sqrt (eps)); +%! assert (x, [1, 0, -1], eps); +%! assert (y, [0, 1, 0], eps); %!test %! t = [0, 1, 1] * pi/4; %! r = sqrt (2) * [0, 1, 2]; -%! C = pol2cart (t, r); -%! assert (C(:,1), [0; 1; 2], sqrt (eps)); -%! assert (C(:,2), [0; 1; 2], sqrt (eps)); +%! [x, y] = pol2cart (t, r); +%! assert (x, [0, 1, 2], 2*eps); +%! assert (y, [0, 1, 2], 2*eps); %!test %! t = [0, 1, 1] * pi/4; %! r = sqrt (2) * [0, 1, 2]; %! z = [0, 1, 2]; %! [x, y, z2] = pol2cart (t, r, z); -%! assert (x, [0, 1, 2], sqrt (eps)); -%! assert (y, [0, 1, 2], sqrt (eps)); +%! assert (x, [0, 1, 2], 2*eps); +%! assert (y, [0, 1, 2], 2*eps); %! assert (z2, z); %!test +%! t = [0; 1; 1] * pi/4; +%! r = sqrt (2) * [0; 1; 2]; +%! z = [0; 1; 2]; +%! [x, y, z2] = pol2cart (t, r, z); +%! assert (x, [0; 1; 2], 2*eps); +%! assert (y, [0; 1; 2], 2*eps); +%! assert (z2, z); + + +%!test %! t = 0; %! r = [0, 1, 2]; %! z = [0, 1, 2]; %! [x, y, z2] = pol2cart (t, r, z); -%! assert (x, [0, 1, 2], sqrt (eps)); -%! assert (y, [0, 0, 0], sqrt (eps)); +%! assert (x, [0, 1, 2], eps); +%! assert (y, [0, 0, 0], eps); %! assert (z2, z); %!test @@ -146,13 +189,23 @@ %!test %! P = [0, 0; pi/4, sqrt(2); pi/4, 2*sqrt(2)]; -%! C = [0, 0; 1, 1; 2, 2]; -%! assert (pol2cart (P), C, sqrt (eps)); +%! [x, y] = pol2cart(P); +%! assert (x, [0; 1; 2], 2*eps); +%! assert (y, [0; 1; 2], 2*eps); %!test %! P = [0, 0, 0; pi/4, sqrt(2), 1; pi/4, 2*sqrt(2), 2]; -%! C = [0, 0, 0; 1, 1, 1; 2, 2, 2]; -%! assert (pol2cart (P), C, sqrt (eps)); +%! [x, y, z] = pol2cart(P); +%! assert (x, [0; 1; 2], 2*eps); +%! assert (y, [0; 1; 2], 2*eps); +%! assert (z, P(:,3), 2*eps); + +%!test +%! P = [0, 0, 0; pi/4, sqrt(2), 1; pi/4, 2*sqrt(2), 2; 0, 0, 0]; +%! [x, y, z] = pol2cart(P); +%! assert (x, [0; 1; 2; 0], 2*eps); +%! assert (y, [0; 1; 2; 0], 2*eps); +%! assert (z, P(:,3), 2*eps); %!test %! r = ones (1, 1, 1, 2); @@ -182,15 +235,17 @@ ## Test input validation %!error pol2cart () %!error pol2cart (1,2,3,4) -%!error <matrix input must have 2 or 3 columns> pol2cart ({1,2,3}) -%!error <matrix input must have 2 or 3 columns> pol2cart (ones (3,3,2)) -%!error <matrix input must have 2 or 3 columns> pol2cart ([1]) -%!error <matrix input must have 2 or 3 columns> pol2cart ([1,2,3,4]) -%!error <numeric arrays of the same size> pol2cart ({1,2,3}, [1,2,3]) -%!error <numeric arrays of the same size> pol2cart ([1,2,3], {1,2,3}) -%!error <numeric arrays of the same size> pol2cart (ones (3,3,3), ones (3,2,3)) -%!error <numeric arrays of the same size> pol2cart ({1,2,3}, [1,2,3], [1,2,3]) -%!error <numeric arrays of the same size> pol2cart ([1,2,3], {1,2,3}, [1,2,3]) -%!error <numeric arrays of the same size> pol2cart ([1,2,3], [1,2,3], {1,2,3}) -%!error <numeric arrays of the same size> pol2cart (ones (3,3,3), 1, ones (3,2,3)) -%!error <numeric arrays of the same size> pol2cart (ones (3,3,3), ones (3,2,3), 1) +%!error <matrix input P must be 2-D numeric array> pol2cart ({1,2,3}) +%!error <matrix input P must be 2-D numeric array> pol2cart (ones (3,3,2)) +%!error <matrix input must be a 2- or 3-element> pol2cart ([1]) +%!error <matrix input must be a 2- or 3-element> pol2cart ([1,2,3,4]) +%!error <must be numeric arrays or scalars> pol2cart ({1,2,3}, [1,2,3]) +%!error <must be numeric arrays or scalars> pol2cart ([1,2,3], {1,2,3}) +%!error <must be the same size or scalars> pol2cart (ones (3,3,3), ones (3,2,3)) +%!error <must be the same size or scalars> pol2cart ([1; 1], [2, 2]) +%!error <must be the same size or scalars> pol2cart ([1; 1], [2, 2], [3, 3]) +%!error <must be numeric arrays or scalars> pol2cart ({1,2,3}, [1,2,3], [1,2,3]) +%!error <must be numeric arrays or scalars> pol2cart ([1,2,3], {1,2,3}, [1,2,3]) +%!error <must be numeric arrays or scalars> pol2cart ([1,2,3], [1,2,3], {1,2,3}) +%!error <must be the same size or scalars> pol2cart (ones (3,3,3), 1, ones (3,2,3)) +%!error <must be the same size or scalars> pol2cart (ones (3,3,3), ones (3,2,3), 1)
--- a/scripts/general/randi.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/general/randi.m Fri May 22 11:06:58 2020 +0200 @@ -189,13 +189,9 @@ ## Test that no warning thrown if IMAX is exactly on the limits of the range %!function test_no_warning (func, varargin) -%! state = warning ("query"); -%! unwind_protect -%! warning ("error", "all"); -%! func (varargin{:}); -%! unwind_protect_cleanup -%! warning (state); -%! end_unwind_protect +%! lastwarn (""); +%! func (varargin{:}); +%! assert (lastwarn (), ""); %!endfunction %!test test_no_warning (@randi, max_int8, "int8"); %!test test_no_warning (@randi, max_uint8, "uint8");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/general/rng.m Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,303 @@ +######################################################################## +## +## Copyright (C) 2020 The Octave Project Developers +## +## See the file COPYRIGHT.md in the top-level directory of this +## distribution or <https://octave.org/copyright/>. +## +## 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 {} {} rng (@var{seed}) +## @deftypefnx {} {} rng (@var{seed}, "@var{generator}") +## @deftypefnx {} {} rng ("shuffle") +## @deftypefnx {} {} rng ("shuffle", "@var{generator}") +## @deftypefnx {} {} rng ("default") +## @deftypefnx {} {@var{s} =} rng () +## @deftypefnx {} {} rng (@var{s}) +## @deftypefnx {} {@var{s} =} rng (@dots{}) +## Set or query the seed of the random number generator used by @code{rand} and +## @code{randn}. +## +## The input @code{seed} is a scalar numeric value used to initialize the state +## vector of the random number generator. +## +## The optional string @var{generator} specifies the type of random number +## generator to be used. Its value can be @qcode{"twister"}, +## @qcode{"v5uniform"}, or @qcode{"v5normal"}. The @qcode{"twister"} keyword +## is described below. @qcode{"v5uniform"} and @qcode{"v5normal"} refer to +## older versions of Octave that used to use a different random number +## generator. +## +## The state or seed of the random number generator can be reset to a new +## random value using the @qcode{"shuffle"} keyword. +## +## The random number generator can be reset to default values using the +## @qcode{"default"} keyword. The default values are to use the Mersenne +## Twister generator with a seed of 0. +## +## The optional return value @var{s} contains the state of the random number +## generator at the time the function is called (i.e., before it might be +## modified according to the input arguments). It is encoded as a structure +## variable with three fields: @qcode{"Type"}, @qcode{"Seed"}, and +## @qcode{"State"}. The random number generator can be restored to the state +## @var{s} using @code{rng (@var{s})}. This is useful when the identical +## sequence of pseudo-random numbers is required for an algorithm. +## +## By default, and with the @qcode{"twister"} option, pseudo-random sequences +## are computed using the Mersenne Twister with a period of @math{2^{19937}-1} +## (See @nospell{M. Matsumoto and T. Nishimura}, +## @cite{Mersenne Twister: A 623-dimensionally equidistributed uniform +## pseudorandom number generator}, +## @nospell{ACM} Trans.@: on Modeling and Computer Simulation Vol.@: 8, No.@: 1, +## pp.@: 3--30, January 1998, +## @url{http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html}). +## Do @strong{not} use for cryptography without securely hashing several +## returned values together, otherwise the generator state can be learned after +## reading 624 consecutive values. +## +## @seealso{rand, randn} +## @end deftypefn + +function retval = rng (varargin) + + if (nargin > 2) + print_usage (); + endif + + ## Store current settings of random number generator + ## FIXME: there doesn't seem to be a way to query the type of generator + ## currently used in Octave - assume "twister". + ## FIXME: there doesn't seem to be a way to query the seed initialization + ## value - use "Not applicable". + ## FIXME: rand and randn use different generators - storing both states. + ## For older Matlab generators (v4, v5), the settings are stored like this: + ## struct ("Type","Legacy", "Seed", "Not applicable", "State",{[],[],...}) + + ## Type is the generator name. + ## Seed is the initial seed value. + ## State is a structure describing internal state of the generator. + s = struct ("Type", "twister", + "Seed", "Not applicable", + "State", {{rand("state"), randn("state")}}); + + if (nargin == 0) + retval = s; + return; + endif + + arg1 = varargin{1}; + if (isscalar (arg1) && isnumeric (arg1) && isreal (arg1) && arg1 >= 0) + s_rand = s_randn = arg1; + generator = check_generator (varargin(2:end)); + + elseif (ischar (arg1) && strcmpi (arg1, "shuffle")) + ## Seed the random number generator based on the current time + s_rand = s_randn = "reset"; # or sum (1000*clock) + generator = check_generator (varargin(2:end)); + + elseif (ischar (arg1) && strcmpi (arg1, "default") && nargin == 1) + generator = "twister"; + s_rand = s_randn = 0; # FIXME: In Matlab, seed 0 corresponds to 5489 + + elseif (isstruct (arg1) && isscalar (arg1) && nargin == 1) + if (numfields (arg1) != 3 + || ! all (isfield (arg1, {"Type", "Seed", "State"}))) + error ('rng: input structure requires "Type", "Seed", "State" fields"'); + endif + ## Only the internal state "State" and generator type "Type" are needed + generator = arg1.Type; + if (iscell (arg1.State)) + [s_rand, s_randn] = deal (arg1.State{:}); + else + s_rand = s_randn = arg1.State; + endif + + else + print_usage (); + endif + + ## Set the type of random number generator and seed it + if (isempty (generator)) + generator = s.Type; + endif + switch (generator) + case "twister" + rand ("state", s_rand); + randn ("state", s_randn); + + case "legacy" + rand ("seed", s_rand); + randn ("seed", s_randn); + + case "v5uniform" + rand ("seed", s_rand); + + case "v5normal" + randn ("seed", s_randn); + + otherwise + error ('rng: invalid GENERATOR: "%s"', generator); + + endswitch + + if (nargout > 0) + retval = s; + endif + +endfunction + + +function gen = check_generator (val) + if (isempty (val)) + gen = ""; + return; + elseif (! iscellstr (val)) + error ("rng: GENERATOR must be a string"); + endif + gen = tolower (char (val)); + if (any (strcmp (gen, {"simdtwister", "combrecursive", "philox", "threefry", "multfibonacci", "v4"}))) + error ('rng: random number generator "%s" is not available in Octave', gen); + elseif (! any (strcmp (gen, {"twister", "v5uniform", "v5normal"}))) + error ('rng: unknown random number generator "%s"', gen); + endif +endfunction + + +%!test +%! state = rng (); +%! unwind_protect +%! rng (42); +%! ru1 = rand (); +%! rn1 = randn (); +%! rng (42); +%! ru2 = rand (); +%! rn2 = randn (); +%! assert (ru2, ru1); +%! assert (rn2, rn1); +%! s1 = rng (); +%! s2 = rng (42); +%! assert (isequal (s1, s2)); +%! ru1 = rand (); +%! rn1 = randn (); +%! s3 = rng (42); +%! ru2 = rand (); +%! rn2 = randn (); +%! assert (ru2, ru1); +%! assert (rn2, rn1); +%! unwind_protect_cleanup +%! rng (state); +%! end_unwind_protect + +%!test +%! state = rng (); +%! unwind_protect +%! rng (42, "twister"); +%! ru1 = rand (); +%! rn1 = randn (); +%! rng (42, "twister"); +%! ru2 = rand (); +%! rn2 = randn (); +%! assert (ru2, ru1); +%! assert (rn2, rn1); +%! s1 = rng (); +%! s2 = rng (42, "twister"); +%! assert (isequal (s1, s2)); +%! ru1 = rand (); +%! rn1 = randn (); +%! s3 = rng (42, "twister"); +%! ru2 = rand (); +%! rn2 = randn (); +%! assert (ru2, ru1); +%! assert (rn2, rn1); +%! unwind_protect_cleanup +%! rng (state); +%! end_unwind_protect + +%!test +%! state = rng (); +%! unwind_protect +%! rng ("shuffle"); +%! rng ("shuffle", "twister"); +%! s = rng ("shuffle"); +%! assert (! isequal (s, rng ("shuffle"))); +%! s = rng ("shuffle", "twister"); +%! assert (! isequal (s, rng ("shuffle", "twister"))); +%! unwind_protect_cleanup +%! rng (state); +%! end_unwind_protect + +%!test +%! state = rng (); +%! unwind_protect +%! rng ("default"); +%! ru1 = rand (); +%! rn1 = randn (); +%! rng (0, "twister"); +%! ru2 = rand (); +%! rn2 = randn (); +%! assert (ru2, ru1); +%! assert (rn2, rn1); +%! rng (0, "twister"); +%! s = rng ("default"); +%! assert (isequal (s, rng ())); +%! unwind_protect_cleanup +%! rng (state); +%! end_unwind_protect + +%!test +%! state = rng (); +%! unwind_protect +%! s = rng (); +%! ru1 = rand (); +%! rn1 = randn (); +%! rng (s); +%! ru2 = rand (); +%! rn2 = randn (); +%! assert (ru2, ru1); +%! assert (rn2, rn1); +%! rng (42); rand (1,2); x = rand (1,2); +%! rng (42); rand (1,2); s = rng (); y = rand (1,2); +%! assert (x, y); +%! rng (s); z = rand (1,2); +%! assert (x, z); +%! s1 = rng (); +%! s2 = rng (s1); +%! assert (isequal (s1, s2)); +%! unwind_protect_cleanup +%! rng (state); +%! end_unwind_protect + +## Test input validation +%!error <Invalid call> rng (1, 2, 3) +%!error <Invalid call> rng (eye (2)) +%!error <Invalid call> rng ({}) +%!error <Invalid call> rng (2i) +%!error <Invalid call> rng (-2) +%!error <Invalid call> rng ("foobar") +%!error <Invalid call> rng ("default", "twister") +%!error <Invalid call> rng (struct ("Seed", {1, 2})) +%!error <Invalid call> rng (struct ("Type",[],"State",[],"Seed",[]), "twister") +%!error <input structure requires "Type"> rng (struct ()) +%!error <input structure requires "Type"> +%! rng (struct ("Type1",[],"State",[],"Seed",[])); +%!error <GENERATOR must be a string> rng (0, struct ()) +%!error <"philox" is not available in Octave> rng (0, "philox") +%!error <GENERATOR must be a string> rng ("shuffle", struct ()) +%!error <unknown random number generator "foobar"> rng ("shuffle", "foobar")
--- a/scripts/general/sph2cart.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/general/sph2cart.m Fri May 22 11:06:58 2020 +0200 @@ -26,22 +26,43 @@ ## -*- texinfo -*- ## @deftypefn {} {[@var{x}, @var{y}, @var{z}] =} sph2cart (@var{theta}, @var{phi}, @var{r}) ## @deftypefnx {} {[@var{x}, @var{y}, @var{z}] =} sph2cart (@var{S}) -## @deftypefnx {} {@var{C} =} sph2cart (@dots{}) ## Transform spherical coordinates to Cartesian coordinates. ## ## The inputs @var{theta}, @var{phi}, and @var{r} must be the same shape, or ## scalar. If called with a single matrix argument then each row of @var{S} -## represents the spherical coordinate (@var{theta}, @var{phi}, @var{r}). +## must represent a spherical coordinate triplet (@var{theta}, @var{phi}, +## @var{r}). ## -## @var{theta} describes the angle relative to the positive x-axis. +## The outputs @var{x}, @var{y}, @var{z} match the shape of the inputs. For a +## matrix input @var{S} the outputs are column vectors with rows corresponding +## to the rows of the input matrix. ## -## @var{phi} is the angle relative to the xy-plane. +## @var{theta} describes the azimuth angle relative to the positive x-axis +## measured in the xy-plane. +## +## @var{phi} is the elevation angle measured relative to the xy-plane. ## ## @var{r} is the distance to the origin @w{(0, 0, 0)}. ## -## If only a single return argument is requested then return a matrix @var{C} -## where each row represents one Cartesian coordinate -## (@var{x}, @var{y}, @var{z}). +## The coordinate transformation is computed using: +## +## @tex +## $$ x = r \cos \phi \cos \theta $$ +## $$ y = r \cos \phi \sin \theta $$ +## $$ z = r \sin \phi $$ +## @end tex +## @ifnottex +## +## @example +## @var{x} = r * cos (@var{phi}) * cos (@var{theta}) +## @var{y} = r * cos (@var{phi}) * sin (@var{theta}) +## @var{z} = r * sin (@var{phi}) +## @end example +## +## @end ifnottex +## @c FIXME: Remove this note in Octave 9.1 (two releases after 7.1). +## Note: For @sc{matlab} compatibility, this function no longer returns a full +## coordinate matrix when called with a single return argument. ## @seealso{cart2sph, pol2cart, cart2pol} ## @end deftypefn @@ -52,19 +73,30 @@ endif if (nargin == 1) - if (! (isnumeric (theta) && ismatrix (theta) && columns (theta) == 3)) - error ("sph2cart: matrix input must have 3 columns [THETA, PHI, R]"); + if (! (isnumeric (theta) && ismatrix (theta))) + error ("sph2cart: matrix input must be a 2-D numeric array"); + endif + if (columns (theta) != 3 && numel (theta) != 3) + error ("sph2cart: matrix input must be a 3-element vector or 3-column array"); endif - r = theta(:,3); - phi = theta(:,2); - theta = theta(:,1); + + if (numel (theta) == 3) + r = theta(3); + phi = theta(2); + theta = theta(1); + else + r = theta(:,3); + phi = theta(:,2); + theta = theta(:,1); + endif + else - if (! isnumeric (theta) || ! isnumeric (phi) || ! isnumeric (r)) - error ("sph2cart: THETA, PHI, R must be numeric arrays of the same size, or scalar"); + if (! (isnumeric (theta) && isnumeric (phi) && isnumeric (r))) + error ("sph2cart: THETA, PHI, R must be numeric arrays or scalars"); endif [err, theta, phi, r] = common_size (theta, phi, r); if (err) - error ("sph2cart: THETA, PHI, R must be numeric arrays of the same size, or scalar"); + error ("sph2cart: THETA, PHI, R must be the same size or scalars"); endif endif @@ -72,10 +104,6 @@ y = r .* cos (phi) .* sin (theta); z = r .* sin (phi); - if (nargout <= 1) - x = [x(:), y(:), z(:)]; - endif - endfunction @@ -89,13 +117,22 @@ %! assert (z, [0, 0, 0]); %!test +%! t = [0; 0; 0]; +%! p = [0; 0; 0]; +%! r = [0; 1; 2]; +%! [x, y, z] = sph2cart (t, p, r); +%! assert (x, [0; 1; 2]); +%! assert (y, [0; 0; 0]); +%! assert (z, [0; 0; 0]); + +%!test %! t = 0; %! p = [0, 0, 0]; %! r = [0, 1, 2]; -%! C = sph2cart (t, p, r); -%! assert (C(:,1), r(:)); -%! assert (C(:,2), [0; 0; 0]); -%! assert (C(:,3), [0; 0; 0]); +%! [x, y, z] = sph2cart (t, p, r); +%! assert (x, [0, 1, 2]); +%! assert (y, [0, 0, 0]); +%! assert (z, [0, 0, 0]); %!test %! t = [0, 0, 0]; @@ -123,8 +160,18 @@ %!test %! S = [ 0, 0, 1; 0.5*pi, 0, 1; pi, 0, 1]; -%! C = [ 1, 0, 0; 0, 1, 0; -1, 0, 0]; -%! assert (sph2cart (S), C, eps); +%! [x, y, z] = sph2cart (S); +%! assert (x, [1; 0; -1], eps); +%! assert (y, [0; 1; 0], eps); +%! assert (z, [0; 0; 0], eps); + +%!test +%! S = [ 0, 0, 1; 0.5*pi, 0, 1; pi, 0, 1; pi, pi, 1]; +%! [x, y, z] = sph2cart (S); +%! assert (x, [1; 0; -1; 1], eps); +%! assert (y, [0; 1; 0; 0], eps); +%! assert (z, [0; 0; 0; 0], eps); + %!test %! [t, p, r] = meshgrid ([0, pi/2], [0, pi/2], [0, 1]); @@ -143,11 +190,13 @@ %!error sph2cart () %!error sph2cart (1,2) %!error sph2cart (1,2,3,4) -%!error <matrix input must have 3 columns> sph2cart ({1,2,3}) -%!error <matrix input must have 3 columns> sph2cart (ones (3,3,2)) -%!error <matrix input must have 3 columns> sph2cart ([1,2,3,4]) -%!error <numeric arrays of the same size> sph2cart ({1,2,3}, [1,2,3], [1,2,3]) -%!error <numeric arrays of the same size> sph2cart ([1,2,3], {1,2,3}, [1,2,3]) -%!error <numeric arrays of the same size> sph2cart ([1,2,3], [1,2,3], {1,2,3}) -%!error <numeric arrays of the same size> sph2cart (ones (3,3,3), 1, ones (3,2,3)) -%!error <numeric arrays of the same size> sph2cart (ones (3,3,3), ones (3,2,3), 1) +%!error <matrix input must be a 2-D numeric array> sph2cart ({1,2,3}) +%!error <matrix input must be a 2-D numeric array> sph2cart (ones (3,3,2)) +%!error <matrix input must be a 3-element> sph2cart ([1,2,3,4]) +%!error <matrix input must be a 3-element> sph2cart ([1,2,3,4; 1,2,3,4; 1,2,3,4]) +%!error <must be numeric arrays or scalars> sph2cart ({1,2,3}, [1,2,3], [1,2,3]) +%!error <must be numeric arrays or scalars> sph2cart ([1,2,3], {1,2,3}, [1,2,3]) +%!error <must be numeric arrays or scalars> sph2cart ([1,2,3], [1,2,3], {1,2,3}) +%!error <must be the same size or scalars> sph2cart ([1,2,3], [1,2,3], [1,2,3]') +%!error <must be the same size or scalars> sph2cart (ones (3,3,3), 1, ones (3,2,3)) +%!error <must be the same size or scalars> sph2cart (ones (3,3,3), ones (3,2,3), 1)
--- a/scripts/geometry/griddata.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/geometry/griddata.m Fri May 22 11:06:58 2020 +0200 @@ -27,123 +27,232 @@ ## @deftypefn {} {@var{zi} =} griddata (@var{x}, @var{y}, @var{z}, @var{xi}, @var{yi}) ## @deftypefnx {} {@var{zi} =} griddata (@var{x}, @var{y}, @var{z}, @var{xi}, @var{yi}, @var{method}) ## @deftypefnx {} {[@var{xi}, @var{yi}, @var{zi}] =} griddata (@dots{}) +## @deftypefnx {} {@var{vi} =} griddata (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}) +## @deftypefnx {} {@var{vi} =} griddata (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}, @var{method}) +## @deftypefnx {} {@var{vi} =} griddata (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}, @var{method}, @var{options}) ## -## Generate a regular mesh from irregular data using interpolation. +## Interpolate irregular 2-D and 3-D source data at specified points. +## +## For 2-D interpolation, the inputs @var{x} and @var{y} define the points +## where the function @code{@var{z} = f (@var{x}, @var{y})} is evaluated. +## The inputs @var{x}, @var{y}, @var{z} are either vectors of the same length, +## or the unequal vectors @var{x}, @var{y} are expanded to a 2-D grid with +## @code{meshgrid} and @var{z} is a 2-D matrix matching the resulting size of +## the X-Y grid. +## +## The interpolation points are (@var{xi}, @var{yi}). If, and only if, +## @var{xi} is a row vector and @var{yi} is a column vector, then +## @code{meshgrid} will be used to create a mesh of interpolation points. ## -## The function is defined by @code{@var{z} = f (@var{x}, @var{y})}. Inputs -## @code{@var{x}, @var{y}, @var{z}} are vectors of the same length or -## @code{@var{x}, @var{y}} are vectors and @code{@var{z}} is matrix. +## For 3-D interpolation, the inputs @var{x}, @var{y}, and @var{z} define the +## points where the function @code{@var{v} = f (@var{x}, @var{y}, @var{z})} +## is evaluated. The inputs @var{x}, @var{y}, @var{z} are either vectors of +## the same length, or if they are of unequal length, then they are expanded to +## a 3-D grid with @code{meshgrid}. The size of the input @var{v} must match +## the size of the original data, either as a vector or a matrix. ## -## The interpolation points are all @code{(@var{xi}, @var{yi})}. If @var{xi}, -## @var{yi} are vectors then they are made into a 2-D mesh. +## The optional input interpolation @var{method} can be @qcode{"nearest"}, +## @qcode{"linear"}, or for 2-D data @qcode{"v4"}. When the method is +## @qcode{"nearest"}, the output @var{vi} will be the closest point in the +## original data (@var{x}, @var{y}, @var{z}) to the query point (@var{xi}, +## @var{yi}, @var{zi}). When the method is @qcode{"linear"}, the output +## @var{vi} will be a linear interpolation between the two closest points in +## the original source data in each dimension. For 2-D cases only, the +## @qcode{"v4"} method is also available which implements a biharmonic spline +## interpolation. If @var{method} is omitted or empty, it defaults to +## @qcode{"linear"}. ## -## The interpolation method can be @qcode{"nearest"}, @qcode{"cubic"} or -## @qcode{"linear"}. If method is omitted it defaults to @qcode{"linear"}. +## For 3-D interpolation, the optional argument @var{options} is passed +## directly to Qhull when computing the Delaunay triangulation used for +## interpolation. See @code{delaunayn} for information on the defaults and +## how to pass different values. +## +## Programming Notes: If the input is complex the real and imaginary parts +## are interpolated separately. Interpolation is normally based on a +## Delaunay triangulation. Any query values outside the convex hull of the +## input points will return @code{NaN}. However, the @qcode{"v4"} method does +## not use the triangulation and will return values outside the original data +## (extrapolation). ## @seealso{griddata3, griddatan, delaunay} ## @end deftypefn -## Algorithm: xi and yi are not "meshgridded" if both are vectors -## of the same size (for compatibility) +function [rx, ry, rz] = griddata (x, y, z, varargin) -function [rx, ry, rz] = griddata (x, y, z, xi, yi, method = "linear") - - if (nargin < 5 || nargin > 7) + if (nargin < 5) print_usage (); endif - if (ischar (method)) - method = tolower (method); - endif - - ## Meshgrid if x and y are vectors but z is matrix - if (isvector (x) && isvector (y) && all ([numel(y), numel(x)] == size (z))) - [x, y] = meshgrid (x, y); - endif - - if (isvector (x) && isvector (y) && isvector (z)) - if (! isequal (length (x), length (y), length (z))) - error ("griddata: X, Y, and Z must be vectors of the same length"); - endif - elseif (! size_equal (x, y, z)) - error ("griddata: lengths of X, Y must match the columns and rows of Z"); - endif - - ## Meshgrid xi and yi if they are a row and column vector. - if (rows (xi) == 1 && columns (yi) == 1) - [xi, yi] = meshgrid (xi, yi); - elseif (isvector (xi) && isvector (yi)) - ## Otherwise, convert to column vectors - xi = xi(:); - yi = yi(:); - endif - - if (! size_equal (xi, yi)) - error ("griddata: XI and YI must be vectors or matrices of same size"); - endif - - x = x(:); - y = y(:); - z = z(:); - - ## Triangulate data. - tri = delaunay (x, y); - zi = NaN (size (xi)); - - if (strcmp (method, "cubic")) - error ("griddata: cubic interpolation not yet implemented"); + if (nargin > 6) + ## Current 2D implementation has nargin max = 6, since no triangulation + ## options are passed to the 2D algorithm. 3D algorithm requires nargin >=7 - elseif (strcmp (method, "nearest")) - ## Search index of nearest point. - idx = dsearch (x, y, tri, xi, yi); - valid = ! isnan (idx); - zi(valid) = z(idx(valid)); - - elseif (strcmp (method, "linear")) - ## Search for every point the enclosing triangle. - tri_list = tsearch (x, y, tri, xi(:), yi(:)); - - ## Only keep the points within triangles. - valid = ! isnan (tri_list); - tri_list = tri_list(valid); - nr_t = rows (tri_list); - - tri = tri(tri_list,:); - - ## Assign x,y,z for each point of triangle. - x1 = x(tri(:,1)); - x2 = x(tri(:,2)); - x3 = x(tri(:,3)); - - y1 = y(tri(:,1)); - y2 = y(tri(:,2)); - y3 = y(tri(:,3)); - - z1 = z(tri(:,1)); - z2 = z(tri(:,2)); - z3 = z(tri(:,3)); - - ## Calculate norm vector. - N = cross ([x2-x1, y2-y1, z2-z1], [x3-x1, y3-y1, z3-z1]); - ## Normalize. - N = diag (norm (N, "rows")) \ N; - - ## Calculate D of plane equation - ## Ax+By+Cz+D = 0; - D = -(N(:,1) .* x1 + N(:,2) .* y1 + N(:,3) .* z1); - - ## Calculate zi by solving plane equation for xi, yi. - zi(valid) = -(N(:,1).*xi(:)(valid) + N(:,2).*yi(:)(valid) + D) ./ N(:,3); + if (nargout > 1) + error ("griddata: only one output argument valid for 3-D interpolation"); + endif + rx = griddata3 (x, y, z, varargin{:}); else - error ("griddata: unknown interpolation METHOD"); - endif + ## for nargin 5 or 6, assign varargin terms to variables for 2D algorithm + xi = varargin{1}; + yi = varargin{2}; + + ## Meshgrid if x and y are vectors but z is matrix + if (isvector (x) && isvector (y) && all ([numel(y), numel(x)] == size (z))) + [x, y] = meshgrid (x, y); + endif + + if (isvector (x) && isvector (y) && isvector (z)) + if (! isequal (length (x), length (y), length (z))) + error ("griddata: X, Y, and Z must be vectors of the same length"); + endif + elseif (! size_equal (x, y, z)) + error ("griddata: lengths of X, Y must match the columns and rows of Z"); + endif + + ## Meshgrid xi and yi if they are a row and column vector, but not + ## if they are simply vectors of the same size (for compatibility). + if (isrow (xi) && iscolumn (yi)) + [xi, yi] = meshgrid (xi, yi); + elseif (isvector (xi) && isvector (yi)) + ## Otherwise, convert to column vectors + xi = xi(:); + yi = yi(:); + endif + + if (! size_equal (xi, yi)) + error ("griddata: XI and YI must be vectors or matrices of same size"); + endif + + if (nargin == 6) + method = varargin{3}; + if (isempty (method)) + method = "linear"; + elseif (! ischar (method)) + error ("griddata: METHOD must be a string"); + else + method = tolower (method); + endif + + if (any (strcmp (method, {"linear", "nearest", "v4"}))) + ## Do nothing, these are implemented methods + elseif (any (strcmp (method, {"cubic", "natural"}))) + ## FIXME: implement missing interpolation methods. + error ('griddata: "%s" interpolation not yet implemented', method); + else + error ('griddata: unknown interpolation METHOD: "%s"', method); + endif + else + method = "linear"; + endif + + x = x(:); + y = y(:); + z = z(:); + + ## Triangulate data. + if (! strcmp (method, "v4")) + tri = delaunay (x, y); + endif + zi = NaN (size (xi)); + + if (strcmp (method, "linear")) + ## Search for every point the enclosing triangle. + tri_list = tsearch (x, y, tri, xi(:), yi(:)); + + ## Only keep the points within triangles. + valid = ! isnan (tri_list); + tri_list = tri_list(valid); + nr_t = rows (tri_list); + + tri = tri(tri_list,:); + + ## Assign x,y,z for each point of triangle. + x1 = x(tri(:,1)); + x2 = x(tri(:,2)); + x3 = x(tri(:,3)); - if (nargout > 1) - rx = xi; - ry = yi; - rz = zi; - else - rx = zi; + y1 = y(tri(:,1)); + y2 = y(tri(:,2)); + y3 = y(tri(:,3)); + + z1 = z(tri(:,1)); + z2 = z(tri(:,2)); + z3 = z(tri(:,3)); + + ## Calculate norm vector. + N = cross ([x2-x1, y2-y1, z2-z1], [x3-x1, y3-y1, z3-z1]); + ## Normalize. + N = diag (norm (N, "rows")) \ N; + + ## Calculate D of plane equation: Ax+By+Cz+D = 0 + D = -(N(:,1) .* x1 + N(:,2) .* y1 + N(:,3) .* z1); + + ## Calculate zi by solving plane equation for xi, yi. + zi(valid) = -(N(:,1).*xi(:)(valid) + N(:,2).*yi(:)(valid) + D) ./ N(:,3); + + elseif (strcmp (method, "nearest")) + ## Search index of nearest point. + idx = dsearch (x, y, tri, xi, yi); + valid = ! isnan (idx); + zi(valid) = z(idx(valid)); + + elseif (strcmp (method, "v4")) + ## Use Biharmonic Spline Interpolation Green's Function method. + ## Compatible with Matlab v4 interpolation method, based on + ## D. Sandwell 1987 and Deng & Tang 2011. + + ## The free space Green Function which solves the two dimensional + ## Biharmonic PDE + ## + ## Delta(Delta(G(X))) = delta(X) + ## + ## for a point source yields + ## + ## G(X) = |X|^2 * (ln|X|-1) / (8 * pi) + ## + ## An N-point Biharmonic Interpolation at the point X is given by + ## + ## z(X) = sum_j_N (alpha_j * G(X-Xj)) + ## = sum_j_N (alpha_j * G(rj)) + ## + ## in which the coefficients alpha_j are the unknowns. rj is the + ## Euclidean distance between X and Xj. + ## From N datapoints {zi, Xi} an equation system can be formed: + ## + ## zi(Xi) = sum_j_N (alpha_j * G(Xi-Xj)) + ## = sum_j_N (alpha_j * G(rij)) + ## + ## Its inverse yields the unknowns alpha_j. + + ## Step1: Solve for weight coefficients alpha_j depending on the + ## Euclidean distances and the training data set {x,y,z} + r = sqrt ((x - x.').^2 + (y - y.').^2); # size N^2 + D = (r.^2) .* (log (r) - 1); + D(isnan (D)) = 0; # Fix Green Function for r=0 + alpha_j = D \ z; + + ## Step2 - Use alphas and Green's functions to get interpolated points. + ## Use dim3 projection for vectorized calculation to avoid loops. + ## Memory usage is proportional to Ni x N. + ## FIXME: if this approach is too memory intensive, revert portion to loop + x = permute (x, [3, 2, 1]); + y = permute (y, [3, 2, 1]); + alpha_j = permute (alpha_j, [3, 2, 1]); + r_i = sqrt ((xi - x).^2 + (yi - y).^2); # size Ni x N + Di = (r_i.^2) .* (log (r_i) - 1); + Di(isnan (Di)) = 0; # Fix Green's Function for r==0 + zi = sum (Di .* alpha_j, 3); + + endif + + if (nargout > 1) + rx = xi; + ry = yi; + rz = zi; + else + rx = zi; + endif + endif endfunction @@ -155,10 +264,22 @@ %! x = 2*rand (100,1) - 1; %! y = 2*rand (size (x)) - 1; %! z = sin (2*(x.^2 + y.^2)); -%! [xx,yy] = meshgrid (linspace (-1,1,32)); +%! [xx,yy] = meshgrid (linspace (-1, 1, 32)); %! zz = griddata (x,y,z,xx,yy); %! mesh (xx, yy, zz); -%! title ("nonuniform grid sampled at 100 points"); +%! title ("non-uniform grid sampled at 100 points"); + +%!demo +%! clf; +%! colormap ("default"); +%! x = 2*rand (1000,1) - 1; +%! y = 2*rand (size (x)) - 1; +%! z = sin (2*(x.^2 + y.^2)); +%! [xx,yy] = meshgrid (linspace (-1, 1, 32)); +%! zz = griddata (x,y,z,xx,yy); +%! mesh (xx, yy, zz); +%! title ({"non-uniform grid sampled at 1,000 points", +%! 'method = "linear"'}); %!demo %! clf; @@ -166,45 +287,63 @@ %! x = 2*rand (1000,1) - 1; %! y = 2*rand (size (x)) - 1; %! z = sin (2*(x.^2 + y.^2)); -%! [xx,yy] = meshgrid (linspace (-1,1,32)); -%! zz = griddata (x,y,z,xx,yy); -%! mesh (xx, yy, zz); -%! title ("nonuniform grid sampled at 1000 points"); - -%!demo -%! clf; -%! colormap ("default"); -%! x = 2*rand (1000,1) - 1; -%! y = 2*rand (size (x)) - 1; -%! z = sin (2*(x.^2 + y.^2)); -%! [xx,yy] = meshgrid (linspace (-1,1,32)); +%! [xx,yy] = meshgrid (linspace (-1, 1, 32)); %! zz = griddata (x,y,z,xx,yy,"nearest"); %! mesh (xx, yy, zz); -%! title ("nonuniform grid sampled at 1000 points with nearest neighbor"); +%! title ({"non-uniform grid sampled at 1,000 points", +%! 'method = "nearest neighbor"'}); %!testif HAVE_QHULL -%! [xx,yy] = meshgrid (linspace (-1,1,32)); +%! [xx, yy] = meshgrid (linspace (-1, 1, 32)); %! x = xx(:); %! x = x + 10*(2*round (rand (size (x))) - 1) * eps; %! y = yy(:); %! y = y + 10*(2*round (rand (size (y))) - 1) * eps; %! z = sin (2*(x.^2 + y.^2)); -%! zz = griddata (x,y,z,xx,yy,"linear"); +%! zz = griddata (x,y,z,xx,yy, "linear"); %! zz2 = sin (2*(xx.^2 + yy.^2)); %! zz2(isnan (zz)) = NaN; %! assert (zz, zz2, 100*eps); +%!testif HAVE_QHULL +%! [xx, yy] = meshgrid (linspace (-1, 1, 5)); +%! x = xx(:); +%! x = x + 10*(2*round (rand (size (x))) - 1) * eps; +%! y = yy(:); +%! y = y + 10*(2*round (rand (size (y))) - 1) * eps; +%! z = 2*(x.^2 + y.^2); +%! zz = griddata (x,y,z,xx,yy, "v4"); +%! zz2 = 2*(xx.^2 + yy.^2); +%! zz2(isnan (zz)) = NaN; +%! assert (zz, zz2, 100*eps); + +%!testif HAVE_QHULL +%! [xx, yy] = meshgrid (linspace (-1, 1, 5)); +%! x = xx(:); +%! x = x + 10*(2*round (rand (size (x))) - 1) * eps; +%! y = yy(:); +%! y = y + 10*(2*round (rand (size (y))) - 1) * eps; +%! z = 2*(x.^2 + y.^2); +%! zz = griddata (x,y,z,xx,yy, "nearest"); +%! zz2 = 2*(xx.^2 + yy.^2); +%! zz2(isnan (zz)) = NaN; +%! assert (zz, zz2, 100*eps); + ## Test input validation %!error griddata () %!error griddata (1) %!error griddata (1,2) %!error griddata (1,2,3) %!error griddata (1,2,3,4) -%!error griddata (1,2,3,4,5,6,7) +%!error <only one output argument> [xi,yi] = griddata (1,2,3,4,5,6,7) +%!error <vectors of the same length> griddata (1:4, 1:3, 1:3, 1:3, 1:3) +%!error <vectors of the same length> griddata (1:3, 1:4, 1:3, 1:3, 1:3) %!error <vectors of the same length> griddata (1:3, 1:3, 1:4, 1:3, 1:3) -%!error <vectors of the same length> griddata (1:3, 1:4, 1:3, 1:3, 1:3) -%!error <vectors of the same length> griddata (1:4, 1:3, 1:3, 1:3, 1:3) %!error <the columns and rows of Z> griddata (1:4, 1:3, ones (4,4), 1:3, 1:3) %!error <the columns and rows of Z> griddata (1:4, 1:3, ones (3,5), 1:3, 1:3) -%!error <matrices of same size> griddata (1:3, 1:3, 1:3, 1:4, 1:3) -%!error <matrices of same size> griddata (1:3, 1:3, 1:3, 1:3, 1:4) +%!error <XI and YI .* matrices of same size> griddata (1:3, 1:3, 1:3, 1:4, 1:3) +%!error <XI and YI .* matrices of same size> griddata (1:3, 1:3, 1:3, 1:3, 1:4) +%!error <METHOD must be a string> griddata (1,2,3,4,5, {"linear"}) +%!error <"cubic" .* not yet implemented> griddata (1,2,3,4,5, "cubic") +%!error <"natural" .* not yet implemented> griddata (1,2,3,4,5, "natural") +%!error <unknown interpolation METHOD: "foobar"> griddata (1,2,3,4,5, "foobar")
--- a/scripts/geometry/griddata3.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/geometry/griddata3.m Fri May 22 11:06:58 2020 +0200 @@ -28,18 +28,34 @@ ## @deftypefnx {} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}, @var{method}) ## @deftypefnx {} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}, @var{method}, @var{options}) ## -## Generate a regular mesh from irregular data using interpolation. +## Interpolate irregular 3-D source data at specified points. ## -## The function is defined by @code{@var{v} = f (@var{x}, @var{y}, @var{z})}. +## The inputs @var{x}, @var{y}, and @var{z} define the points where the +## function @code{@var{v} = f (@var{x}, @var{y}, @var{z})} is evaluated. The +## inputs @var{x}, @var{y}, @var{z} are either vectors of the same length, or +## if they are of unequal length, then they are expanded to a 3-D grid with +## @code{meshgrid}. The size of the input @var{v} must match the size of the +## original data, either as a vector or a matrix. +## ## The interpolation points are specified by @var{xi}, @var{yi}, @var{zi}. ## -## The interpolation method can be @qcode{"nearest"} or @qcode{"linear"}. -## If method is omitted it defaults to @qcode{"linear"}. +## The optional input interpolation @var{method} can be @qcode{"nearest"} or +## @qcode{"linear"}. When the method is @qcode{"nearest"}, the output @var{vi} +## will be the closest point in the original data (@var{x}, @var{y}, @var{z}) +## to the query point (@var{xi}, @var{yi}, @var{zi}). When the method is +## @qcode{"linear"}, the output @var{vi} will be a linear interpolation between +## the two closest points in the original source data in each dimension. +## If @var{method} is omitted or empty, it defaults to @qcode{"linear"}. ## ## The optional argument @var{options} is passed directly to Qhull when ## computing the Delaunay triangulation used for interpolation. See ## @code{delaunayn} for information on the defaults and how to pass different ## values. +## +## Programming Notes: If the input is complex the real and imaginary parts +## are interpolated separately. Interpolation is based on a Delaunay +## triangulation and any query values outside the convex hull of the input +## points will return @code{NaN}. ## @seealso{griddata, griddatan, delaunayn} ## @end deftypefn @@ -105,3 +121,7 @@ %! vi = griddata3 (x, y, z, v, xi, yi, zi, "nearest"); %! vv = vi - xi.^2 - yi.^2 - zi.^2; %! assert (max (abs (vv(:))), 0.385, 0.1); + +## FIXME: Ideally, there should be BIST tests for input validation. +## However, this function is deprecated in Matlab and it probably isn't worth +## the coding time to work on a function that will be removed soon.
--- a/scripts/geometry/griddatan.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/geometry/griddatan.m Fri May 22 11:06:58 2020 +0200 @@ -28,18 +28,56 @@ ## @deftypefnx {} {@var{yi} =} griddatan (@var{x}, @var{y}, @var{xi}, @var{method}) ## @deftypefnx {} {@var{yi} =} griddatan (@var{x}, @var{y}, @var{xi}, @var{method}, @var{options}) ## -## Generate a regular mesh from irregular data using interpolation. +## Interpolate irregular source data @var{x}, @var{y} at points specified by +## @var{xi}. ## -## The function is defined by @code{@var{y} = f (@var{x})}. -## The interpolation points are all @var{xi}. +## The input @var{x} is an MxN matrix representing M points in an N-dimensional +## space. The input @var{y} is a single-valued column vector (Mx1) +## representing a function evaluated at the points @var{x}, i.e., +## @code{@var{y} = fcn (@var{x})}. The input @var{xi} is a list of points +## for which the function output @var{yi} should be approximated through +## interpolation. @var{xi} must have the same number of columns (@var{N}) +## as @var{x} so that the dimensionality matches. ## -## The interpolation method can be @qcode{"nearest"} or @qcode{"linear"}. -## If method is omitted it defaults to @qcode{"linear"}. +## The optional input interpolation @var{method} can be @qcode{"nearest"} or +## @qcode{"linear"}. When the method is @qcode{"nearest"}, the output @var{yi} +## will be the closest point in the original data @var{x} to the query point +## @var{xi}. When the method is @qcode{"linear"}, the output @var{yi} will +## be a linear interpolation between the two closest points in the original +## source data. If @var{method} is omitted or empty, it defaults to +## @qcode{"linear"}. ## ## The optional argument @var{options} is passed directly to Qhull when ## computing the Delaunay triangulation used for interpolation. See ## @code{delaunayn} for information on the defaults and how to pass different ## values. +## +## Example +## +## @example +## @group +## ## Evaluate sombrero() function at irregular data points +## x = 16*gallery ("uniformdata", [200,1], 1) - 8; +## y = 16*gallery ("uniformdata", [200,1], 11) - 8; +## z = sin (sqrt (x.^2 + y.^2)) ./ sqrt (x.^2 + y.^2); +## ## Create a regular grid and interpolate data +## [xi, yi] = ndgrid (linspace (-8, 8, 50)); +## zi = griddatan ([x, y], z, [xi(:), yi(:)]); +## zi = reshape (zi, size (xi)); +## ## Plot results +## clf (); +## plot3 (x, y, z, "or"); +## hold on +## surf (xi, yi, zi); +## legend ("Original Data", "Interpolated Data"); +## @end group +## @end example +## +## Programming Notes: If the input is complex the real and imaginary parts +## are interpolated separately. Interpolation is based on a Delaunay +## triangulation and any query values outside the convex hull of the input +## points will return @code{NaN}. For 2-D and 3-D data additional +## interpolation methods are available by using the @code{griddata} function. ## @seealso{griddata, griddata3, delaunayn} ## @end deftypefn @@ -49,15 +87,41 @@ print_usage (); endif - if (ischar (method)) - method = tolower (method); - endif - [m, n] = size (x); [mi, ni] = size (xi); - if (n != ni || rows (y) != m || columns (y) != 1) - error ("griddatan: dimensional mismatch"); + if (m < n + 1) + error ("griddatan: number of points in X (rows of X) must be greater than dimensionality of data + 1 (columns of X + 1)"); + endif + if (! iscolumn (y) || rows (y) != m) + error ("griddatan: Y must be a column vector with the same number of points (rows) as X"); + endif + if (n != ni) + error ("griddatan: dimension of query data XI (columns) must match X"); + endif + + if (nargin > 3) + if (isempty (method)) + method = "linear"; + elseif (! ischar (method)) + error ("griddatan: METHOD must be a string"); + else + method = tolower (method); + endif + + if (strcmp (method, "linear") || strcmp (method, "nearest")) + ## Do nothing, these are implemented methods + elseif (strcmp (method, "v4")) + error ('griddatan: "%s" METHOD is available for 2-D inputs by using "griddata"', method); + + elseif (any (strcmp (method, {"cubic", "natural"}))) + ## FIXME: Remove when griddata.m supports these methods. + error ('griddatan: "%s" interpolation METHOD not yet implemented', method); + + else + error ('griddatan: unknown interpolation METHOD: "%s"', method); + endif + endif ## triangulate data @@ -65,13 +129,7 @@ yi = NaN (mi, 1); - if (strcmp (method, "nearest")) - ## search index of nearest point - idx = dsearchn (x, tri, xi); - valid = ! isnan (idx); - yi(valid) = y(idx(valid)); - - elseif (strcmp (method, "linear")) + if (strcmp (method, "linear")) ## search for every point the enclosing triangle [tri_list, bary_list] = tsearchn (x, tri, xi); @@ -90,7 +148,11 @@ endif else - error ("griddatan: unknown interpolation METHOD"); + ## search index of nearest point + idx = dsearchn (x, tri, xi); + valid = ! isnan (idx); + yi(valid) = y(idx(valid)); + endif endfunction @@ -102,8 +164,8 @@ %! x = 2*rand (100,2) - 1; %! x = [x;1,1;1,-1;-1,-1;-1,1]; %! y = sin (2 * sum (x.^2,2)); -%! zz = griddatan (x,y,xi,"linear"); -%! zz2 = griddata (x(:,1),x(:,2),y,xi(:,1),xi(:,2),"linear"); +%! zz = griddatan (x,y,xi, "linear"); +%! zz2 = griddata (x(:,1),x(:,2),y,xi(:,1),xi(:,2), "linear"); %! assert (zz, zz2, 1e-10); %!testif HAVE_QHULL @@ -112,8 +174,8 @@ %! x = 2*rand (100,2) - 1; %! x = [x;1,1;1,-1;-1,-1;-1,1]; %! y = sin (2*sum (x.^2,2)); -%! zz = griddatan (x,y,xi,"nearest"); -%! zz2 = griddata (x(:,1),x(:,2),y,xi(:,1),xi(:,2),"nearest"); +%! zz = griddatan (x,y,xi, "nearest"); +%! zz2 = griddata (x(:,1),x(:,2),y,xi(:,1),xi(:,2), "nearest"); %! assert (zz, zz2, 1e-10); %!testif HAVE_QHULL <*56515> @@ -121,3 +183,17 @@ %! y = [ 1; 2; 3; 4 ]; %! xi = [ .5, .5 ]; %! yi = griddatan (x, y, xi); + +## Test input validation +%!error griddatan () +%!error griddatan (1) +%!error griddatan (1,2) +%!error <number of points in X> griddatan (1,2,3) +%!error <Y must be a column vector> griddatan ([1;2],[3,4], 1) +%!error <Y must .* same number of points .* as X> griddatan ([1;2],[3;4;5], 1) +%!error <dimension of .* XI .* must match X> griddatan ([1;2],[3;4], [1, 2]) +%!error <METHOD must be a string> griddatan ([1;2],[3;4], 1, 5) +%!error <"v4" METHOD is available for 2-D> griddatan ([1;2],[3;4], 1, "v4") +%!error <"cubic" .* not yet implemented> griddatan ([1;2],[3;4], 1, "cubic") +%!error <"natural" .* not yet implemented> griddatan ([1;2],[3;4], 1, "natural") +%!error <unknown .* METHOD: "foobar"> griddatan ([1;2],[3;4], 1, "foobar")
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/gui/getpixelposition.m Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,127 @@ +######################################################################## +## +## Copyright (C) 2020 The Octave Project Developers +## +## See the file COPYRIGHT.md in the top-level directory of this +## distribution or <https://octave.org/copyright/>. +## +## 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{pos} =} getpixelposition (@var{h}) +## @deftypefnx {} {@var{pos} =} getpixelposition (@var{h}, @var{rel_to_fig}) +## Return the position of a user interface component in pixel units. +## +## The first argument @var{h} must be a handle to a valid graphics object of +## type uibuttongroup, uicontrol, uipanel, uitable, axes, or figure. For other +## object types, the function returns zeros. +## +## By default, the position is returned relative to the object's parent. +## If the second argument @var{rel_to_fig} is logically true, the position +## is computed relative to the enclosing figure object. +## +## The return value @var{pos} is a 4-element vector with values +## @code{[ lower_left_X, lower_left_Y, width, height ]}. +## +## @seealso{get} +## @end deftypefn + +function pos = getpixelposition (h, rel_to_fig = false) + + if (nargin < 1 || nargin > 2) + print_usage (); + endif + + if (! isscalar (h) || ! ishghandle (h)) + error ("getpixelposition: H must be a scalar graphics handle"); + endif + + if (! any (strcmp (get (h, "type"), {"uibuttongroup", "uicontrol", ... + "uitable", "uipanel", ... + "axes", "figure"}))) + pos = zeros (1, 4); + return; + endif + + pos = __get_position__ (h, "pixels"); + + if (rel_to_fig) + while (! isfigure (h)) + h = get (h, "parent"); + pos(1:2) += __get_position__ (h, "pixels")(1:2); + endwhile + endif + +endfunction + + +%!demo +%! clf (); +%! hax = axes ("position", [0.25 0.25 0.5 0.5]) +%! pos = getpixelposition (hax); +%! han = annotation ("rectangle"); +%! set (han, "units", "pixels", "position", pos, "color", "r") + +%!demo +%! hf = clf (); +%! hbg = uibuttongroup (hf, "position", [0.2 0.7 0.2 0.2]); +%! hb1 = uicontrol (hbg, "style", "radiobutton", ... +%! "string", "Choice 1", ... +%! "units", "normalized", ... +%! "position", [0.01 0.5 0.98 0.5]); +%! hb2 = uicontrol (hbg, "style", "radiobutton", ... +%! "string", "Choice 2", ... +%! "units", "normalized", ... +%! "position", [0.01 0 0.98 0.5]); +%! pos = getpixelposition (hbg); +%! han = annotation ("rectangle"); +%! set (han, "units", "pixels", "position", pos, "color", "r") + + +%!test +%! pos = [0 0 400 400]; +%! hf = figure ("visible", "off", "menubar", "none", "position", pos); +%! unwind_protect +%! hp = uipanel (hf, "position", [0.5 0.5 0.5 0.5]); +%! hax = axes (hp, "position", [0.5 0.5 0.5 0.5]); +%! assert (getpixelposition (hax), [100 100 100 100], 2); +%! assert (getpixelposition (hax, true), [300 300 100 100], 2); +%! unwind_protect_cleanup +%! close (hf); +%! end_unwind_protect + +%!test +%! ## Compatibility: return zeros for root figure +%! assert (getpixelposition (groot), zeros (1, 4)); + +%!test +%! ## Compatibility: return the same for figures regardless of rel_to_fig +%! hf = figure ("visible", "off"); +%! unwind_protect +%! assert (getpixelposition (hf), getpixelposition (hf, true)); +%! unwind_protect_cleanup +%! close (hf); +%! end_unwind_protect + +## Test input validation +%!error getpixelposition () +%!error getpixelposition (1,2,3) +%!error <H must be a scalar> getpixelposition ([1, 2]) +%!error <H must be a .* graphics handle> getpixelposition (-1) +
--- a/scripts/gui/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/scripts/gui/module.mk Fri May 22 11:06:58 2020 +0200 @@ -17,6 +17,7 @@ %reldir%/dialog.m \ %reldir%/errordlg.m \ %reldir%/getappdata.m \ + %reldir%/getpixelposition.m \ %reldir%/guidata.m \ %reldir%/guihandles.m \ %reldir%/helpdlg.m \
--- a/scripts/help/__unimplemented__.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/help/__unimplemented__.m Fri May 22 11:06:58 2020 +0200 @@ -728,7 +728,6 @@ "edges", "empty", "enableservice", - "endsWith", "enumeration", "eraseBetween", "eventlisteners", @@ -1185,7 +1184,6 @@ "ss2tf", "stack", "standardizeMissing", - "startsWith", "stats", "step", "stopasync",
--- a/scripts/io/importdata.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/io/importdata.m Fri May 22 11:06:58 2020 +0200 @@ -175,8 +175,8 @@ ## If no delimiter determined yet, make a guess. if (isempty (delimiter)) - ## This pattern can be fooled, but mostly does the job just fine. - delim = regexpi (row, '[-+\d.e*ij ]+([^-+\de.ij])[-+\de*.ij ]', + ## Look for number, DELIMITER, DELIMITER*, number + delim = regexpi (row, '[-+]?\d*[.]?\d+(?:[ed][-+]?\d+)?[ij]?([^-+\d.deij])\1*[-+]?\d*[.]?\d+(?:[ed][-+]?\d+)?[ij]?', 'tokens', 'once'); if (! isempty (delim)) delimiter = delim{1}; @@ -200,6 +200,14 @@ row = -1; break; else + ## The number of header rows and header columns is now known. + header_cols = find (! isnan (row_data), 1) - 1; + has_rowheaders = (header_cols == 1); + + ## Set colheaders output from textdata if appropriate + ## NOTE: Octave chooses to be Matlab incompatible and return + ## both 'rowheaders' and 'colheaders' when they are present. + ## Matlab allows only one to be present at a time. if (! isempty (output.textdata)) if (delimiter == " ") output.colheaders = regexp (strtrim (output.textdata{end}), @@ -207,9 +215,22 @@ else output.colheaders = ostrsplit (output.textdata{end}, delimiter); endif + + nc_hdr = numel (output.colheaders); + nc_dat = numel (row_data); + if (! has_rowheaders) + if (nc_hdr != nc_dat) + output = rmfield (output, {"rowheaders", "colheaders"}); + else + output = rmfield (output, "rowheaders"); + endif + else + if (nc_hdr != nc_dat-1) + output = rmfield (output, "colheaders"); + endif + endif endif - header_cols = find (! isnan (row_data), 1) - 1; - ## The number of header rows and header columns is now known. + break; endif @@ -256,6 +277,10 @@ endif ## Go back and correct any individual values that did not convert. + ## FIXME: This is only efficient when the number of bad conversions is small. + ## Any file with 'rowheaders' will cause the for loop to execute over + ## *every* line in the file. + na_idx = isna (output.data); if (header_cols > 0) na_idx = [(true (rows (na_idx), header_cols)), na_idx]; @@ -284,21 +309,19 @@ text = text(! strcmpi (text, "NA")); # Remove valid "NA" entries if (! isempty (text)) - output.textdata = [output.textdata; text(:)]; + output.textdata(end+1, 1:columns (text)) = text; endif - if (header_cols) - output.rowheaders(end+1, :) = fields(1:header_cols); + if (has_rowheaders) + output.rowheaders(end+1, 1) = fields(1); endif endfor endif - ## Final cleanup to satisfy output configuration + ## Final cleanup to satisfy Matlab compatibility if (all (cellfun ("isempty", output.textdata))) output = output.data; - elseif (! isempty (output.rowheaders) && ! isempty (output.colheaders)) - output = struct ("data", {output.data}, "textdata", {output.textdata}); endif endfunction @@ -377,7 +400,6 @@ %! A.data = [3.1 -7.2 0; 0.012 6.5 128]; %! A.textdata = {"This is a header row."; ... %! "this row does not contain any data, but the next one does."}; -%! A.colheaders = A.textdata (2); %! fn = tempname (); %! fid = fopen (fn, "w"); %! fprintf (fid, "%s\n", A.textdata{:}); @@ -393,6 +415,7 @@ %! ## Column headers, only last row is returned in colheaders %! A.data = [3.1 -7.2 0; 0.012 6.5 128]; %! A.textdata = {"Label1\tLabel2\tLabel3"; +%! ""; %! "col 1\tcol 2\tcol 3"}; %! A.colheaders = {"col 1", "col 2", "col 3"}; %! fn = tempname (); @@ -404,7 +427,7 @@ %! unlink (fn); %! assert (a, A); %! assert (d, "\t"); -%! assert (h, 2); +%! assert (h, 3); %!test %! ## Row headers @@ -425,9 +448,11 @@ %! ## Row/Column headers and Header Text %! A.data = [3.1 -7.2 0; 0.012 6.5 128]; %! A.textdata = {"This is introductory header text" -%! " col1 col2 col3" +%! "col1\tcol2\tcol3" %! "row1" %! "row2"}; +%! A.rowheaders = A.textdata(3:4); +%! A.colheaders = {"col1", "col2", "col3"}; %! fn = tempname (); %! fid = fopen (fn, "w"); %! fprintf (fid, "%s\n", A.textdata{1:2});
--- a/scripts/legacy/textread.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/legacy/textread.m Fri May 22 11:06:58 2020 +0200 @@ -346,7 +346,7 @@ ## Read multiple lines using empty format string %!test %! f = tempname (); -%! unlink (f); +%! sts = unlink (f); %! fid = fopen (f, "w"); %! d = rand (1, 4); %! fprintf (fid, " %f %f %f %f ", d); @@ -358,7 +358,7 @@ ## Empty format, corner case = one line w/o EOL %!test %! f = tempname (); -%! unlink (f); +%! sts = unlink (f); %! fid = fopen (f, "w"); %! d = rand (1, 4); %! fprintf (fid, " %f %f %f %f ", d);
--- a/scripts/linear-algebra/condest.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/linear-algebra/condest.m Fri May 22 11:06:58 2020 +0200 @@ -26,8 +26,12 @@ ## -*- texinfo -*- ## @deftypefn {} {@var{cest} =} condest (@var{A}) ## @deftypefnx {} {@var{cest} =} condest (@var{A}, @var{t}) -## @deftypefnx {} {@var{cest} =} condest (@var{A}, @var{solvefun}, @var{t}, @var{p1}, @var{p2}, @dots{}) -## @deftypefnx {} {@var{cest} =} condest (@var{Afcn}, @var{solvefun}, @var{t}, @var{p1}, @var{p2}, @dots{}) +## @deftypefnx {} {@var{cest} =} condest (@var{A}, @var{Ainvfcn}) +## @deftypefnx {} {@var{cest} =} condest (@var{A}, @var{Ainvfcn}, @var{t}) +## @deftypefnx {} {@var{cest} =} condest (@var{A}, @var{Ainvfcn}, @var{t}, @var{p1}, @var{p2}, @dots{}) +## @deftypefnx {} {@var{cest} =} condest (@var{Afcn}, @var{Ainvfcn}) +## @deftypefnx {} {@var{cest} =} condest (@var{Afcn}, @var{Ainvfcn}, @var{t}) +## @deftypefnx {} {@var{cest} =} condest (@var{Afcn}, @var{Ainvfcn}, @var{t}, @var{p1}, @var{p2}, @dots{}) ## @deftypefnx {} {[@var{cest}, @var{v}] =} condest (@dots{}) ## ## Estimate the 1-norm condition number of a square matrix @var{A} using @@ -35,54 +39,56 @@ ## ## The optional input @var{t} specifies the number of test vectors (default 5). ## -## If the matrix is not explicit, e.g., when estimating the condition number of -## @var{A} given an LU@tie{}factorization, @code{condest} uses the following -## functions: +## The input may be a matrix @var{A} (the algorithm is particularly +## appropriate for large, sparse matrices). Alternatively, the behavior of +## the matrix can be defined implicitly by functions. When using an implicit +## definition, @code{condest} requires the following functions: ## ## @itemize @minus -## @item @var{Afcn} which must return +## @item @code{@var{Afcn} (@var{flag}, @var{x})} which must return ## ## @itemize @bullet ## @item -## the dimension @var{n} of @var{a}, if @var{flag} is @qcode{"dim"} +## the dimension @var{n} of @var{A}, if @var{flag} is @qcode{"dim"} ## ## @item -## true if @var{a} is a real operator, if @var{flag} is @qcode{"real"} +## true if @var{A} is a real operator, if @var{flag} is @qcode{"real"} ## ## @item -## the result @code{@var{a} * @var{x}}, if @var{flag} is "notransp" +## the result @code{@var{A} * @var{x}}, if @var{flag} is "notransp" ## ## @item -## the result @code{@var{a}' * @var{x}}, if @var{flag} is "transp" +## the result @code{@var{A}' * @var{x}}, if @var{flag} is "transp" ## @end itemize ## -## @item @var{solvefun} which must return +## @item @code{@var{Ainvfcn} (@var{flag}, @var{x})} which must return ## ## @itemize @bullet ## @item -## the dimension @var{n} of @var{a}, if @var{flag} is @qcode{"dim"} +## the dimension @var{n} of @code{inv (@var{A})}, if @var{flag} is +## @qcode{"dim"} ## ## @item -## true if @var{a} is a real operator, if @var{flag} is @qcode{"real"} +## true if @code{inv (@var{A})} is a real operator, if @var{flag} is +## @qcode{"real"} ## ## @item -## the result @code{@var{a} \ @var{x}}, if @var{flag} is "notransp" +## the result @code{inv (@var{A}) * @var{x}}, if @var{flag} is "notransp" ## ## @item -## the result @code{@var{a}' \ @var{x}}, if @var{flag} is "transp" +## the result @code{inv (@var{A})' * @var{x}}, if @var{flag} is "transp" ## @end itemize ## @end itemize ## -## The parameters @var{p1}, @var{p2}, @dots{} are arguments of +## Any parameters @var{p1}, @var{p2}, @dots{} are additional arguments of ## @code{@var{Afcn} (@var{flag}, @var{x}, @var{p1}, @var{p2}, @dots{})} -## and @code{@var{solvefcn} (@var{flag}, @var{x}, @var{p1}, @var{p2}, -## @dots{})}. +## and @code{@var{Ainvfcn} (@var{flag}, @var{x}, @var{p1}, @var{p2}, @dots{})}. ## ## The principal output is the 1-norm condition number estimate @var{cest}. ## -## The optional second output is an approximate null vector when @var{cest} is -## large; it satisfies the equation -## @code{norm (A*v, 1) == norm (A, 1) * norm (@var{v}, 1) / @var{est}}. +## The optional second output @var{v} is an approximate null vector; it +## satisfies the equation @code{norm (@var{A}*@var{v}, 1) == +## norm (@var{A}, 1) * norm (@var{v}, 1) / @var{cest}}. ## ## Algorithm Note: @code{condest} uses a randomized algorithm to approximate ## the 1-norms. Therefore, if consistent results are required, the @@ -104,7 +110,7 @@ ## Pseudospectra}. @url{https://citeseer.ist.psu.edu/223007.html} ## @end itemize ## -## @seealso{cond, norm, normest1, normest} +## @seealso{cond, rcond, norm, normest1, normest} ## @end deftypefn ## Code originally licensed under: @@ -142,10 +148,6 @@ ## 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 [cest, v] = condest (varargin) if (nargin < 1 || nargin > 6) @@ -154,8 +156,8 @@ have_A = false; have_t = false; - have_apply_normest1 = false; - have_solve_normest1 = false; + have_Afcn = false; + have_Ainvfcn = false; if (isnumeric (varargin{1})) A = varargin{1}; @@ -166,8 +168,8 @@ n = rows (A); if (nargin > 1) if (is_function_handle (varargin{2})) - solve = varargin{2}; - have_solve_normest1 = true; + Ainvfcn = varargin{2}; + have_Ainvfcn = true; if (nargin > 2) t = varargin{3}; have_t = true; @@ -175,23 +177,20 @@ else t = varargin{2}; have_t = true; - real_op = isreal (A); endif - else - real_op = isreal (A); endif elseif (is_function_handle (varargin{1})) if (nargin == 1) - error("condest: must provide SOLVEFCN when using AFCN"); + error("condest: must provide AINVFCN when using AFCN"); endif - apply = varargin{1}; - have_apply_normest1 = true; + Afcn = varargin{1}; + have_Afcn = true; if (! is_function_handle (varargin{2})) - error("condest: SOLVEFCN must be a function handle"); + error("condest: AINVFCN must be a function handle"); endif - solve = varargin{2}; - have_solve_normest1 = true; - n = apply ("dim", [], varargin{4:end}); + Ainvfcn = varargin{2}; + have_Ainvfcn = true; + n = Afcn ("dim", [], varargin{4:end}); if (nargin > 2) t = varargin{3}; have_t = true; @@ -207,99 +206,131 @@ ## Disable warnings which may be emitted during calculation process. warning ("off", "Octave:nearly-singular-matrix", "local"); - if (! have_solve_normest1) - ## prepare solve in normest1 form + if (! have_Ainvfcn) + ## Prepare Ainvfcn in normest1 form if (issparse (A)) - [L, U, P, Pc] = lu (A); - solve = @(flag, x) solve_sparse (flag, x, n, real_op, L, U, P, Pc); + [L, U, P, Q] = lu (A); + Ainvfcn = @inv_sparse_fcn; else [L, U, P] = lu (A); - solve = @(flag, x) solve_not_sparse (flag, x, n, real_op, L, U, P); + Q = []; + Ainvfcn = @inv_full_fcn; endif - ## Check for singular matrices before continuing + ## Check for singular matrices before continuing (bug #46737) if (any (diag (U) == 0)) cest = Inf; v = []; return; endif + + ## Initialize solver + Ainvfcn ("init", A, L, U, P, Q); + clear L U P Q; endif if (have_A) Anorm = norm (A, 1); else - Anorm = normest1 (apply, t, [], varargin{4:end}); + Anorm = normest1 (Afcn, t, [], varargin{4:end}); endif - [Ainv_norm, v, w] = normest1 (solve, t, [], varargin{4:end}); + [Ainv_norm, v, w] = normest1 (Ainvfcn, t, [], varargin{4:end}); cest = Anorm * Ainv_norm; if (isargout (2)) v = w / norm (w, 1); endif + if (! have_Ainvfcn) + Ainvfcn ("clear"); # clear persistent memory in subfunction + endif + endfunction -function value = solve_sparse (flag, x, n, real_op, L , U , P , Pc) - ## FIXME: Sparse algorithm is less accurate than full matrix version - ## See BIST test for non-orthogonal matrix where relative tolerance +function retval = inv_sparse_fcn (flag, x, varargin) + ## FIXME: Sparse algorithm is less accurate than full matrix version. + ## See BIST test for asymmetric matrix where relative tolerance ## of 1e-12 is used for sparse, but 4e-16 for full matrix. + ## BUT, does it really matter for an "estimate"? + persistent Ainv Ainvt n isreal_op; + switch (flag) case "dim" - value = n; + retval = n; case "real" - value = real_op; + retval = isreal_op; case "notransp" - value = Pc' * (U \ (L \ (P * x))); + retval = Ainv * x; case "transp" - value = P' * (L' \ (U' \ (Pc * x))); + retval = Ainvt * x; + case "init" + n = rows (x); + isreal_op = isreal (x); + [L, U, P, Q] = deal (varargin{1:4}); + Ainv = Q * (U \ (L \ P)); + Ainvt = P' * (L' \ (U' \ Q')); + case "clear" # called to free memory at end of condest function + clear Ainv Ainvt n isreal_op; endswitch + endfunction -function value = solve_not_sparse (flag, x, n, real_op, L, U, P) +function retval = inv_full_fcn (flag, x, varargin) + persistent Ainv Ainvt n isreal_op; + switch (flag) case "dim" - value = n; + retval = n; case "real" - value = real_op; + retval = isreal_op; case "notransp" - value = U \ (L \ (P * x)); + retval = Ainv * x; case "transp" - value = P' * (L' \ (U' \ x)); + retval = Ainvt \ x; + case "init" + n = rows (x); + isreal_op = isreal (x); + [L, U, P] = deal (varargin{1:3}); + Ainv = U \ (L \ P); + Ainvt = P' * (L' \ U'); + case "clear" # called to free memory at end of condest function + clear Ainv Ainvt n isreal_op; endswitch + endfunction ## Note: These test bounds are very loose. There is enough randomization to ## trigger odd cases with hilb(). -%!function value = apply_fun (flag, x, A, m) +%!function retval = __Afcn__ (flag, x, A, m) %! if (nargin == 3) %! m = 1; %! endif %! switch (flag) %! case "dim" -%! value = length (A); +%! retval = length (A); %! case "real" -%! value = isreal (A); +%! retval = isreal (A); %! case "notransp" -%! value = x; for i = 1:m, value = A * value;, endfor +%! retval = x; for i = 1:m, retval = A * retval;, endfor %! case "transp" -%! value = x; for i = 1:m, value = A' * value;, endfor +%! retval = x; for i = 1:m, retval = A' * retval;, endfor %! endswitch %!endfunction -%!function value = solve_fun (flag, x, A, m) +%!function retval = __Ainvfcn__ (flag, x, A, m) %! if (nargin == 3) %! m = 1; %! endif %! switch (flag) %! case "dim" -%! value = length (A); +%! retval = length (A); %! case "real" -%! value = isreal (A); +%! retval = isreal (A); %! case "notransp" -%! value = x; for i = 1:m, value = A \ value;, endfor +%! retval = x; for i = 1:m, retval = A \ retval;, endfor %! case "transp" -%! value = x; for i = 1:m, value = A' \ value;, endfor +%! retval = x; for i = 1:m, retval = A' \ retval;, endfor %! endswitch %!endfunction @@ -320,25 +351,25 @@ %!test %! N = 6; %! A = hilb (N); -%! solve = @(flag, x) solve_fun (flag, x, A); -%! cA = condest (A, solve); +%! Ainvfcn = @(flag, x) __Ainvfcn__ (flag, x, A); +%! cA = condest (A, Ainvfcn); %! cA_test = norm (inv (A), 1) * norm (A, 1); %! assert (cA, cA_test, -2^-6); %!test %! N = 6; %! A = hilb (N); -%! apply = @(flag, x) apply_fun (flag, x, A); -%! solve = @(flag, x) solve_fun (flag, x, A); -%! cA = condest (apply, solve); +%! Afcn = @(flag, x) __Afcn__ (flag, x, A); +%! Ainvfcn = @(flag, x) __Ainvfcn__ (flag, x, A); +%! cA = condest (Afcn, Ainvfcn); %! cA_test = norm (inv (A), 1) * norm (A, 1); %! assert (cA, cA_test, -2^-6); -%!test # parameters for apply and solve functions +%!test # parameters for apply and Ainvfcn functions %! N = 6; %! A = hilb (N); %! m = 2; -%! cA = condest (@apply_fun, @solve_fun, [], A, m); +%! cA = condest (@__Afcn__, @__Ainvfcn__, [], A, m); %! cA_test = norm (inv (A^2), 1) * norm (A^2, 1); %! assert (cA, cA_test, -2^-6); @@ -351,7 +382,7 @@ %! assert (cest, Inf); %! assert (v, []); -## Test non-orthogonal matrices +## Test asymmetric matrices %!test <*57968> %! A = reshape (sqrt (0:15), 4, 4); %! cexp = norm (A, 1) * norm (inv (A), 1); @@ -365,9 +396,9 @@ %! assert (cest, cexp, -1e-12); ## Test input validation -%!error condest () -%!error condest (1,2,3,4,5,6,7) -%!error <A must be square> condest ([1 2]) -%!error <must provide SOLVEFCN when using AFCN> condest (@sin) -%!error <SOLVEFCN must be a function handle> condest (@sin, 1) +%!error <Invalid call> condest () +%!error <Invalid call> condest (1,2,3,4,5,6,7) +%!error <A must be square> condest ([1, 2]) +%!error <must provide AINVFCN when using AFCN> condest (@sin) +%!error <AINVFCN must be a function handle> condest (@sin, 1) %!error <argument must be a square matrix or function handle> condest ({1})
--- a/scripts/miscellaneous/copyfile.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/copyfile.m Fri May 22 11:06:58 2020 +0200 @@ -53,7 +53,7 @@ endif max_cmd_line = 1024; - status = true; + sts = 1; msg = ""; msgid = ""; @@ -87,13 +87,27 @@ ## If f1 has more than 1 element then f2 must be a directory isdir = isfolder (f2); if (numel (f1) > 1 && ! isdir) - error ("copyfile: when copying multiple files, F2 must be a directory"); + if (nargout == 0) + error ("copyfile: when copying multiple files, F2 must be a directory"); + else + status = 0; + msg = "when copying multiple files, F2 must be a directory"; + msgid = "copyfile"; + return; + endif endif ## Protect the filename(s). f1 = glob (f1); if (isempty (f1)) - error ("copyfile: no files to move"); + if (nargout == 0) + error ("copyfile: no files to move"); + else + status = 0; + msg = "no files to move"; + msgid = "copyfile"; + return; + endif endif p1 = sprintf ('"%s" ', f1{:}); p2 = tilde_expand (f2); @@ -118,7 +132,7 @@ ## Copy the files. [err, msg] = system (sprintf ('%s %s"%s"', cmd, p1, p2)); if (err != 0) - status = false; + sts = 0; msgid = "copyfile"; break; endif @@ -133,11 +147,19 @@ ## Copy the files. [err, msg] = system (sprintf ('%s %s"%s"', cmd, p1, p2)); if (err != 0) - status = false; + sts = 0; msgid = "copyfile"; endif endif + if (nargout == 0) + if (sts == 0) + error ("copyfile: operation failed: %s", msg); + endif + else + status = sts; + endif + endfunction @@ -172,3 +194,4 @@ %!error <F1 must be a string> copyfile (1, "foobar") %!error <F2 must be a string> copyfile ("foobar", 1) %!error <F2 must be a directory> copyfile ({"a", "b"}, "%_NOT_A_DIR_%") +%!error <no files to move> copyfile ("%_NOT_A_FILENAME1_%", "%_NOT_A_FILENAME2_%")
--- a/scripts/miscellaneous/delete.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/delete.m Fri May 22 11:06:58 2020 +0200 @@ -80,7 +80,7 @@ %! delete (file); %! assert (! exist (file, "file")); %! unwind_protect_cleanup -%! unlink (file); +%! sts = unlink (file); %! end_unwind_protect %!test
--- a/scripts/miscellaneous/dir.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/dir.m Fri May 22 11:06:58 2020 +0200 @@ -224,7 +224,7 @@ %! chdir (orig_dir); %! confirm_recursive_rmdir (false, "local"); %! if (exist (tmp_dir)) -%! rmdir (tmp_dir, "s"); +%! sts = rmdir (tmp_dir, "s"); %! endif %! end_unwind_protect @@ -238,7 +238,7 @@ %! assert (list(1).folder, canonicalize_file_name (tmp_dir)); %! unwind_protect_cleanup %! if (exist (tmp_dir)) -%! rmdir (tmp_dir); +%! sts = rmdir (tmp_dir); %! endif %! end_unwind_protect
--- a/scripts/miscellaneous/fieldnames.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/fieldnames.m Fri May 22 11:06:58 2020 +0200 @@ -28,19 +28,19 @@ ## @deftypefnx {} {@var{names} =} fieldnames (@var{obj}) ## @deftypefnx {} {@var{names} =} fieldnames (@var{javaobj}) ## @deftypefnx {} {@var{names} =} fieldnames ("@var{javaclassname}") -## Return a cell array of strings with the names of the fields in the -## specified input. +## Return a cell array of strings with the names of the fields in the specified +## input. ## -## When the input is a structure @var{struct}, the names are the elements of -## the structure. +## When the input is a structure @var{struct}, the @var{names} are the elements +## of the structure. ## -## When the input is an Octave object @var{obj}, the names are the public +## When the input is an Octave object @var{obj}, the @var{names} are the public ## properties of the object. ## ## When the input is a Java object @var{javaobj} or a string containing the -## name of a Java class @var{javaclassname}, the names are the public fields -## (data members) of the object or class. -## @seealso{numfields, isfield, orderfields, struct, methods} +## name of a Java class @var{javaclassname}, the @var{names} are the public +## fields (data members) of the object or class. +## @seealso{numfields, isfield, orderfields, struct, properties} ## @end deftypefn function names = fieldnames (obj) @@ -49,9 +49,14 @@ print_usage (); endif - if (isstruct (obj) || isobject (obj)) - ## Call internal C++ function for structs or Octave objects + if (isstruct (obj)) names = __fieldnames__ (obj); + elseif (isobject (obj)) + try + names = properties (obj); ## classdef object + catch + names = __fieldnames__ (obj); ## @class object + end_try_catch elseif (isjava (obj) || ischar (obj)) ## FIXME: Function prototype that accepts java obj exists, but doesn't ## work if obj is java.lang.String. Convert obj to classname. @@ -70,22 +75,34 @@ endfunction -## test preservation of fieldname order +## Test preservation of fieldname order %!test %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3; %! assert (fieldnames (x), {"d"; "a"; "b"; "c"}); -## test empty structure +## Test empty structure %!test %! s = struct (); %! assert (fieldnames (s), cell (0, 1)); -## test Java classname by passing classname +## Test classdef object +%!test +%! m = containers.Map (); +%! f = fieldnames (m); +%! assert (f, {"Count"; "KeyType"; "ValueType"; "map"; "numeric_keys"}); + +## Test old-style @class object +%!test +%! obj = ftp (); +%! f = fieldnames (obj); +%! assert (f, {"host"; "username"; "password"; "curlhandle"}); + +## Test Java classname by passing classname %!testif HAVE_JAVA; usejava ("jvm") %! names = fieldnames ("java.lang.Double"); %! assert (any (strcmp (names, "MAX_VALUE"))); -## test Java classname by passing java object +## Test Java classname by passing java object %!testif HAVE_JAVA; usejava ("jvm") %! names = fieldnames (javaObject ("java.lang.Double", 10)); %! assert (any (strcmp (names, "MAX_VALUE")));
--- a/scripts/miscellaneous/fileattrib.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/fileattrib.m Fri May 22 11:06:58 2020 +0200 @@ -24,13 +24,16 @@ ######################################################################## ## -*- texinfo -*- -## @deftypefn {} {} fileattrib (@var{file}) -## @deftypefnx {} {} fileattrib () +## @deftypefn {} {} fileattrib () +## @deftypefnx {} {} fileattrib (@var{file}) +## @deftypefnx {} {[@var{status}, @var{attrib}] =} fileattrib (@dots{}) ## @deftypefnx {} {[@var{status}, @var{msg}, @var{msgid}] =} fileattrib (@dots{}) -## Return information about @var{file}. +## Report attribute information about @var{file}. ## -## If successful, @var{status} is 1 and @var{msg} is a structure with the -## following fields: +## If no file or directory is specified, report information about the present +## working directory. +## +## If successful, the output is a structure with the following fields: ## ## @table @code ## @item Name @@ -64,17 +67,20 @@ ## True if the user (group; other users) has execute permission for @var{file}. ## @end table ## -## If an attribute does not apply (i.e., archive on a Unix system) then the +## If an attribute does not apply (e.g., archive on a Unix system) then the ## field is set to NaN. ## -## If @code{attrib} fails, @var{msg} is a non-empty string containing an -## error message and @var{msg_id} is the non-empty string @qcode{"fileattrib"}. +## If @var{file} contains globbing characters, information about all matching +## files is returned in a structure array. ## -## With no input arguments, return information about the current directory. -## -## If @var{file} contains globbing characters, return information about all -## the matching files. -## @seealso{glob} +## If outputs are requested, the first is @var{status} which takes the value 1 +## when the operation was successful, and 0 otherwise. The second output +## contains the structure described above (@var{attrib}) if the operation was +## successful; otherwise, the second output is a system-dependent error message +## (@var{msg}). The third output is an empty string ("") when the operation +## was successful, or a unique message identifier (@var{msgid}) in the case of +## failure. +## @seealso{stat, glob} ## @end deftypefn function [status, msg, msgid] = fileattrib (file = ".") @@ -87,7 +93,7 @@ error ("fileattrib: FILE must be a string"); endif - status = true; + sts = 1; msg = ""; msgid = ""; @@ -108,10 +114,9 @@ r(i).hidden = NaN; else [~, attrib] = dos (sprintf ('attrib "%s"', r(i).Name)); - ## dos never returns error status so have to check it indirectly + ## DOS never returns error status so have to check it indirectly if (! isempty (strfind (attrib, " -"))) - status = false; - msgid = "fileattrib"; + sts = 0; break; endif attrib = regexprep (attrib, '\S+:.*', ""); @@ -142,15 +147,23 @@ r(i).OtherExecute = NaN; endif else - status = false; - msgid = "fileattrib"; + sts = 0; break; endif endfor - if (status) - if (nargout == 0) - status = r; + if (nargout == 0) + if (! sts) + error ("fileattrib: operation failed"); + endif + status = r; + else + status = sts; + if (! sts) + if (isempty (msg)) + msg = "operation failed"; + endif + msgid = "fileattrib"; else msg = r; endif
--- a/scripts/miscellaneous/fullfile.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/fullfile.m Fri May 22 11:06:58 2020 +0200 @@ -25,16 +25,17 @@ ## -*- texinfo -*- ## @deftypefn {} {@var{filename} =} fullfile (@var{dir1}, @var{dir2}, @dots{}, @var{file}) -## @deftypefnx {} {@var{filenames} =} fullfile (@dots{}, @var{files}) ## Build complete filename from separate parts. ## -## Joins any number of path components intelligently. The return value is -## the concatenation of each component with exactly one file separator -## between each non empty part and at most one leading and/or trailing file +## The function joins any number of path components intelligently. The return +## value is the concatenation of each component with exactly one file separator +## between each part of the path and at most one leading and/or trailing file ## separator. ## -## If the last component part is a cell array, returns a cell array of -## filepaths, one for each element in the last component, e.g.: +## The input arguments might be strings or cell strings. Any input arguments +## that are cell strings must contain one single string or must be equal in +## size. In that case, the function returns a cell string of filepaths of the +## same dimensions as the input cell strings, e.g.: ## ## @example ## @group @@ -49,7 +50,7 @@ ## @end example ## ## On Windows systems, while forward slash file separators do work, they are -## replaced by backslashes; in addition drive letters are stripped of leading +## replaced by backslashes. In addition, drive letters are stripped of leading ## file separators to obtain a valid file path. ## ## Note: @code{fullfile} does not perform any validation of the resulting full @@ -59,19 +60,58 @@ function filename = fullfile (varargin) - if (nargin && iscell (varargin{end})) - filename = cellfun (@(x) fullfile (varargin{1:end-1}, x), varargin{end}, - "UniformOutput", false); - else - non_empty = cellfun ("isempty", varargin); - unc = 0; - if (ispc && ! isempty (varargin)) - varargin = strrep (varargin, '/', filesep); - unc = strncmp (varargin{1}, '\\', 2); - varargin(1) = regexprep (varargin{1}, '[\\/]*([a-zA-Z]:[\\/]*)', "$1"); - endif - filename = strjoin (varargin(! non_empty), filesep); - filename(unc + strfind (filename(1+unc : end), [filesep filesep])) = ""; + ## remove empty arguments + varargin(cellfun (@isempty, varargin)) = []; + + if (isempty (varargin)) + ## return early for all empty or no input + filename = ""; + return; + endif + + ## check input type + is_cellstr = cellfun (@iscellstr, varargin); + if (! all (is_cellstr | cellfun (@ischar, varargin))) + error ("fullfile: input must either be strings or cell strings"); + endif + + ## convert regular strings to cell strings + varargin(! is_cellstr) = num2cell (varargin(! is_cellstr)); + + ## check if input size matches + if (numel (varargin) > 1 && common_size (varargin{:}) != 0) + error ("fullfile: cell string input must be scalar or of the same size"); + endif + + fs = filesep (); + + if (ispc ()) + ## replace forward slashes with backslashes + varargin = cellfun (@(x) strrep (x, "/", fs), varargin, + "UniformOutput", false); + + ## Strip fileseps preceeding drive letters + varargin{1} = regexprep (varargin{1}, '\\*([a-zA-Z]:\\*)', "$1"); + + unc = strncmp (varargin{1}, '\\', 2); + endif + + ## insert file separator between elements + varargin(2,:) = {fs}; + varargin{end} = ""; + + filename = strcat (varargin{:}); + + ## remove multiplicate file separators + filename = regexprep (filename, [undo_string_escapes(fs), "*"], fs); + + if (ispc ()) + ## prepend removed file separator for UNC paths + filename(unc) = strcat (fs, filename(unc)); + endif + + if (! any (is_cellstr)) + filename = filename{1}; endif endfunction @@ -79,13 +119,14 @@ %!shared fs, fsx, xfs, fsxfs, xfsy, xfsyfs %! fs = filesep (); -%! fsx = [fs "x"]; -%! xfs = ["x" fs]; -%! fsxfs = [fs "x" fs]; -%! xfsy = ["x" fs "y"]; -%! xfsyfs = ["x" fs "y" fs]; +%! fsx = [fs, "x"]; +%! xfs = ["x", fs]; +%! fsxfs = [fs, "x", fs]; +%! xfsy = ["x", fs, "y"]; +%! xfsyfs = ["x", fs, "y", fs]; %!assert (fullfile (""), "") +%!assert (fullfile ("", ""), "") %!assert (fullfile (fs), fs) %!assert (fullfile ("", fs), fs) %!assert (fullfile (fs, ""), fs) @@ -105,32 +146,39 @@ %!assert (fullfile (fs, "x", fs), fsxfs) %!assert (fullfile ("x/", "/", "/", "y", "/", "/"), xfsyfs) -%!assert (fullfile ("/", "x/", "/", "/", "y", "/", "/"), [fs xfsyfs]) -%!assert (fullfile ("/x/", "/", "/", "y", "/", "/"), [fs xfsyfs]) +%!assert (fullfile ("/", "x/", "/", "/", "y", "/", "/"), [fs, xfsyfs]) +%!assert (fullfile ("/x/", "/", "/", "y", "/", "/"), [fs, xfsyfs]) ## different on purpose so that "fullfile (c{:})" works for empty c %!assert (fullfile (), "") -%!assert (fullfile ("x", "y", {"c", "d"}), {[xfsyfs "c"], [xfsyfs "d"]}) +%!assert (fullfile ("x", "y", {"c", "d"}), {[xfsyfs, "c"], [xfsyfs, "d"]}) +%!assert (fullfile ({"folder1", "folder2"}, "sub", {"f1.m", "f2.m"}), ... +%! {["folder1", fs, "sub", fs, "f1.m"], ... +%! ["folder2", fs, "sub", fs, "f2.m"]}); ## Windows specific - drive letters and file sep type -%!test -%! if (ispc) -%! assert (fullfile ('\/\/\//A:/\/\', "x/", "/", "/", "y", "/", "/"), ... -%! ['A:\' xfsyfs]); -%! endif +%!testif ; ispc () +%! assert (fullfile ('\/\/\//A:/\/\', "x/", "/", "/", "y", "/", "/"), ... +%! ['A:\' xfsyfs]); ## *nix specific - double backslash -%!test -%! if (isunix || ismac) -%! assert (fullfile (fs, fs), fs); -%! endif +%!testif ; ! ispc () +%! assert (fullfile (fs, fs), fs); + +## Windows specific - UNC path +%!testif ; ispc () +%! assert (fullfile ({'\/\//server1', 'C:', '\\server2\/'}, ... +%! "x/", "/", "/", "y", "/", "/"), ... +%! {['\\server1\', xfsyfs], ['C:\', xfsyfs], ['\\server2\', xfsyfs]}); ## Windows specific - drive letters and file sep type, cell array -%!test -%! if (ispc) -%! tmp = fullfile ({"\\\/B:\//", "A://c", "\\\C:/g/h/i/j\/"}); -%! assert (tmp{1}, 'B:\'); -%! assert (tmp{2}, 'A:\c'); -%! assert (tmp{3}, 'C:\g\h\i\j\'); -%! endif +%!testif ; ispc () +%! tmp = fullfile ({'\\\/B:\//', 'A://c', '\\\C:/g/h/i/j\/'}); +%! assert (tmp{1}, 'B:\'); +%! assert (tmp{2}, 'A:\c'); +%! assert (tmp{3}, 'C:\g\h\i\j\'); + +%!error <strings or cell strings> fullfile (1) +%!error <strings or cell strings> fullfile ({1}) +%!error <same size> fullfile ({"a", "b"}, {"a", "b", "c"})
--- a/scripts/miscellaneous/isfolder.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/isfolder.m Fri May 22 11:06:58 2020 +0200 @@ -70,8 +70,8 @@ %! addpath (d); %! assert (! isfolder (n)); %! unwind_protect_cleanup -%! try, rmdir (tmp); end_try_catch -%! try, rmpath (d); end_try_catch +%! sts = rmdir (tmp); +%! rmpath (d); %! end_unwind_protect ## Test input validation
--- a/scripts/miscellaneous/mkdir.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/mkdir.m Fri May 22 11:06:58 2020 +0200 @@ -112,7 +112,7 @@ %! assert (isfolder (dir)); %! unwind_protect_cleanup %! confirm_recursive_rmdir (false, "local"); -%! rmdir (dir1, "s"); +%! sts = rmdir (dir1, "s"); %! end_unwind_protect %!test <*53031> @@ -125,8 +125,8 @@ %! assert (status); %! assert (isfolder (fullfile (tmp_dir, "subdir"))); %! unwind_protect_cleanup -%! rmdir (fullfile (tmp_dir, "subdir")); -%! rmdir (tmp_dir); +%! sts = rmdir (fullfile (tmp_dir, "subdir")); +%! sts = rmdir (tmp_dir); %! if (isempty (HOME)) %! unsetenv ("HOME"); %! else
--- a/scripts/miscellaneous/movefile.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/movefile.m Fri May 22 11:06:58 2020 +0200 @@ -59,7 +59,7 @@ endif max_cmd_line = 1024; - status = true; + sts = 1; msg = ""; msgid = ""; @@ -96,13 +96,27 @@ ## If f1 has more than 1 element f2 must be a directory isdir = isfolder (f2); if (numel (f1) > 1 && ! isdir) - error ("movefile: when moving multiple files, F2 must be a directory"); + if (nargout == 0) + error ("movefile: when copying multiple files, F2 must be a directory"); + else + status = 0; + msg = "when copying multiple files, F2 must be a directory"; + msgid = "movefile"; + return; + endif endif ## Protect the filename(s). f1 = glob (f1); if (isempty (f1)) - error ("movefile: no files to move"); + if (nargout == 0) + error ("movefile: no files to move"); + else + status = 0; + msg = "no files to move"; + msgid = "movefile"; + return; + endif endif p1 = sprintf ('"%s" ', f1{:}); p2 = tilde_expand (f2); @@ -129,11 +143,11 @@ ## Move the file(s). [err, msg] = system (sprintf ('%s %s "%s"', cmd, p1, p2)); if (err != 0) - status = false; + sts = 0; msgid = "movefile"; endif ## Load new file(s) in editor - __event_manager_file_renamed__ (status); + __event_manager_file_renamed__ (sts); endwhile else if (ispc () && ! isunix () @@ -147,11 +161,19 @@ ## Move the file(s). [err, msg] = system (sprintf ('%s %s "%s"', cmd, p1, p2)); if (err != 0) - status = false; + sts = 0; msgid = "movefile"; endif ## Load new file(s) in editor - __event_manager_file_renamed__ (status); + __event_manager_file_renamed__ (sts); + endif + + if (nargout == 0) + if (sts == 0) + error ("movefile: operation failed: %s", msg); + endif + else + status = sts; endif endfunction @@ -187,3 +209,4 @@ %!error <F1 must be a string> movefile (1, "foobar") %!error <F2 must be a string> movefile ("foobar", 1) %!error <F2 must be a directory> movefile ({"a", "b"}, "%_NOT_A_DIR_%") +%!error <no files to move> movefile ("%_NOT_A_FILENAME1_%", "%_NOT_A_FILENAME2_%")
--- a/scripts/miscellaneous/run.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/run.m Fri May 22 11:06:58 2020 +0200 @@ -114,7 +114,7 @@ %! assert (_5yVNhWVJWJn47RKnzxPsyb_, 1337); %! unwind_protect_cleanup %! unlink (test_script); -%! rmdir (tmp_dir); +%! sts = rmdir (tmp_dir); %! end_unwind_protect ## Test function file execution @@ -140,7 +140,7 @@ %! assert (tstval2, true); %! unwind_protect_cleanup %! unlink (test_function); -%! rmdir (tmp_dir); +%! sts = rmdir (tmp_dir); %! path (path_orig); %! end_unwind_protect
--- a/scripts/miscellaneous/tar.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/tar.m Fri May 22 11:06:58 2020 +0200 @@ -149,12 +149,8 @@ %! chdir (orig_dir); %! unlink (tarname); %! confirm_recursive_rmdir (false, "local"); -%! if (exist (dirname)) -%! rmdir (dirname, "s"); -%! endif -%! if (exist (outdir)) -%! rmdir (outdir, "s"); -%! endif +%! sts = rmdir (dirname, "s"); +%! sts = rmdir (outdir, "s"); %! end_unwind_protect ## Test input validation
--- a/scripts/miscellaneous/unpack.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/unpack.m Fri May 22 11:06:58 2020 +0200 @@ -372,7 +372,7 @@ %! unlink (filename); %! unlink ([filename ".orig"]); %! confirm_recursive_rmdir (false, "local"); -%! rmdir (dirname, "s"); +%! sts = rmdir (dirname, "s"); %! end_unwind_protect %! unwind_protect_cleanup %! ## Restore environment variables TMPDIR, TMP
--- a/scripts/miscellaneous/zip.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/miscellaneous/zip.m Fri May 22 11:06:58 2020 +0200 @@ -126,11 +126,11 @@ %! error ("unzipped file not equal to original file!"); %! endif %! unwind_protect_cleanup -%! unlink (filename); -%! unlink ([dirname, filesep, basename, ext]); -%! unlink (zipfile); -%! unlink ([zipfile ".zip"]); -%! rmdir (dirname); +%! sts = unlink (filename); +%! sts = unlink ([dirname, filesep, basename, ext]); +%! sts = unlink (zipfile); +%! sts = unlink ([zipfile ".zip"]); +%! sts = rmdir (dirname); %! end_unwind_protect ## Test input validation
--- a/scripts/path/pathdef.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/path/pathdef.m Fri May 22 11:06:58 2020 +0200 @@ -112,7 +112,7 @@ %! assert (! isempty (strfind (p1, tmp_dir))) %! assert (isempty (strfind (p2, tmp_dir))) %! unwind_protect_cleanup -%! rmdir (tmp_dir); +%! sts = rmdir (tmp_dir); %! path (path_orig); %! end_unwind_protect @@ -128,7 +128,7 @@ %! path_2 = path (); %! assert (path_1, path_2) %! unwind_protect_cleanup -%! rmdir (tmp_dir); +%! sts = rmdir (tmp_dir); %! path (path_orig); %! end_unwind_protect
--- a/scripts/path/savepath.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/path/savepath.m Fri May 22 11:06:58 2020 +0200 @@ -230,6 +230,6 @@ %! end_unwind_protect %! unwind_protect_cleanup %! confirm_recursive_rmdir (false, "local"); -%! rmdir (test_dir, "s"); +%! sts = rmdir (test_dir, "s"); %! unlink (fname); %! end_unwind_protect
--- a/scripts/pkg/private/configure_make.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/pkg/private/configure_make.m Fri May 22 11:06:58 2020 +0200 @@ -88,7 +88,7 @@ cmd = ["cd '" src "'; " scenv " ./configure " flags]; [status, output] = shell (cmd, verbose); if (status != 0) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); disp (output); error ("pkg: error running the configure script for %s.", desc.name); endif @@ -105,7 +105,7 @@ [status, output] = shell (sprintf ("%s make --jobs %i --directory '%s'", scenv, jobs, src), verbose); if (status != 0) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); disp (output); error ("pkg: error running 'make' for the %s package.", desc.name); endif
--- a/scripts/pkg/private/install.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/pkg/private/install.m Fri May 22 11:06:58 2020 +0200 @@ -145,7 +145,7 @@ catch ## Something went wrong, delete tmpdirs. for i = 1:length (tmpdirs) - rmdir (tmpdirs{i}, "s"); + sts = rmdir (tmpdirs{i}, "s"); endfor rethrow (lasterror ()); end_try_catch @@ -199,7 +199,7 @@ catch ## Something went wrong, delete tmpdirs. for i = 1:length (tmpdirs) - rmdir (tmpdirs{i}, "s"); + sts = rmdir (tmpdirs{i}, "s"); endfor rethrow (lasterror ()); end_try_catch @@ -218,7 +218,7 @@ catch ## Something went wrong, delete tmpdirs. for i = 1:length (tmpdirs) - rmdir (tmpdirs{i}, "s"); + sts = rmdir (tmpdirs{i}, "s"); endfor rethrow (lasterror ()); end_try_catch @@ -237,11 +237,11 @@ catch ## Something went wrong, delete tmpdirs. for i = 1:length (tmpdirs) - rmdir (tmpdirs{i}, "s"); + sts = rmdir (tmpdirs{i}, "s"); endfor for i = 1:length (descriptions) - rmdir (descriptions{i}.dir, "s"); - rmdir (getarchdir (descriptions{i}), "s"); + sts = rmdir (descriptions{i}.dir, "s"); + sts = rmdir (getarchdir (descriptions{i}), "s"); endfor rethrow (lasterror ()); end_try_catch @@ -252,8 +252,8 @@ if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}) && dirempty (getarchdir (descriptions{i}))) warning ("package %s is empty\n", descriptions{i}.name); - rmdir (descriptions{i}.dir, "s"); - rmdir (getarchdir (descriptions{i}), "s"); + sts = rmdir (descriptions{i}.dir, "s"); + sts = rmdir (getarchdir (descriptions{i}), "s"); descriptions(i) = []; endif endfor @@ -282,10 +282,10 @@ catch ## Something went wrong, delete tmpdirs. for i = 1:length (tmpdirs) - rmdir (tmpdirs{i}, "s"); + sts = rmdir (tmpdirs{i}, "s"); endfor for i = 1:length (descriptions) - rmdir (descriptions{i}.dir, "s"); + sts = rmdir (descriptions{i}.dir, "s"); endfor if (global_install) printf ("error: couldn't append to %s\n", global_list); @@ -376,7 +376,7 @@ if (! isfolder (inst_dir)) [status, msg] = mkdir (inst_dir); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("the 'inst' directory did not exist and could not be created: %s", msg); endif @@ -450,7 +450,7 @@ endif [status, output] = copyfile (archindependent, instdir); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("Couldn't copy files from 'src' to 'inst': %s", output); endif endif @@ -465,7 +465,7 @@ endif [status, output] = copyfile (archdependent, archdir); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("Couldn't copy files from 'src' to 'inst': %s", output); endif endif @@ -517,7 +517,7 @@ if (! dirempty (instdir)) [status, output] = copyfile (fullfile (instdir, "*"), desc.dir); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("couldn't copy files to the installation directory"); endif if (isfolder (fullfile (desc.dir, getarch ())) @@ -532,39 +532,39 @@ if (! isfolder (octm3)) [status, output] = mkdir (octm3); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("couldn't create installation directory %s : %s", octm3, output); endif endif [status, output] = mkdir (octm2); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("couldn't create installation directory %s : %s", octm2, output); endif endif [status, output] = mkdir (octm1); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("couldn't create installation directory %s : %s", octm1, output); endif endif [status, output] = mkdir (octfiledir); if (status != 1) - rmdir (desc.dir, "s"); + sts = rmdir (desc.dir, "s"); error ("couldn't create installation directory %s : %s", octfiledir, output); endif endif [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), octfiledir); - rmdir (fullfile (desc.dir, getarch ()), "s"); + sts = rmdir (fullfile (desc.dir, getarch ()), "s"); if (status != 1) - rmdir (desc.dir, "s"); - rmdir (octfiledir, "s"); + sts = rmdir (desc.dir, "s"); + sts = rmdir (octfiledir, "s"); error ("couldn't copy files to the installation directory"); endif endif @@ -575,8 +575,8 @@ packinfo = fullfile (desc.dir, "packinfo"); [status, msg] = mkdir (packinfo); if (status != 1) - rmdir (desc.dir, "s"); - rmdir (octfiledir, "s"); + sts = rmdir (desc.dir, "s"); + sts = rmdir (octfiledir, "s"); error ("couldn't create packinfo directory: %s", msg); endif @@ -596,8 +596,8 @@ write_index (desc, fullfile (packdir, "inst"), fullfile (packinfo, "INDEX"), global_install); catch - rmdir (desc.dir, "s"); - rmdir (octfiledir, "s"); + sts = rmdir (desc.dir, "s"); + sts = rmdir (octfiledir, "s"); rethrow (lasterror ()); end_try_catch endif @@ -629,8 +629,8 @@ else [status, output] = copyfile (filepath, packinfo); if (status != 1) - rmdir (desc.dir, "s"); - rmdir (octfiledir, "s"); + sts = rmdir (desc.dir, "s"); + sts = rmdir (octfiledir, "s"); error ("Couldn't copy %s file: %s", filename, output); endif endif @@ -801,8 +801,8 @@ cd (wd); catch cd (wd); - rmdir (desc.dir, "s"); - rmdir (getarchdir (desc), "s"); + sts = rmdir (desc.dir, "s"); + sts = rmdir (getarchdir (desc), "s"); rethrow (lasterror ()); end_try_catch endif
--- a/scripts/pkg/private/uninstall.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/pkg/private/uninstall.m Fri May 22 11:06:58 2020 +0200 @@ -122,6 +122,11 @@ endif endif if (isfolder (desc.dir)) + ## FIXME: If first call to rmdir fails, then error() will + ## stop further processing of getarchdir & archprefix. + ## If this is, in fact, correct, then calls should + ## just be shortened to rmdir (...) and let rmdir() + ## report failure and reason for failure. [status, msg] = rmdir (desc.dir, "s"); if (status != 1 && isfolder (desc.dir)) error ("couldn't delete directory %s: %s", desc.dir, msg); @@ -131,7 +136,7 @@ error ("couldn't delete directory %s: %s", getarchdir (desc), msg); endif if (dirempty (desc.archprefix)) - rmdir (desc.archprefix, "s"); + sts = rmdir (desc.archprefix, "s"); endif else warning ("directory %s previously lost", desc.dir);
--- a/scripts/plot/appearance/axis.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/appearance/axis.m Fri May 22 11:06:58 2020 +0200 @@ -54,14 +54,20 @@ ## The following options control the aspect ratio of the axes. ## ## @table @asis +## @item @qcode{"equal"} +## Force x-axis unit distance to equal y-axis (and z-axis) unit distance. +## ## @item @qcode{"square"} ## Force a square axis aspect ratio. ## -## @item @qcode{"equal"} -## Force x-axis unit distance to equal y-axis (and z-axis) unit distance. +## @item @nospell{@qcode{"vis3d"}} +## Set aspect ratio modes (@qcode{"DataAspectRatio"}, +## @qcode{"PlotBoxAspectRatio"}) to @qcode{"manual"} for rotation without +## stretching. ## -## @item @qcode{"normal"} -## Restore default aspect ratio. +## @item @qcode{"normal"} +## @itemx @qcode{"fill"} +## Restore default automatically computed aspect ratios. ## @end table ## ## @noindent @@ -83,8 +89,6 @@ ## @item @qcode{"image"} ## Equivalent to @qcode{"tight"} and @qcode{"equal"}. ## -## @item @nospell{@qcode{"vis3d"}} -## Set aspect ratio modes to @qcode{"manual"} for rotation without stretching. ## @end table ## ## @noindent @@ -250,7 +254,7 @@ ## Fix aspect ratio modes for rotation without stretching. set (ca, "dataaspectratiomode", "manual", "plotboxaspectratiomode", "manual"); - elseif (strcmpi (opt, "normal")) + elseif (strcmpi (opt, "normal") || strcmpi (opt, "fill")) ## Set plotboxaspectratio to something obtuse so that switching ## back to "auto" will force a re-calculation. set (ca, "plotboxaspectratio", [3 2 1]);
--- a/scripts/plot/appearance/daspect.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/appearance/daspect.m Fri May 22 11:06:58 2020 +0200 @@ -130,7 +130,7 @@ %! x = 0:0.01:4; %! plot (x,cos(x), x, sin(x)); %! axis square; -%! set (gca, "activepositionproperty", "position"); +%! set (gca, "positionconstraint", "innerposition"); %! daspect ([1 1 1]); %! title ("square plot box with axis limits [0, 4, -2, 2]"); @@ -139,7 +139,7 @@ %! x = 0:0.01:4; %! plot (x,cos(x), x,sin(x)); %! axis ([0 4 -1 1]); -%! set (gca, "activepositionproperty", "position"); +%! set (gca, "positionconstraint", "innerposition"); %! daspect ([2 1 1]); %! title ("square plot box with axis limits [0, 4, -1, 1]");
--- a/scripts/plot/appearance/private/__gnuplot_legend__.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/appearance/private/__gnuplot_legend__.m Fri May 22 11:06:58 2020 +0200 @@ -622,7 +622,7 @@ "box", box, "xtick", [], "ytick", [], "xlim", [0, 1], "ylim", [0, 1], - "activepositionproperty", "position"); + "positionconstraint", "innerposition"); setappdata (hlegend, "__axes_handle__", ud); try addproperty ("__legend_handle__", ud(1), "handle", hlegend); @@ -1062,7 +1062,7 @@ ## This violates strict Matlab compatibility, but reliably ## renders an aesthetic result. set (ca(i), "position", unmodified_axes_position, - "activepositionproperty", "outerposition"); + "positionconstraint", "outerposition"); else ## numel (ca) > 1 for axes overlays (like plotyy) set (ca(i), "position", new_pos); @@ -1181,8 +1181,8 @@ outerposition = get (hleg, "unmodified_axes_outerposition"); units = get (hax, "units"); set (hax, "units", "points"); - switch (get (hax, "activepositionproperty")) - case "position" + switch (get (hax, "positionconstraint")) + case "innerposition" set (hax, "outerposition", outerposition, "position", position); case "outerposition" set (hax, "position", position, "outerposition", outerposition);
--- a/scripts/plot/draw/colorbar.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/colorbar.m Fri May 22 11:06:58 2020 +0200 @@ -219,7 +219,7 @@ set (hax, "units", orig_props.units, "position", orig_props.position, "outerposition", orig_props.outerposition, - "activepositionproperty", orig_props.activepositionproperty); + "positionconstraint", orig_props.positionconstraint); set (hax, "units", units); endif @@ -251,7 +251,7 @@ ## FIXME: Matlab does not require the "position" property to be active. ## Is there a way to determine the plotbox position for the ## gnuplot graphics toolkit when the outerposition is active? - set (hax, "activepositionproperty", "position"); + set (hax, "positionconstraint", "innerposition"); props = get (hax); props.__axes_handle__ = hax; position = props.position; @@ -276,7 +276,7 @@ ## Create colorbar axes if necessary if (new_colorbar) hcb = axes ("parent", hpar, "tag", "colorbar", - "activepositionproperty", "position", "position", cbpos, + "positionconstraint", "innerposition", "position", cbpos, "colormap", cmap, "box", "on", "xdir", "normal", "ydir", "normal"); @@ -438,7 +438,7 @@ set (hax, "units", orig_props.units, "position", orig_props.position, "outerposition", orig_props.outerposition, - "activepositionproperty", orig_props.activepositionproperty); + "positionconstraint", orig_props.positionconstraint); set (hax, "units", units); ## Nullify colorbar link (can't delete properties yet) @@ -534,7 +534,7 @@ scale = [scale, 1]; endif if (strcmp (get (cf, "__graphics_toolkit__"), "gnuplot") - && strcmp (props.activepositionproperty, "outerposition")) + && strcmp (props.positionconstraint, "outerposition")) props.outerposition = props.outerposition .* [1, 1, scale]; off = 0.5 * (props.outerposition (3:4) - __actual_axis_position__ (props)(3:4)); else @@ -884,7 +884,7 @@ %! shading interp; %! axis ("tight", "square"); %! colorbar (); -#%! axes ("color","none","box","on","activepositionproperty","position"); +#%! axes ("color", "none", "box", "on", "positionconstraint", "innerposition"); %!demo %! clf;
--- a/scripts/plot/draw/lightangle.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/lightangle.m Fri May 22 11:06:58 2020 +0200 @@ -122,7 +122,7 @@ pos -= get (hax, "CameraTarget"); endif - pos = sph2cart (az, el, norm (pos)); + [pos(1), pos(2), pos(3)] = sph2cart (az, el, norm (pos)); if (strcmp (get (hl, "Style"), "local")) pos += get (hax, "CameraTarget");
--- a/scripts/plot/draw/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/module.mk Fri May 22 11:06:58 2020 +0200 @@ -9,6 +9,7 @@ %reldir%/private/__contour__.m \ %reldir%/private/__errplot__.m \ %reldir%/private/__ezplot__.m \ + %reldir%/private/__gnuplot_scatter__.m \ %reldir%/private/__interp_cube__.m \ %reldir%/private/__line__.m \ %reldir%/private/__marching_cube__.m \
--- a/scripts/plot/draw/plotyy.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/plotyy.m Fri May 22 11:06:58 2020 +0200 @@ -136,9 +136,9 @@ if (strcmp (get (ax(1), "__autopos_tag__"), "subplot")) set (ax(2), "__autopos_tag__", "subplot"); elseif (strcmp (graphics_toolkit (), "gnuplot")) - set (ax, "activepositionproperty", "position"); + set (ax, "positionconstraint", "innerposition"); else - set (ax, "activepositionproperty", "outerposition"); + set (ax, "positionconstraint", "outerposition"); endif ## Don't replace axis which has colororder property already modified @@ -154,7 +154,7 @@ set (ax(2), "ycolor", getcolor (h2)); endif - if (strcmp (get(ax(1), "activepositionproperty"), "position")) + if (strcmp (get(ax(1), "positionconstraint"), "innerposition")) set (ax(2), "position", get (ax(1), "position")); else set (ax(2), {"outerposition", "looseinset"},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/plot/draw/private/__gnuplot_scatter__.m Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,345 @@ +######################################################################## +## +## Copyright (C) 2020 The Octave Project Developers +## +## See the file COPYRIGHT.md in the top-level directory of this +## distribution or <https://octave.org/copyright/>. +## +## 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{hg} =} __gnuplot_scatter__ (@dots{}) +## Undocumented internal function. +## @end deftypefn + +function hg = __gnuplot_scatter__ (hax, fcn, x, y, z, c, s, marker, filled, newargs) + +if (isempty (c)) + c = __next_line_color__ (); +endif + +## Must occur after __next_line_color__ in order to work correctly. +hg = hggroup (hax, "__appdata__", struct ("__creator__", "__scatter__")); +newargs = __add_datasource__ (fcn, hg, {"x", "y", "z", "c", "size"}, + newargs{:}); + +addproperty ("xdata", hg, "data", x); +addproperty ("ydata", hg, "data", y); +addproperty ("zdata", hg, "data", z); +if (ischar (c)) + ## For single explicit color, cdata is unused + addproperty ("cdata", hg, "data", []); +else + addproperty ("cdata", hg, "data", c); +endif +addproperty ("sizedata", hg, "data", s); +addlistener (hg, "xdata", @update_data); +addlistener (hg, "ydata", @update_data); +addlistener (hg, "zdata", @update_data); +addlistener (hg, "cdata", @update_data); +addlistener (hg, "sizedata", @update_data); + +one_explicit_color = ischar (c) || isequal (size (c), [1, 3]); +s = sqrt (s); # size adjustment for visual compatibility w/Matlab + +if (numel (x) <= 100) + + ## For small number of points, we'll construct an object for each point. + + if (numel (s) == 1) + s = repmat (s, numel (x), 1); + endif + + if (one_explicit_color) + for i = 1 : numel (x) + if (filled) + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x(i), "ydata", y(i), "zdata", z(i,:), + "faces", 1, "vertices", [x(i), y(i), z(i,:)], + "marker", marker, "markersize", s(i), + "markeredgecolor", c, "markerfacecolor", c, + "linestyle", "none"); + else + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x(i), "ydata", y(i), "zdata", z(i,:), + "faces", 1, "vertices", [x(i), y(i), z(i,:)], + "marker", marker, "markersize", s(i), + "markeredgecolor", c, "markerfacecolor", "none", + "linestyle", "none"); + endif + endfor + else + if (rows (c) == 1) + c = repmat (c, rows (x), 1); + endif + for i = 1 : numel (x) + if (filled) + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x(i), "ydata", y(i), "zdata", z(i,:), + "faces", 1, "vertices", [x(i), y(i), z(i,:)], + "marker", marker, "markersize", s(i), + "markeredgecolor", "none", + "markerfacecolor", "flat", + "cdata", c(i,:), "facevertexcdata", c(i,:), + "linestyle", "none"); + else + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x(i), "ydata", y(i), "zdata", z(i,:), + "faces", 1, "vertices", [x(i), y(i), z(i,:)], + "marker", marker, "markersize", s(i), + "markeredgecolor", "flat", + "markerfacecolor", "none", + "cdata", c(i,:), "facevertexcdata", c(i,:), + "linestyle", "none"); + endif + endfor + endif + +else + + ## For larger numbers of points, we use one single object. + vert = [x, y, z]; + render_size_color (hg, vert, s, c, marker, filled, true); + +endif + +if (! ischar (c) && rows (c) > 1) + ax = get (hg, "parent"); + clim = get (ax, "clim"); + if (min (c(:)) < clim(1)) + clim(1) = min (c(:)); + set (ax, "clim", clim); + endif + if (max (c(:)) > clim(2)) + set (ax, "clim", [clim(1), max(c(:))]); + endif +endif + +addproperty ("linewidth", hg, "patchlinewidth", 0.5); +addproperty ("marker", hg, "patchmarker", marker); +if (filled) + addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", "none"); + if (one_explicit_color) + addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", c); + else + addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", "flat"); + endif +else + addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", "none"); + if (one_explicit_color) + addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", c); + else + addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", "flat"); + endif +endif +addlistener (hg, "linewidth", @update_props); +addlistener (hg, "marker", @update_props); +addlistener (hg, "markerfacecolor", @update_props); +addlistener (hg, "markeredgecolor", @update_props); + +## Matlab property, although Octave does not implement it. +addproperty ("hittestarea", hg, "radio", "on|{off}", "off"); + +if (! isempty (newargs)) + set (hg, newargs{:}); +endif + +endfunction + +function render_size_color (hg, vert, s, c, marker, filled, isflat) + + if (isempty (c)) + c = __next_line_color__ (); + endif + + if (isscalar (s)) + x = vert(:,1); + y = vert(:,2); + z = vert(:,3:end); + toolkit = get (ancestor (hg, "figure"), "__graphics_toolkit__"); + ## Does gnuplot only support triangles with different vertex colors ? + ## FIXME: Verify gnuplot can only support one color. If RGB triplets + ## can be assigned to each vertex, then fix __gnuplot_draw_axes__.m + gnuplot_hack = (numel (x) > 1 && columns (c) == 3 + && strcmp (toolkit, "gnuplot")); + if (ischar (c) || ! isflat || gnuplot_hack) + if (filled) + ## "facecolor" and "edgecolor" must be set before any other properties + ## to skip co-planarity check (see bug #55751). + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x, "ydata", y, "zdata", z, + "faces", 1:numel (x), "vertices", vert, + "marker", marker, + "markeredgecolor", "none", + "markerfacecolor", c(1,:), + "markersize", s, "linestyle", "none"); + else + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x, "ydata", y, "zdata", z, + "faces", 1:numel (x), "vertices", vert, + "marker", marker, + "markeredgecolor", c(1,:), + "markerfacecolor", "none", + "markersize", s, "linestyle", "none"); + endif + else + if (filled) + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x, "ydata", y, "zdata", z, + "faces", 1:numel (x), "vertices", vert, + "marker", marker, "markersize", s, + "markeredgecolor", "none", + "markerfacecolor", "flat", + "cdata", c, "facevertexcdata", c, + "linestyle", "none"); + else + __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", + "xdata", x, "ydata", y, "zdata", z, + "faces", 1:numel (x), "vertices", vert, + "marker", marker, "markersize", s, + "markeredgecolor", "flat", + "markerfacecolor", "none", + "cdata", c, "facevertexcdata", c, + "linestyle", "none"); + endif + endif + else + ## Round size to one decimal place. + [ss, ~, s_to_ss] = unique (ceil (s*10) / 10); + for i = 1:rows (ss) + idx = (i == s_to_ss); + render_size_color (hg, vert(idx,:), ss(i), c, + marker, filled, isflat); + endfor + endif + +endfunction + +function update_props (h, d) + + lw = get (h, "linewidth"); + m = get (h, "marker"); + fc = get (h, "markerfacecolor"); + ec = get (h, "markeredgecolor"); + kids = get (h, "children"); + + set (kids, "linewidth", lw, "marker", m, + "markerfacecolor", fc, "markeredgecolor", ec); + +endfunction + +## FIXME: This callback routine doesn't handle the case where N > 100. +function update_data (h, d) + + x = get (h, "xdata"); + y = get (h, "ydata"); + z = get (h, "zdata"); + if (numel (x) > 100) + error ("scatter: cannot update data with more than 100 points. Call scatter (x, y, ...) with new data instead."); + endif + c = get (h, "cdata"); + one_explicit_color = ischar (c) || isequal (size (c), [1, 3]); + if (! one_explicit_color) + if (rows (c) == 1) + c = repmat (c, numel (x), 1); + endif + endif + filled = ! strcmp (get (h, "markerfacecolor"), "none"); + s = get (h, "sizedata"); + ## Size adjustment for visual compatibility with Matlab. + s = sqrt (s); + if (numel (s) == 1) + s = repmat (s, numel (x), 1); + endif + hlist = get (h, "children"); + + if (one_explicit_color) + if (filled) + if (isempty (z)) + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i)], + "markersize", s(i), + "markeredgecolor", c, "markerfacecolor", c); + + endfor + else + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i), z(i)], + "markersize", s(i), + "markeredgecolor", c, "markerfacecolor", c); + endfor + endif + else + if (isempty (z)) + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i)], + "markersize", s(i), + "markeredgecolor", c, "markerfacecolor", "none"); + + endfor + else + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i), z(i)], + "markersize", s(i), + "markeredgecolor", c, "markerfacecolor", "none"); + endfor + endif + endif + else + if (filled) + if (isempty (z)) + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i)], + "markersize", s(i), + "markeredgecolor", "none", "markerfacecolor", "flat", + "cdata", reshape (c(i,:),[1, size(c)(2:end)]), + "facevertexcdata", c(i,:)); + endfor + else + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i), z(i)], + "markersize", s(i), + "markeredgecolor", "none", "markerfacecolor", "flat", + "cdata", reshape (c(i,:),[1, size(c)(2:end)]), + "facevertexcdata", c(i,:)); + endfor + endif + else + if (isempty (z)) + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i)], + "markersize", s(i), + "markeredgecolor", "flat", "markerfacecolor", "none", + "cdata", reshape (c(i,:),[1, size(c)(2:end)]), + "facevertexcdata", c(i,:)); + endfor + else + for i = 1 : length (hlist) + set (hlist(i), "vertices", [x(i), y(i), z(i)], + "markersize", s(i), + "markeredgecolor", "flat", "markerfacecolor", "none", + "cdata", reshape (c(i,:),[1, size(c)(2:end)]), + "facevertexcdata", c(i,:)); + endfor + endif + endif + endif + +endfunction +
--- a/scripts/plot/draw/private/__scatter__.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/private/__scatter__.m Fri May 22 11:06:58 2020 +0200 @@ -24,13 +24,13 @@ ######################################################################## ## -*- texinfo -*- -## @deftypefn {} {@var{hg} =} __scatter__ (@dots{}) +## @deftypefn {} {@var{hs} =} __scatter__ (@dots{}) ## Undocumented internal function. ## @end deftypefn -function hg = __scatter__ (varargin) +function hs = __scatter__ (varargin) - hax = varargin{1}; # We don't do anything with this. Could remove it. + hax = varargin{1}; nd = varargin{2}; fcn = varargin{3}; x = varargin{4}(:); @@ -169,311 +169,57 @@ endif endwhile - if (isempty (c)) - c = __next_line_color__ (); - endif + if (strcmp ("gnuplot", graphics_toolkit ())) + ## Legacy code using patch for gnuplot toolkit + hs = __gnuplot_scatter__ (hax, fcn, x, y, z, c, s, marker, filled, newargs); - ## Must occur after __next_line_color__ in order to work correctly. - hg = hggroup ("__appdata__", struct ("__creator__", "__scatter__")); - newargs = __add_datasource__ (fcn, hg, {"x", "y", "z", "c", "size"}, - newargs{:}); - - addproperty ("xdata", hg, "data", x); - addproperty ("ydata", hg, "data", y); - addproperty ("zdata", hg, "data", z); - if (ischar (c)) - ## For single explicit color, cdata is unused - addproperty ("cdata", hg, "data", []); else - addproperty ("cdata", hg, "data", c); - endif - addproperty ("sizedata", hg, "data", s); - addlistener (hg, "xdata", @update_data); - addlistener (hg, "ydata", @update_data); - addlistener (hg, "zdata", @update_data); - addlistener (hg, "cdata", @update_data); - addlistener (hg, "sizedata", @update_data); - - one_explicit_color = ischar (c) || isequal (size (c), [1, 3]); - s = sqrt (s); # size adjustment for visual compatibility w/Matlab - - if (numel (x) <= 100) - - ## For small number of points, we'll construct an object for each point. - - if (numel (s) == 1) - s = repmat (s, numel (x), 1); + ## Use OpenGL rendering for "qt" and "fltk" graphics toolkits + if isempty (x) + c = x; + endif + if ischar (c) + c = str2rgb (c); + endif + if isempty (c) + cdata_args = {}; + else + cdata_args = {"cdata", c}; endif - if (one_explicit_color) - for i = 1 : numel (x) - if (filled) - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x(i), "ydata", y(i), "zdata", z(i,:), - "faces", 1, "vertices", [x(i), y(i), z(i,:)], - "marker", marker, "markersize", s(i), - "markeredgecolor", c, "markerfacecolor", c, - "linestyle", "none"); - else - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x(i), "ydata", y(i), "zdata", z(i,:), - "faces", 1, "vertices", [x(i), y(i), z(i,:)], - "marker", marker, "markersize", s(i), - "markeredgecolor", c, "markerfacecolor", "none", - "linestyle", "none"); - endif - endfor - else - if (rows (c) == 1) - c = repmat (c, rows (x), 1); - endif - for i = 1 : numel (x) - if (filled) - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x(i), "ydata", y(i), "zdata", z(i,:), - "faces", 1, "vertices", [x(i), y(i), z(i,:)], - "marker", marker, "markersize", s(i), - "markeredgecolor", "none", - "markerfacecolor", "flat", - "cdata", c(i,:), "facevertexcdata", c(i,:), - "linestyle", "none"); - else - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x(i), "ydata", y(i), "zdata", z(i,:), - "faces", 1, "vertices", [x(i), y(i), z(i,:)], - "marker", marker, "markersize", s(i), - "markeredgecolor", "flat", - "markerfacecolor", "none", - "cdata", c(i,:), "facevertexcdata", c(i,:), - "linestyle", "none"); - endif - endfor - endif + hs = __go_scatter__ (hax, "xdata", x(:), "ydata", y(:), "zdata", z(:), + cdata_args{:}, "sizedata", s(:), "marker", marker, + newargs{:}); - else - - ## For larger numbers of points, we use one single object. - vert = [x, y, z]; - render_size_color (hg, vert, s, c, marker, filled, true); - - endif - - if (! ischar (c) && rows (c) > 1) - ax = get (hg, "parent"); - clim = get (ax, "clim"); - if (min (c(:)) < clim(1)) - clim(1) = min (c(:)); - set (ax, "clim", clim); - endif - if (max (c(:)) > clim(2)) - set (ax, "clim", [clim(1), max(c(:))]); + if filled + set (hs, "markerfacecolor", "flat"); endif endif - addproperty ("linewidth", hg, "patchlinewidth", 0.5); - addproperty ("marker", hg, "patchmarker", marker); - if (filled) - addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", "none"); - if (one_explicit_color) - addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", c); - else - addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", "flat"); - endif - else - addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", "none"); - if (one_explicit_color) - addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", c); - else - addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", "flat"); - endif - endif - addlistener (hg, "linewidth", @update_props); - addlistener (hg, "marker", @update_props); - addlistener (hg, "markerfacecolor", @update_props); - addlistener (hg, "markeredgecolor", @update_props); - - ## Matlab property, although Octave does not implement it. - addproperty ("hittestarea", hg, "radio", "on|{off}", "off"); - - if (! isempty (newargs)) - set (hg, newargs{:}); - endif - endfunction -function render_size_color (hg, vert, s, c, marker, filled, isflat) + +function rgb = str2rgb(str) +## convert a color code to the corresponding rgb values +rgb = []; - if (isscalar (s)) - x = vert(:,1); - y = vert(:,2); - z = vert(:,3:end); - toolkit = get (ancestor (hg, "figure"), "__graphics_toolkit__"); - ## Does gnuplot only support triangles with different vertex colors ? - ## FIXME: Verify gnuplot can only support one color. If RGB triplets - ## can be assigned to each vertex, then fix __gnuplot_draw_axes__.m - gnuplot_hack = (numel (x) > 1 && columns (c) == 3 - && strcmp (toolkit, "gnuplot")); - if (ischar (c) || ! isflat || gnuplot_hack) - if (filled) - ## "facecolor" and "edgecolor" must be set before any other properties - ## to skip co-planarity check (see bug #55751). - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x, "ydata", y, "zdata", z, - "faces", 1:numel (x), "vertices", vert, - "marker", marker, - "markeredgecolor", "none", - "markerfacecolor", c(1,:), - "markersize", s, "linestyle", "none"); - else - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x, "ydata", y, "zdata", z, - "faces", 1:numel (x), "vertices", vert, - "marker", marker, - "markeredgecolor", c(1,:), - "markerfacecolor", "none", - "markersize", s, "linestyle", "none"); - endif - else - if (filled) - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x, "ydata", y, "zdata", z, - "faces", 1:numel (x), "vertices", vert, - "marker", marker, "markersize", s, - "markeredgecolor", "none", - "markerfacecolor", "flat", - "cdata", c, "facevertexcdata", c, - "linestyle", "none"); - else - __go_patch__ (hg, "facecolor", "none", "edgecolor", "none", - "xdata", x, "ydata", y, "zdata", z, - "faces", 1:numel (x), "vertices", vert, - "marker", marker, "markersize", s, - "markeredgecolor", "flat", - "markerfacecolor", "none", - "cdata", c, "facevertexcdata", c, - "linestyle", "none"); - endif - endif - else - ## Round size to one decimal place. - [ss, ~, s_to_ss] = unique (ceil (s*10) / 10); - for i = 1:rows (ss) - idx = (i == s_to_ss); - render_size_color (hg, vert(idx,:), ss(i), c, - marker, filled, isflat); - endfor - endif - -endfunction - -function update_props (h, d) - - lw = get (h, "linewidth"); - m = get (h, "marker"); - fc = get (h, "markerfacecolor"); - ec = get (h, "markeredgecolor"); - kids = get (h, "children"); - - set (kids, "linewidth", lw, "marker", m, - "markerfacecolor", fc, "markeredgecolor", ec); +switch str + case 'b' + rgb = [0, 0, 1]; + case 'k' + rgb = [0, 0, 0]; + case 'r' + rgb = [1, 0, 0]; + case 'g' + rgb = [0, 1, 0]; + case 'y' + rgb = [1, 1, 0]; + case 'm' + rgb = [1, 0, 1]; + case 'c' + rgb = [0, 1, 1]; + case 'w' + rgb = [1, 1, 1]; +endswitch endfunction - -## FIXME: This callback routine doesn't handle the case where N > 100. -function update_data (h, d) - - x = get (h, "xdata"); - y = get (h, "ydata"); - z = get (h, "zdata"); - if (numel (x) > 100) - error ("scatter: cannot update data with more than 100 points. Call scatter (x, y, ...) with new data instead."); - endif - c = get (h, "cdata"); - one_explicit_color = ischar (c) || isequal (size (c), [1, 3]); - if (! one_explicit_color) - if (rows (c) == 1) - c = repmat (c, numel (x), 1); - endif - endif - filled = ! strcmp (get (h, "markerfacecolor"), "none"); - s = get (h, "sizedata"); - ## Size adjustment for visual compatibility with Matlab. - s = sqrt (s); - if (numel (s) == 1) - s = repmat (s, numel (x), 1); - endif - hlist = get (h, "children"); - - if (one_explicit_color) - if (filled) - if (isempty (z)) - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i)], - "markersize", s(i), - "markeredgecolor", c, "markerfacecolor", c); - - endfor - else - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i), z(i)], - "markersize", s(i), - "markeredgecolor", c, "markerfacecolor", c); - endfor - endif - else - if (isempty (z)) - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i)], - "markersize", s(i), - "markeredgecolor", c, "markerfacecolor", "none"); - - endfor - else - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i), z(i)], - "markersize", s(i), - "markeredgecolor", c, "markerfacecolor", "none"); - endfor - endif - endif - else - if (filled) - if (isempty (z)) - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i)], - "markersize", s(i), - "markeredgecolor", "none", "markerfacecolor", "flat", - "cdata", reshape (c(i,:),[1, size(c)(2:end)]), - "facevertexcdata", c(i,:)); - endfor - else - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i), z(i)], - "markersize", s(i), - "markeredgecolor", "none", "markerfacecolor", "flat", - "cdata", reshape (c(i,:),[1, size(c)(2:end)]), - "facevertexcdata", c(i,:)); - endfor - endif - else - if (isempty (z)) - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i)], - "markersize", s(i), - "markeredgecolor", "flat", "markerfacecolor", "none", - "cdata", reshape (c(i,:),[1, size(c)(2:end)]), - "facevertexcdata", c(i,:)); - endfor - else - for i = 1 : length (hlist) - set (hlist(i), "vertices", [x(i), y(i), z(i)], - "markersize", s(i), - "markeredgecolor", "flat", "markerfacecolor", "none", - "cdata", reshape (c(i,:),[1, size(c)(2:end)]), - "facevertexcdata", c(i,:)); - endfor - endif - endif - endif - -endfunction
--- a/scripts/plot/draw/scatter.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/scatter.m Fri May 22 11:06:58 2020 +0200 @@ -72,6 +72,8 @@ ## @end group ## @end example ## +## Programming Note: The full list of properties is documented at +## @ref{Scatter Properties}. ## @seealso{scatter3, patch, plot} ## @end deftypefn @@ -219,3 +221,20 @@ %! title (str); %! endfor %! endfor + + +%!testif ; ! strcmp (graphics_toolkit (), "gnuplot") +%! hf = figure ("visible", "off"); +%! unwind_protect +%! hs = scatter ([], []); +%! assert (get (hs, "type"), "scatter"); +%! assert (isempty (get (hs, "xdata"))); +%! assert (isempty (get (hs, "ydata"))); +%! assert (isempty (get (hs, "zdata"))); +%! assert (get (hs, "cdata"), [0, 0.4470, 0.7410]); +%! assert (get (hs, "cdatamode"), "auto"); +%! assert (get (hs, "sizedata"), 36); +%! assert (get (hs, "linewidth"), 0.5); +%! unwind_protect_cleanup +%! close (hf); +%! end_unwind_protect
--- a/scripts/plot/draw/scatter3.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/scatter3.m Fri May 22 11:06:58 2020 +0200 @@ -59,7 +59,7 @@ ## If the first argument @var{hax} is an axes handle, then plot into this axes, ## rather than the current axes returned by @code{gca}. ## -## The optional return value @var{h} is a graphics handle to the hggroup +## The optional return value @var{h} is a graphics handle to the scatter ## object representing the points. ## ## @example @@ -69,6 +69,8 @@ ## @end group ## @end example ## +## Programming Note: The full list of properties is documented at +## @ref{Scatter Properties}. ## @seealso{scatter, patch, plot} ## @end deftypefn
--- a/scripts/plot/draw/semilogx.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/semilogx.m Fri May 22 11:06:58 2020 +0200 @@ -104,12 +104,12 @@ %! %! subplot (1,2,1); %! semilogx (x, y); -%! set (gca, "xdir", "reverse", "activepositionproperty", "outerposition"); +%! set (gca, "xdir", "reverse", "positionconstraint", "outerposition"); %! title ({"semilogx (x, y)", "xdir = reversed"}); %! %! subplot (1,2,2); %! semilogx (-x, y); -%! set (gca, "xdir", "reverse", "activepositionproperty", "outerposition"); +%! set (gca, "xdir", "reverse", "positionconstraint", "outerposition"); %! title ({"semilogx (-x, y)", "xdir = reversed"}); %!test
--- a/scripts/plot/draw/semilogy.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/semilogy.m Fri May 22 11:06:58 2020 +0200 @@ -104,12 +104,12 @@ %! %! subplot (2,1,1); %! semilogy (x, y); -%! set (gca, "ydir", "reverse", "activepositionproperty", "outerposition"); +%! set (gca, "ydir", "reverse", "positionconstraint", "outerposition"); %! title ({"semilogy (x, y)", "ydir = reversed"}); %! %! subplot (2,1,2); %! semilogy (x, -y); -%! set (gca, "ydir", "reverse", "activepositionproperty", "outerposition"); +%! set (gca, "ydir", "reverse", "positionconstraint", "outerposition"); %! title ({"semilogy (x, -y)", "ydir = reversed"}); %!test
--- a/scripts/plot/draw/surfl.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/draw/surfl.m Fri May 22 11:06:58 2020 +0200 @@ -156,7 +156,7 @@ ## Get view vector (vv). [az, el] = view (); - vv = sph2cart ((az - 90) * pi/180.0, el * pi/180.0, 1.0); + [vv(1), vv(2), vv(3)] = sph2cart ((az - 90) * pi/180.0, el * pi/180.0, 1.0); if (! have_lv) ## Calculate light vector (lv) from view vector.
--- a/scripts/plot/util/__actual_axis_position__.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/__actual_axis_position__.m Fri May 22 11:06:58 2020 +0200 @@ -50,7 +50,7 @@ end_unwind_protect ## Get axes size in pixels if (strcmp (get (axis_obj.parent, "__graphics_toolkit__"), "gnuplot") - && strcmp (axis_obj.activepositionproperty, "outerposition")) + && strcmp (axis_obj.positionconstraint, "outerposition")) pos_in_pixels = axis_obj.outerposition .* fig_position([3, 4, 3, 4]); else pos_in_pixels = axis_obj.position .* fig_position([3, 4, 3, 4]); @@ -82,7 +82,7 @@ endif pos = pos_in_pixels ./ fig_position([3, 4, 3, 4]); elseif (strcmp (get (axis_obj.parent, "__graphics_toolkit__"), "gnuplot") - && strcmp (axis_obj.activepositionproperty, "outerposition")) + && strcmp (axis_obj.positionconstraint, "outerposition")) pos = axis_obj.outerposition; else pos = axis_obj.position;
--- a/scripts/plot/util/hdl2struct.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/hdl2struct.m Fri May 22 11:06:58 2020 +0200 @@ -139,12 +139,13 @@ persistent excluded; if (isempty (excluded)) - excluded = cell2struct (repmat ({[]}, 1, 15), + excluded = cell2struct (repmat ({[]}, 1, 16), {"beingdeleted", "busyaction", "buttondownfcn", ... - "children", "clipping", "createfcn", ... - "deletefcn", "handlevisibility", "hittest", ... - "interruptible", "parent", "selected" , ... - "selectionhighlight", "type", "uicontextmenu"}, 2); + "children", "clipping", "contextmenu", ... + "createfcn", "deletefcn", "handlevisibility", ... + "hittest", "interruptible", "parent", ... + "selected" , "selectionhighlight", "type", ... + "uicontextmenu"}, 2); endif obj = get (h);
--- a/scripts/plot/util/isprop.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/isprop.m Fri May 22 11:06:58 2020 +0200 @@ -31,29 +31,42 @@ ## logical array indicating whether each handle has the property @var{prop}. ## ## For plotting, @var{obj} is a handle to a graphics object. Otherwise, -## @var{obj} should be an instance of a class. -## @seealso{get, set, ismethod, isobject} +## @var{obj} should be an instance of a class. @code{isprop} reports whether +## the class defines a property, but @code{Access} permissions or visibility +## restrictions (@code{Hidden = true}) may prevent use by the programmer. +## @seealso{get, set, properties, ismethod, isobject} ## @end deftypefn function res = isprop (obj, prop) if (nargin != 2) print_usage (); - elseif (! ischar (prop)) + endif + + if (! ischar (prop)) error ("isprop: PROP name must be a string"); endif - warning ("error", "Octave:abbreviated-property-match", "local"); + if (isobject (obj)) + ## Separate code for classdef objects because Octave doesn't handle arrays + ## of objects and so can't use the generic code. + warning ("off", "Octave:classdef-to-struct", "local"); + + all_props = __fieldnames__ (obj); + res = any (strcmp (prop, all_props)); + else + warning ("error", "Octave:abbreviated-property-match", "local"); - res = false (size (obj)); - for i = 1:numel (res) - if (ishghandle (obj(i))) - try - v = get (obj(i), prop); - res(i) = true; - end_try_catch - endif - endfor + res = false (size (obj)); + for i = 1:numel (res) + if (ishghandle (obj(i))) + try + get (obj(i), prop); + res(i) = true; + end_try_catch + endif + endfor + endif endfunction @@ -63,6 +76,11 @@ %!assert (isprop (zeros (2, 3), "visible"), true (2, 3)) %!assert (isprop ([-2, -1, 0], "visible"), [false, false, true]) +%!test +%! m = containers.Map (); +%! assert (isprop (m, "KeyType")); +%! assert (! isprop (m, "FooBar")); + %!error isprop () %!error isprop (1) %!error isprop (1,2,3)
--- a/scripts/plot/util/print.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/print.m Fri May 22 11:06:58 2020 +0200 @@ -1006,13 +1006,10 @@ switch (opts.devopt) case {"pdflatexstandalone"} packages = "\\usepackage{graphicx,color}"; - graphicsfile = [opts.name "-inc.pdf"]; case {"pslatexstandalone"} packages = "\\usepackage{epsfig,color}"; - graphicsfile = [opts.name "-inc.ps"]; otherwise packages = "\\usepackage{epsfig,color}"; - graphicsfile = [opts.name "-inc.eps"]; endswitch packages = {packages "\\usepackage[utf8]{inputenc}"}; @@ -1035,9 +1032,6 @@ error ("Octave:print:errorclosingfile", "print: error closing file '%s'", latexfile); endif - ## FIXME: should this be fixed in GL2PS? - latex = strrep (latex, "\\includegraphics{}", - sprintf ("\\includegraphics{%s}", graphicsfile)); fid = fopen (latexfile, "w"); if (fid >= 0)
--- a/scripts/plot/util/private/__add_default_menu__.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/private/__add_default_menu__.m Fri May 22 11:06:58 2020 +0200 @@ -28,7 +28,6 @@ ## @deftypefnx {} {} __add_default_menu__ (@var{hfig}, @var{hmenu}) ## Add default menu and listeners to figure. ## -## ## All uimenu handles have their @qcode{"HandleVisibility"} property set to ## @qcode{"off"}. ## @end deftypefn @@ -37,7 +36,7 @@ ## Gnuplot doesn't handle uimenu and uitoolbar objects if (strcmp (graphics_toolkit (), "gnuplot")) - return + return; endif ## Create @@ -45,11 +44,11 @@ ## File menu hui = uimenu (hf, "label", "&File", "tag", "__default_menu__File", ... "handlevisibility", "off"); - uimenu (hui, "label", "&Open", "callback", @open_cb, ... + uimenu (hui, "label", "&Open...", "callback", @open_cb, ... "accelerator", "o"); uimenu (hui, "label", "&Save", "callback", {@save_cb, "save"}, ... "accelerator", "s"); - uimenu (hui, "label", "Save &As", "callback", {@save_cb, "saveas"}, ... + uimenu (hui, "label", "Save &As...", "callback", {@save_cb, "saveas"}, ... "accelerator", "S"); uimenu (hui, "label", "&Close", "callback", @close_cb, ... "accelerator", "w", "separator", "on"); @@ -173,17 +172,16 @@ set (htb, "visible", toolbar_state); endfunction -function open_cb (h, e) - [filename, filedir] = uigetfile ({"*.ofig", "Octave Figure File"}, ... +function open_cb () + [filename, filedir] = uigetfile ({"*.ofig;*.fig", "Figure Files"}, ... "Open Figure"); if (filename != 0) fname = fullfile (filedir, filename); - tmphf = hgload (fname); - set (tmphf, "filename", fname); + openfig (fname); endif endfunction -function save_cb (h, e, action) +function save_cb (h, ~, action) hfig = gcbf (); fname = get (hfig, "filename"); @@ -198,34 +196,53 @@ endif endfunction +function __save_as__ (hf, fname = "") + if (! isempty (fname)) + def = fname; + else + def = fullfile (pwd (), "untitled.ofig"); + endif + filter = {"*.ofig", "Octave Figure"; + "*.eps", "Encapsulated PostScript"; + "*.pdf", "Portable Document Format"; + "*.ps", "PostScript"; + "*.svg", "Scalable Vector Graphics"; + "*.gif", "GIF Image"; + "*.jpg", "JPEG Image"; + "*.png", "Portable Network Graphics Image"; + "*.tiff", "TIFF Image"}; + ## Reorder filters to have current first + [~, ~, ext] = fileparts (def); + idx = strcmp (filter(:,1), ["*" tolower(ext)]); + filter = [filter(idx,:); filter(! idx,:)]; -function __save_as__ (hf, fname = "") - filter = ifelse (! isempty (fname), fname, ... - {"*.ofig", "Octave Figure File"; - "*.eps;*.pdf;*.svg;*.ps", "Vector Image Formats"; - "*.gif;*.jpg;*.png;*.tiff", "Bitmap Image Formats"}); - def = ifelse (! isempty (fname), fname, fullfile (pwd, "untitled.ofig")); - - [filename, filedir] = uiputfile (filter, "Save Figure", def); + [filename, filedir, filteridx] = uiputfile (filter, "Save Figure", def); if (filename != 0) fname = fullfile (filedir, filename); - set (gcbf, "filename", fname); - flen = numel (fname); - if (flen > 5 && strcmp (fname(flen-4:end), ".ofig")) - hgsave (hf, fname); + [~, ~, ext] = fileparts (fname); + if (filteridx > rows (filter)) + ## "All Files" option + if (isempty (ext)) + fmt = ""; + else + fmt = ext(2:end); + endif else - saveas (hf, fname); + fmt = filter{filteridx,1}(3:end); + if (isempty (ext)) + fname = [fname "." fmt]; + endif endif + set (hf, "filename", fname); + saveas (hf, fname, fmt); endif endfunction - -function close_cb (h, e) - close (gcbf); +function close_cb () + close (gcbf ()); endfunction - function [hax, fig] = __get_axes__ (h) ## Get parent figure fig = ancestor (h, "figure"); @@ -234,7 +251,7 @@ hax = findobj (fig, "type", "axes", "-not", "tag", "legend"); endfunction -function autoscale_cb (h, e) +function autoscale_cb (h) hax = __get_axes__ (h); arrayfun (@(h) axis (h, "auto"), hax); drawnow (); @@ -253,7 +270,7 @@ "FigureHandle", hf)); endfunction -function guimode_cb (h, e) +function guimode_cb (h) [hax, fig] = __get_axes__ (h); id = get (h, "tag"); switch (id) @@ -275,7 +292,7 @@ endswitch endfunction -function mouse_tools_cb (h, ev, htools, typ = "") +function mouse_tools_cb (h, ~, htools, typ = "") persistent recursion = false; @@ -290,7 +307,7 @@ mode = get (hf, "__mouse_mode__"); state = "on"; - switch mode + switch (mode) case "zoom" zm = get (hf, "__zoom_mode__"); if (strcmp (zm.Direction, "in")) @@ -318,7 +335,7 @@ ## Update the mouse mode according to the button state state = get (h, "state"); - switch typ + switch (typ) case {"zoomin", "zoomout"} prop = "__zoom_mode__"; val = get (hf, prop); @@ -329,7 +346,7 @@ else val.Direction = "out"; endif - set (hf, "__mouse_mode__" , "zoom"); + set (hf, "__mouse_mode__", "zoom"); endif val.Enable = state; set (hf, prop, val); @@ -338,21 +355,21 @@ prop = ["__", typ, "_mode__"]; val = get (hf, prop); if (strcmp (state, "on")) - set (hf, "__mouse_mode__" , typ); + set (hf, "__mouse_mode__", typ); endif val.Enable = state; set (hf, prop, val); case {"text", "select"} if (strcmp (state, "on")) - set (hf, "__mouse_mode__" , typ); + set (hf, "__mouse_mode__", typ); endif endswitch if (strcmp (state, "on")) set (htools(htools != h), "state", "off"); elseif (! any (strcmp (get (htools, "state"), "on"))) - set (hf, "__mouse_mode__" , "none"); + set (hf, "__mouse_mode__", "none"); endif endif
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m Fri May 22 11:06:58 2020 +0200 @@ -87,7 +87,7 @@ dr = 1; endif - if (strcmp (axis_obj.activepositionproperty, "position")) + if (strcmp (axis_obj.positionconstraint, "innerposition")) if (nd == 2 || all (mod (axis_obj.view, 90) == 0)) x = [1, 1]; else @@ -103,7 +103,7 @@ fprintf (plot_stream, "set rmargin screen %.15g;\n", pos(1)+pos(3)/2+x(1)*pos(3)/2); sz_str = ""; - else ## activepositionproperty == outerposition + else ## positionconstraint == outerposition fprintf (plot_stream, "unset tmargin;\n"); fprintf (plot_stream, "unset bmargin;\n"); fprintf (plot_stream, "unset lmargin;\n");
--- a/scripts/plot/util/private/__print_parse_opts__.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/private/__print_parse_opts__.m Fri May 22 11:06:58 2020 +0200 @@ -248,7 +248,11 @@ if (opengl_ok && strcmp (graphics_toolkit (arg_st.figure), "qt")) ## "opengl" renderer only does text rotations of 0°, 90°, 180°, 270°, ... ht = findall (arg_st.figure, "type", "text"); - angles = [get(ht, "rotation"){:}]; + if (isempty (ht)) + angles = []; + else + angles = [get(ht, "rotation"){:}]; + endif if (any (mod (angles, 90))) arg_st.renderer = "painters"; else
--- a/scripts/plot/util/saveas.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/saveas.m Fri May 22 11:06:58 2020 +0200 @@ -33,6 +33,14 @@ ## are: ## ## @table @code +## +## @item ofig +## Octave figure file format (default) +## +## @item mfig +## Two files: Octave m-file @file{filename.m} containing code +## to open Octave figure file @file{filename.ofig} +## ## @item ps ## PostScript ## @@ -58,7 +66,7 @@ ## ## If @var{fmt} is omitted it is extracted from the extension of ## @var{filename}. The default format when there is no extension is -## @qcode{"pdf"}. +## @qcode{"ofig"}. ## ## @example ## @group @@ -68,7 +76,7 @@ ## @end group ## @end example ## -## @seealso{print, hgsave, orient} +## @seealso{print, savefig, hgsave, orient} ## @end deftypefn function saveas (h, filename, fmt) @@ -90,32 +98,57 @@ fig = ancestor (h, "figure"); endif + default_fmt = "ofig"; + if (nargin == 2) ## Attempt to infer format from filename [~, ~, ext] = fileparts (filename); - if (! isempty (ext)) - fmt = ext(2:end); - else - fmt = "pdf"; + if (isempty (ext)) + ext = ["." default_fmt]; + filename = [filename ext]; endif + fmt = ext(2:end); endif if (nargin == 3) if (! ischar (fmt)) error ("saveas: FMT must be a string"); + elseif (isempty (fmt)) + fmt = default_fmt; endif [~, ~, ext] = fileparts (filename); if (isempty (ext)) - filename = [filename "." fmt]; + ext = ["." fmt]; + filename = [filename ext]; endif endif - prt_opt = ["-d" tolower(fmt)]; + fmt = tolower (fmt); + + if (any (strcmp (fmt, {"ofig", "fig"}))) + savefig (fig, filename); + elseif (any (strcmp (fmt, {"m", "mfig"}))) + [d, n] = fileparts (filename); + mfilename = fullfile (d, [n ".m"]); + figfilename = fullfile (d, [n ".ofig"]); + + savefig (fig, figfilename); - print (fig, filename, prt_opt); + fid = fopen (mfilename, "wt"); + if (fid < 0) + error ("saveas: could not open '%s' for writing", mfilename); + endif + fprintf (fid, ['h = openfig ("' figfilename '");' "\n"]); + fclose (fid); + else + prt_opt = ["-d" fmt]; + + print (fig, filename, prt_opt); + endif endfunction + ## Test input validation %!error saveas () %!error saveas (1)
--- a/scripts/plot/util/struct2hdl.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/struct2hdl.m Fri May 22 11:06:58 2020 +0200 @@ -47,7 +47,7 @@ fields = {"handle", "type", "children", "properties", "special"}; partypes = {"root", "figure", "axes", "hggroup"}; - othertypes = {"line", "patch", "surface", "image", "text"}; + othertypes = {"line", "patch", "scatter", "surface", "image", "text"}; alltypes = [partypes othertypes]; if (nargin > 3 || ! isstruct (s)) @@ -108,16 +108,22 @@ ## change the mode to "manual" when the value is "auto". names = fieldnames (s.properties); n = strncmp (cellfun (@fliplr, names, "uniformoutput", false), "edom", 4); - n = (n | strcmp (names, "activepositionproperty")); + n = (n | strcmp (names, "positionconstraint")); names = [names(! n); names(n)]; n_pos = find (strcmp (names, "position") | strcmp (names, "outerposition")); if (strcmp (s.type, "axes") && numel (n_pos) == 2) - if (strcmp (s.properties.activepositionproperty, "position")) + if (isfield (s.properties, "positionconstraint")) + positionconstraint = s.properties.positionconstraint; + else + ## loading old figure file before "positionconstraint" property was added + positionconstraint = s.properties.activepositionproperty; + endif + if (strcmp (positionconstraint, "outerposition")) + names{n_pos(1)} = "position"; + names{n_pos(2)} = "outerposition"; + else names{n_pos(1)} = "outerposition"; names{n_pos(2)} = "position"; - else - names{n_pos(1)} = "position"; - names{n_pos(2)} = "outerposition"; endif endif ## Reorder the properties with the mode properties coming last @@ -157,14 +163,22 @@ par = gcf; endif endif - if (isfield (s.properties, "tightinset")) - s.properties = rmfield (s.properties, {"tightinset"}); + ## remove read only properties + ## FIXME: Remove "interactions", "layout", "legend", "toolbar", "xaxis", + ## "yaxis", and "zaxis" from this list once they are implemented. + ro_props = {"interactions", "layout", "legend", "nextseriesindex", ... + "tightinset", "toolbar", "xaxis", "yaxis", "zaxis"}; + has_ro_props = cellfun (@(x) isfield (s.properties, x), ro_props); + if (any (has_ro_props)) + s.properties = rmfield (s.properties, ro_props(has_ro_props)); endif [h, s] = createaxes (s, p, par); elseif (strcmp (s.type, "line")) h = createline (s, par); elseif (strcmp (s.type, "patch")) [h, s] = createpatch (s, par); + elseif (strcmp (s.type, "scatter")) + [h, s] = createscatter (s, par); elseif (strcmp (s.type, "text")) if (isfield (s.properties, "extent")) s.properties = rmfield (s.properties, "extent"); @@ -180,7 +194,8 @@ [h, s, p] = createhg (s, p, par, hilev); elseif (any (strcmp (s.type, {"uimenu", "uicontextmenu",... "uicontrol", "uipanel", "uibuttongroup",... - "uitoolbar", "uipushtool", "uitable"}))) + "uitoolbar", "uipushtool", "uitoggletool"... + "uitable"}))) if (isfield (s.properties, "extent")) s.properties = rmfield (s.properties, "extent"); endif @@ -368,6 +383,24 @@ endfunction +function [h, sout] = createscatter (s, par) + + if (isempty (s.properties.zdata)) + ## 2D scatter + h = scatter (s.properties.xdata, s.properties.ydata); + else + ## 3D scatter + h = scatter3 (s.properties.xdata, s.properties.ydata, s.properties.zdata); + endif + + set (h, "parent", par); + s.properties = rmfield (s.properties, + {"xdata", "ydata", "zdata"}); + addmissingprops (h, s.properties); + sout = s; + +endfunction + function h = createtext (s, par) h = text ("parent", par); addmissingprops (h, s.properties);
--- a/scripts/plot/util/subplot.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/plot/util/subplot.m Fri May 22 11:06:58 2020 +0200 @@ -211,7 +211,7 @@ set (cf, "units", "pixels"); ## FIXME: At the moment we force gnuplot to use the aligned mode - ## which will set "activepositionproperty" to "position". + ## which will set "positionconstraint" to "innerposition". ## This can yield to text overlap between labels and titles. ## See bug #31610. if (strcmp (get (cf, "__graphics_toolkit__"), "gnuplot")) @@ -288,7 +288,7 @@ set (hsubplot, varargin{:}); endif else - pval = [{"activepositionproperty", "position", ... + pval = [{"positionconstraint", "innerposition", ... "position", pos, "looseinset", li} varargin]; if (! make_subplot) hsubplot = axes (pval{:}); @@ -445,7 +445,7 @@ endif for ii = 1:numel (hsubplots) set (hsubplots(ii), "outerposition", opos(ii,:), ... - "activepositionproperty", "position"); + "positionconstraint", "innerposition"); endfor ## Compare current positions to default and compute the new ones
--- a/scripts/prefs/getpref.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/prefs/getpref.m Fri May 22 11:06:58 2020 +0200 @@ -151,9 +151,7 @@ %! %! unwind_protect_cleanup %! unlink (fullfile (tmp_home, ".octave_prefs")); -%! if (isfolder (tmp_home)) -%! rmdir (tmp_home); -%! endif +%! sts = rmdir (tmp_home); %! if (isempty (HOME)) %! unsetenv ("HOME"); %! else
--- a/scripts/prefs/setpref.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/prefs/setpref.m Fri May 22 11:06:58 2020 +0200 @@ -96,9 +96,7 @@ %! "size mismatch for PREF and VAL"); %! unwind_protect_cleanup %! unlink (fullfile (tmp_home, ".octave_prefs")); -%! if (isfolder (tmp_home)) -%! rmdir (tmp_home); -%! endif +%! sts = rmdir (tmp_home); %! if (isempty (HOME)) %! unsetenv ("HOME"); %! else
--- a/scripts/strings/dec2bin.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/strings/dec2bin.m Fri May 22 11:06:58 2020 +0200 @@ -24,45 +24,112 @@ ######################################################################## ## -*- texinfo -*- -## @deftypefn {} {} dec2bin (@var{d}, @var{len}) -## Return a binary number corresponding to the non-negative integer @var{d}, -## as a string of ones and zeros. +## @deftypefn {} {} dec2bin (@var{d}) +## @deftypefnx {} {} dec2bin (@var{d}, @var{len}) +## Return a string of ones and zeros representing the conversion of the integer +## @var{d} to a binary number. ## -## For example: +## If @var{d} is negative, return the two's complement binary value of @var{d}. +## If @var{d} is a matrix or cell array, return a string matrix with one row +## for each element in @var{d}, padded with leading zeros to the width of the +## largest value. +## +## The optional second argument, @var{len}, specifies the minimum number of +## digits in the result. +## +## Examples: ## ## @example ## @group ## dec2bin (14) ## @result{} "1110" +## +## dec2bin (-14) +## @result{} "11110010" ## @end group ## @end example ## -## If @var{d} is a matrix or cell array, return a string matrix with one row -## per element in @var{d}, padded with leading zeros to the width of the -## largest value. +## Programming Notes: The largest negative value that can be converted in to +## two's complement is @code{- (flintmax () / 2)}. ## -## The optional second argument, @var{len}, specifies the minimum number of -## digits in the result. ## @seealso{bin2dec, dec2base, dec2hex} ## @end deftypefn function b = dec2bin (d, len) + if (nargin == 0 || nargin > 2) + print_usage (); + endif + + if (iscell (d)) + d = cell2mat (d); + endif + ## Create column vector for algorithm (output is always col. vector anyways) + d = d(:); + + lt_zero_idx = (d < 0); + if (any (lt_zero_idx)) + ## FIXME: Need an algorithm that works with larger values such as int64. + if (any (d(lt_zero_idx) < -2^52)) + error ("dec2bin: negative inputs cannot be less than -flintmax () / 2"); + elseif (any (d(lt_zero_idx) < intmin ("int32"))) + d(lt_zero_idx) += flintmax (); + elseif (any (d < intmin ("int16"))) + d(lt_zero_idx) += double (intmax ("uint32")) + 1; + elseif (any (d < intmin ("int8"))) + d(lt_zero_idx) += double (intmax ("uint16"))+ 1; + else + d(lt_zero_idx) += double (intmax ("uint8")) + 1; + endif + endif + if (nargin == 1) b = dec2base (d, 2); - elseif (nargin == 2) + else b = dec2base (d, 2, len); - else - print_usage (); endif endfunction +%!assert (dec2bin (3), "11") %!assert (dec2bin (14), "1110") %!assert (dec2bin (14, 6), "001110") +%!assert (dec2bin ([1, 2; 3, 4]), ["001"; "011"; "010"; "100"]) %!assert (dec2bin ({1, 2; 3, 4}), ["001"; "011"; "010"; "100"]) +%!assert (dec2bin ({1, 2; 3, 4}, 4), ["0001"; "0011"; "0010"; "0100"]) + +## Test negative inputs +%!assert (dec2bin (-3), "11111101") +%!assert (dec2bin (-3, 3), "11111101") +%!assert (dec2bin (-3, 9), "011111101") +%!assert (dec2bin (-2^7 -1), "1111111101111111") +%!assert (dec2bin (-2^15 -1), "11111111111111110111111111111111") +## FIXME: Matlab generates a string that is 64 characters long +%!assert (dec2bin (-2^31 -1), +%! "11111111111111111111101111111111111111111111111111111") +%!assert (dec2bin (-2^52), +%! "10000000000000000000000000000000000000000000000000000") +## FIXME: Uncomment when support for int64 is added +%!#assert (dec2bin (-2^63), +%! "1000000000000000000000000000000000000000000000000000000000000000") +%!#test +%! assert (dec2bin (int64 (-2^63)), +%! "1000000000000000000000000000000000000000000000000000000000000000"); +%!#test +%! assert (dec2bin (int64 (-2^63) -1), +%! "1000000000000000000000000000000000000000000000000000000000000000"); +%!#test +%! assert (dec2bin (int64 (-2^63) +1), +%! "1000000000000000000000000000000000000000000000000000000000000001"); +%!assert (dec2bin ([-1, -2; -3, -4]), +%! ["11111111"; "11111101"; "11111110"; "11111100"]) +%!assert (dec2bin ([1, 2; 3, -4]), +%! ["00000001"; "00000011"; "00000010"; "11111100"]) +%!assert (dec2bin ({1, 2; 3, -4}), +%! ["00000001"; "00000011"; "00000010"; "11111100"]) ## Test input validation %!error dec2bin () %!error dec2bin (1, 2, 3) +%!error <negative inputs cannot be less than> dec2bin (- flintmax ())
--- a/scripts/strings/dec2hex.m Wed May 06 10:05:36 2020 +0200 +++ b/scripts/strings/dec2hex.m Fri May 22 11:06:58 2020 +0200 @@ -24,36 +24,66 @@ ######################################################################## ## -*- texinfo -*- -## @deftypefn {} {} dec2hex (@var{d}, @var{len}) -## Return the hexadecimal string corresponding to the non-negative integer -## @var{d}. +## @deftypefn {} {} dec2hex (@var{d}) +## @deftypefnx {} {} dec2hex (@var{d}, @var{len}) +## Return a string representing the conversion of the integer @var{d} to a +## hexadecimal (base16) number. ## -## For example: +## If @var{d} is negative, return the two's complement binary value of @var{d}. +## If @var{d} is a matrix or cell array, return a string matrix with one row +## for each element in @var{d}, padded with leading zeros to the width of the +## largest value. +## +## The optional second argument, @var{len}, specifies the minimum number of +## digits in the result. +## +## Examples: ## ## @example ## @group ## dec2hex (2748) ## @result{} "ABC" +## +## dec2hex (-2) +## @result{} "FE" ## @end group ## @end example ## -## If @var{d} is a matrix or cell array, return a string matrix with one row -## per element in @var{d}, padded with leading zeros to the width of the -## largest value. -## -## The optional second argument, @var{len}, specifies the minimum number of -## digits in the result. ## @seealso{hex2dec, dec2base, dec2bin} ## @end deftypefn function h = dec2hex (d, len) + if (nargin == 0 || nargin > 2) + print_usage (); + endif + + if (iscell (d)) + d = cell2mat (d); + endif + ## Create column vector for algorithm (output is always col. vector anyways) + d = d(:); + + lt_zero_idx = (d < 0); + if (any (lt_zero_idx)) + ## FIXME: Need an algorithm that works with larger values such as int64. + if (any (d(lt_zero_idx) < -2^52)) + error ("dec2hex: negative inputs cannot be less than -flintmax () / 2"); + elseif (any (d(lt_zero_idx) < intmin ("int32"))) + d(lt_zero_idx) += flintmax (); + elseif (any (d < intmin ("int16"))) + d(lt_zero_idx) += double (intmax ("uint32")) + 1; + elseif (any (d < intmin ("int8"))) + d(lt_zero_idx) += double (intmax ("uint16"))+ 1; + else + d(lt_zero_idx) += double (intmax ("uint8")) + 1; + endif + endif + if (nargin == 1) h = dec2base (d, 16); - elseif (nargin == 2) + else h = dec2base (d, 16, len); - else - print_usage (); endif endfunction @@ -61,8 +91,37 @@ %!assert (dec2hex (2748), "ABC") %!assert (dec2hex (2748, 5), "00ABC") +%!assert (dec2hex ([2748, 2746]), ["ABC"; "ABA"]) %!assert (dec2hex ({2748, 2746}), ["ABC"; "ABA"]) +%!assert (dec2hex ({2748, 2746}, 4), ["0ABC"; "0ABA"]) + +## Test negative inputs +%!assert (dec2hex (-3), "FD") +%!assert (dec2hex (-3, 1), "FD") +%!assert (dec2hex (-3, 3), "0FD") +%!assert (dec2hex (-2^7 -1), "FF7F") +%!assert (dec2hex (-2^15 -1), "FFFF7FFF") +## FIXME: Matlab returns longer string that begins with 'F' +%!assert (dec2hex (-2^31 -1), "1FFFFF7FFFFFFF") +## FIXME: Matlab returns longer string that begins with 'FFF' +%!assert (dec2hex (-2^52), "10000000000000") +## FIXME: Uncomment when support for int64 is added +%!#assert (dec2hex (-2^63), +%! "1000000000000000000000000000000000000000000000000000000000000000") +%!#test +%! assert (dec2hex (int64 (-2^63)), +%! "1000000000000000000000000000000000000000000000000000000000000000"); +%!#test +%! assert (dec2hex (int64 (-2^63) -1), +%! "1000000000000000000000000000000000000000000000000000000000000000"); +%!#test +%! assert (dec2hex (int64 (-2^63) +1), +%! "1000000000000000000000000000000000000000000000000000000000000001"); +%!assert (dec2hex ([-1, -2; -3, -4]), ["FF"; "FD"; "FE"; "FC"]) +%!assert (dec2hex ([1, 2; 3, -4]), ["01"; "03"; "02"; "FC"]) +%!assert (dec2hex ({1, 2; 3, -4}), ["01"; "03"; "02"; "FC"]) ## Test input validation %!error dec2hex () %!error dec2hex (1, 2, 3) +%!error <negative inputs cannot be less than> dec2hex (- flintmax ())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/strings/endsWith.m Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,173 @@ +######################################################################## +## +## Copyright (C) 2020 The Octave Project Developers +## +## See the file COPYRIGHT.md in the top-level directory of this +## distribution or <https://octave.org/copyright/>. +## +## 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{retval} =} endsWith (@var{str}, @var{pattern}) +## @deftypefnx {} {@var{retval} =} endsWith (@var{str}, @var{pattern}, "IgnoreCase", @var{ignore_case}) +## Check whether string(s) end with pattern(s). +## +## Return an array of logical values that indicates which string(s) in the +## input @var{str} (a single string or cell array of strings) end with +## the input @var{pattern} (a single string or cell array of strings). +## +## If the value of the parameter @qcode{"IgnoreCase"} is true, then the +## function will ignore the letter case of @var{str} and @var{pattern}. By +## default, the comparison is case sensitive. +## +## Examples: +## +## @example +## @group +## ## one string and one pattern while considering case +## endsWith ("hello", "lo") +## @result{} 1 +## @end group +## +## @group +## ## one string and one pattern while ignoring case +## endsWith ("hello", "LO", "IgnoreCase", true) +## @result{} 1 +## @end group +## +## @group +## ## multiple strings and multiple patterns while considering case +## endsWith (@{"tests.txt", "mydoc.odt", "myFunc.m", "results.pptx"@}, +## @{".docx", ".odt", ".txt"@}) +## @result{} 1 1 0 0 +## @end group +## +## @group +## ## multiple strings and one pattern while considering case +## endsWith (@{"TESTS.TXT", "mydoc.odt", "result.txt", "myFunc.m"@}, +## ".txt", "IgnoreCase", false) +## @result{} 0 0 1 0 +## @end group +## +## @group +## ## multiple strings and one pattern while ignoring case +## endsWith (@{"TESTS.TXT", "mydoc.odt", "result.txt", "myFunc.m"@}, +## ".txt", "IgnoreCase", true) +## @result{} 1 0 1 0 +## @end group +## @end example +## +## @seealso{startsWith, regexp, strncmp, strncmpi} +## @end deftypefn + +function retval = endsWith (str, pattern, IgnoreCase, ignore_case) + + if (nargin != 2 && nargin != 4) + print_usage (); + endif + + ## Validate input str and pattern + if (! (iscellstr (str) || ischar (str))) + error ("endsWith: STR must be a string or cell array of strings"); + endif + if (! (iscellstr (pattern) || ischar (pattern))) + error ("endsWith: PATTERN must be a string or cell array of strings"); + endif + + ## reverse str and pattern + str = cellfun (@flip, cellstr (str), "UniformOutput", false); + pattern = cellfun (@flip, cellstr (pattern), "UniformOutput", false); + + if (nargin == 2) + ignore_case = false; + else + ## For Matlab compatibility accept any abbreviation of 3rd argument + if (! ischar (IgnoreCase) || isempty (IgnoreCase) + || ! strncmpi (IgnoreCase, "IgnoreCase", length (IgnoreCase))) + error ('endsWith: third input must be "IgnoreCase"'); + endif + + if (! isscalar (ignore_case) || ! isreal (ignore_case)) + error ('endsWith: "IgnoreCase" value must be a logical scalar'); + endif + ignore_case = logical (ignore_case); + endif + + retval = false (size (str)); + if (ignore_case) + for j = 1:numel (pattern) + retval |= strncmpi (str, pattern{j}, length (pattern{j})); + endfor + else + for j = 1:numel (pattern) + retval |= strncmp (str, pattern{j}, length (pattern{j})); + endfor + endif + +endfunction + + +## Test simple use with one string and one pattern +%!assert (endsWith ("hello", "lo")) +%!assert (! endsWith ("hello", "LO")) +%!assert (endsWith ("hello", "LO", "i", 5)) +%!assert (! endsWith ("hello", "no")) + +## Test multiple strings with a single pattern +%!test +%! str = {"myFile.odt", "results.ppt", "myCode.m"; ... +%! "data-analysis.ppt", "foundations.txt", "data.odt"}; +%! pattern = ".odt"; +%! expected = [true, false, false; false, false, true]; +%! assert (endsWith (str, pattern), expected); + +## Test multiple strings with multiple patterns +%!test +%! str = {"tests.txt", "mydoc.odt", "myFunc.m", "results.pptx"}; +%! pattern = {".docx", ".odt", ".txt"}; +%! expected = [true, true, false, false]; +%! assert (endsWith (str, pattern), expected); + +## Test IgnoreCase +%!test +%! str = {"TESTS.TXT", "mydoc.odt", "result.txt", "myFunc.m"}; +%! pattern = ".txt"; +%! expected_ignore = [true, false, true, false]; +%! expected_wo_ignore = [false, false, true, false]; +%! assert (endsWith (str, pattern, "IgnoreCase", true), expected_ignore); +%! assert (endsWith (str, pattern, "IgnoreCase", false), expected_wo_ignore); +%! assert (endsWith (str, pattern, "I", 500), expected_ignore); +%! assert (endsWith (str, pattern, "iG", 0), expected_wo_ignore); + +## Test input validation +%!error endsWith () +%!error endsWith ("A") +%!error endsWith ("A", "B", "C") +%!error endsWith ("A", "B", "C", "D", "E") +%!error <STR must be a string> endsWith (152, "hi") +%!error <STR must be a .* cell array of strings> endsWith ({152}, "hi") +%!error <PATTERN must be a string> endsWith ("hi", 152) +%!error <PATTERN must be a .* cell array of strings> endsWith ("hi", {152}) +%!error <third input must be "IgnoreCase"> endsWith ("hello", "lo", 1, 1) +%!error <third input must be "IgnoreCase"> endsWith ("hello", "lo", "", 1) +%!error <third input must be "IgnoreCase"> endsWith ("hello", "lo", "foo", 1) +%!error <"IgnoreCase" value must be a logical scalar> +%! endsWith ("hello", "hi", "i", "true"); +%!error <"IgnoreCase" value must be a logical scalar> +%! endsWith ("hello", "hi", "i", {true});
--- a/scripts/strings/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/scripts/strings/module.mk Fri May 22 11:06:58 2020 +0200 @@ -9,6 +9,7 @@ %reldir%/dec2base.m \ %reldir%/dec2bin.m \ %reldir%/dec2hex.m \ + %reldir%/endsWith.m \ %reldir%/erase.m \ %reldir%/hex2dec.m \ %reldir%/index.m \ @@ -20,6 +21,7 @@ %reldir%/ostrsplit.m \ %reldir%/regexptranslate.m \ %reldir%/rindex.m \ + %reldir%/startsWith.m \ %reldir%/str2num.m \ %reldir%/strcat.m \ %reldir%/strchr.m \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/strings/startsWith.m Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,172 @@ +######################################################################## +## +## Copyright (C) 2020 The Octave Project Developers +## +## See the file COPYRIGHT.md in the top-level directory of this +## distribution or <https://octave.org/copyright/>. +## +## 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{retval} =} startsWith (@var{str}, @var{pattern}) +## @deftypefnx {} {@var{retval} =} startsWith (@var{str}, @var{pattern}, "IgnoreCase", @var{ignore_case}) +## Check whether string(s) start with pattern(s). +## +## Return an array of logical values that indicates which string(s) in the +## input @var{str} (a single string or cell array of strings) begin with +## the input @var{pattern} (a single string or cell array of strings). +## +## If the value of the parameter @qcode{"IgnoreCase"} is true, then the +## function will ignore the letter case of @var{str} and @var{pattern}. By +## default, the comparison is case sensitive. +## +## Examples: +## +## @example +## @group +## ## one string and one pattern while considering case +## startsWith ("hello", "he") +## @result{} 1 +## @end group +## +## @group +## ## one string and one pattern while ignoring case +## startsWith ("hello", "HE", "IgnoreCase", true) +## @result{} 1 +## @end group +## +## @group +## ## multiple strings and multiple patterns while considering case +## startsWith (@{"lab work.pptx", "data.txt", "foundations.ppt"@}, +## @{"lab", "data"@}) +## @result{} 1 1 0 +## @end group +## +## @group +## ## multiple strings and one pattern while considering case +## startsWith (@{"DATASHEET.ods", "data.txt", "foundations.ppt"@}, +## "data", "IgnoreCase", false) +## @result{} 0 1 0 +## @end group +## +## @group +## ## multiple strings and one pattern while ignoring case +## startsWith (@{"DATASHEET.ods", "data.txt", "foundations.ppt"@}, +## "data", "IgnoreCase", true) +## @result{} 1 1 0 +## @end group +## @end example +## +## @seealso{endsWith, regexp, strncmp, strncmpi} +## @end deftypefn + +function retval = startsWith (str, pattern, IgnoreCase, ignore_case) + + if (nargin != 2 && nargin != 4) + print_usage (); + endif + + ## Validate input str and pattern + if (! (iscellstr (str) || ischar (str))) + error ("startsWith: STR must be a string or cell array of strings"); + endif + if (! (iscellstr (pattern) || ischar (pattern))) + error ("startsWith: PATTERN must be a string or cell array of strings"); + endif + + str = cellstr (str); + pattern = cellstr (pattern); + + if (nargin == 2) + ignore_case = false; + else + ## For Matlab compatibility accept any abbreviation of 3rd argument + if (! ischar (IgnoreCase) || isempty (IgnoreCase) + || ! strncmpi (IgnoreCase, "IgnoreCase", length (IgnoreCase))) + error ('startsWith: third input must be "IgnoreCase"'); + endif + + if (! isscalar (ignore_case) || ! isreal (ignore_case)) + error ('startsWith: "IgnoreCase" value must be a logical scalar'); + endif + ignore_case = logical (ignore_case); + endif + + retval = false (size (str)); + if (ignore_case) + for j = 1:numel (pattern) + retval |= strncmpi (str, pattern{j}, length (pattern{j})); + endfor + else + for j = 1:numel (pattern) + retval |= strncmp (str, pattern{j}, length (pattern{j})); + endfor + endif + +endfunction + + +## Test simple use with one string and one pattern +%!assert (startsWith ("hello", "he")) +%!assert (! startsWith ("hello", "HE")) +%!assert (startsWith ("hello", "HE", "i", 5)) +%!assert (! startsWith ("hello", "no")) + +## Test multiple strings with a single pattern +%!test +%! str = {"data science", "dataSheet.ods", "myFunc.m"; "foundations.ppt", ... +%! "results.txt", "myFile.odt"}; +%! pattern = "data"; +%! expected = [true, true, false; false, false, false]; +%! assert (startsWith (str, pattern), expected); + +## Test multiple strings with multiple patterns +%!test +%! str = {"lab work.pptx", "myFile.odt", "data.txt", "foundations.ppt"}; +%! pattern = {"lab", "data"}; +%! expected = [true, false, true, false]; +%! assert (startsWith (str, pattern), expected); + +## Test IgnoreCase +%!test +%! str = {"DATASHEET.ods", "myFile.odt", "data.txt", "foundations.ppt"}; +%! pattern = "data"; +%! expected_ignore = [true, false, true, false]; +%! expected_wo_ignore = [false, false, true, false]; +%! assert (startsWith (str, pattern, "IgnoreCase", true), expected_ignore); +%! assert (startsWith (str, pattern, "IgnoreCase", false), expected_wo_ignore); +%! assert (startsWith (str, pattern, "I", 500), expected_ignore); +%! assert (startsWith (str, pattern, "iG", 0), expected_wo_ignore); + +## Test input validation +%!error startsWith () +%!error startsWith ("A") +%!error startsWith ("A", "B", "C") +%!error startsWith ("A", "B", "C", "D", "E") +%!error <STR must be a string> startsWith (152, "hi") +%!error <STR must be a .* cell array of strings> startsWith ({152}, "hi") +%!error <PATTERN must be a string> startsWith ("hi", 152) +%!error <PATTERN must be a .* cell array of strings> startsWith ("hi", {152}) +%!error <third input must be "IgnoreCase"> startsWith ("hello", "he", 1, 1) +%!error <third input must be "IgnoreCase"> startsWith ("hello", "he", "", 1) +%!error <third input must be "IgnoreCase"> startsWith ("hello", "he", "foo", 1) +%!error <"IgnoreCase" value must be a logical scalar> +%! startsWith ("hello", "hi", "i", "true"); +%!error <"IgnoreCase" value must be a logical scalar> +%! startsWith ("hello", "hi", "i", {true});
--- a/src/mkoctfile.in.cc Wed May 06 10:05:36 2020 +0200 +++ b/src/mkoctfile.in.cc Fri May 22 11:06:58 2020 +0200 @@ -601,6 +601,32 @@ } static std::string +create_interleaved_complex_file (void) +{ + std::string tmpl = get_temp_directory () + "/oct-XXXXXX.c"; + + char *ctmpl = new char [tmpl.length () + 1]; + + ctmpl = strcpy (ctmpl, tmpl.c_str ()); + + // mkostemps will open the file and return a file descriptor. We + // won't worry about closing it because we will need the file until we + // are done and then the file will be closed when mkoctfile exits. + int fd = octave_mkostemps_wrapper (ctmpl, 2); + + // Make C++ string from filled-in template. + std::string retval (ctmpl); + delete [] ctmpl; + + // Write symbol definition to file. + FILE *fid = fdopen (fd, "w"); + fputs ("const int __mx_has_interleaved_complex__ = 1;\n", fid); + fclose (fid); + + return retval; +} + +static std::string tmp_objfile_name (void) { std::string tmpl = get_temp_directory () + "/oct-XXXXXX.o"; @@ -657,6 +683,11 @@ bool depend = false; bool printonly = false; bool output_file_option = false; + bool creating_mex_file = false; + bool r2017b_option = false; + bool r2018a_option = false; + // The default for this may change in the future. + bool mx_has_interleaved_complex = false; for (int i = 1; i < argc; i++) { @@ -737,6 +768,27 @@ { std::cerr << "warning: -largeArrayDims and -compatibleArrayDims are accepted for compatibility, but ignored" << std::endl; } + else if (arg == "-R2017b") + { + if (r2018a_option) + { + std::cerr << "mkoctfile: only one of -R2017b and -R2018a may be used" << std::endl; + return 1; + } + + r2017b_option = true; + } + else if (arg == "-R2018a") + { + if (r2017b_option) + { + std::cerr << "mkoctfile: only one of -R2017b and -R2018a may be used" << std::endl; + return 1; + } + + r2018a_option = true; + mx_has_interleaved_complex = true; + } else if (starts_with (arg, "-Wl,") || starts_with (arg, "-l") || starts_with (arg, "-L") || starts_with (arg, "-R")) { @@ -807,6 +859,8 @@ } else if (arg == "-mex" || arg == "--mex") { + creating_mex_file = true; + incflags += " -I."; #if defined (_MSC_VER) ldflags += " -Wl,-export:mexFunction"; @@ -847,10 +901,37 @@ octfile = file; } - if (output_ext == ".mex" - && vars["ALL_CFLAGS"].find ("-g") != std::string::npos) + if (creating_mex_file) { - defs += " -DMEX_DEBUG"; + if (vars["ALL_CFLAGS"].find ("-g") != std::string::npos) + defs += " -DMEX_DEBUG"; + + if (mx_has_interleaved_complex) + { + defs += " -DMX_HAS_INTERLEAVED_COMPLEX=1"; + + if (! compile_only) + { + // Create tmp C source file that defines an extern symbol + // that can be checked when loading the mex file to + // determine that the file was compiled expecting + // interleaved complex values. + + std::string tmp_file = create_interleaved_complex_file (); + + cfiles.push_back (tmp_file); + } + } + } + else + { + if (r2017b_option) + std::cerr << "warning: -R2017b option ignored unless creating mex file" + << std::endl; + + if (r2018a_option) + std::cerr << "warning: -R2018a option ignored unless creating mex file" + << std::endl; } if (compile_only && output_file_option
--- a/test/deprecate-props.tst Wed May 06 10:05:36 2020 +0200 +++ b/test/deprecate-props.tst Fri May 22 11:06:58 2020 +0200 @@ -37,25 +37,3 @@ %! endif %! endif %!endfunction - -## text/uicontrol/uipanel/uibuttongroup/uitable "oblique" value for -## "fontangle" property was deprecated in 5.0, remove from version 7: -## * remove "oblique" options in graphics.in.h, QtHandlesUtils.cc, -## and ft-text-renderer.cc -## * remove warnings from update_fontangle in graphics.in.h -%!test -%! hf = figure ("visible", "off"); -%! unwind_protect -%! ht = text (); -%! testprop (ht, "fontangle", "7.0", "oblique"); -%! hui = uicontrol (); -%! testprop (hui, "fontangle", "7.0", "oblique"); -%! hui = uipanel (); -%! testprop (hui, "fontangle", "7.0", "oblique"); -%! hui = uibuttongroup (); -%! testprop (hui, "fontangle", "7.0", "oblique"); -%! hui = uitable (); -%! testprop (hui, "fontangle", "7.0", "oblique"); -%! unwind_protect_cleanup -%! close (hf); -%! end_unwind_protect
--- a/test/io.tst Wed May 06 10:05:36 2020 +0200 +++ b/test/io.tst Fri May 22 11:06:58 2020 +0200 @@ -196,7 +196,7 @@ %! [load_status, load_files] = testls (1); %! %! for f = [save_files, load_files] -%! unlink (f{1}); +%! sts = unlink (f{1}); %! endfor %! %! assert (save_status && load_status); @@ -228,7 +228,7 @@ %! assert (s64, s64t); %! assert (u64, u64t); %! unwind_protect_cleanup -%! unlink (h5file); +%! sts = unlink (h5file); %! end_unwind_protect %!test @@ -407,11 +407,11 @@ %% Note use fprintf so output not sent to stdout %!test %! nm = tempname (); -%! fid1 = fopen (nm,"w"); +%! fid1 = fopen (nm, "w"); %! x = fprintf (fid1, "%s: %d\n", "test", 1); %! fclose (fid1); -%! fid2 = fopen (nm,"r"); -%! str = fscanf (fid2,"%s"); +%! fid2 = fopen (nm, "r"); +%! str = fscanf (fid2, "%s"); %! fclose (fid2); %! unlink (nm); %! assert (x, 8);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/mex/mexnumtst.c Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,91 @@ +#include "mex.h" + +// To be called with +// +// single array +// complex single array +// double array +// complex double array +// +// Will return arrays of the same type, but created internally to test +// the mxArray -> octave_value conversion + +void +mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]) +{ + if (nrhs != 4 || nlhs != 4) + mexErrMsgTxt ("invalid arguments"); + + const mxArray *sngl_ra = prhs[0]; + const mxArray *cplx_sngl_ra = prhs[1]; + const mxArray *dble_ra = prhs[2]; + const mxArray *cplx_dble_ra = prhs[3]; + +#if MX_HAS_INTERLEAVED_COMPLEX + + mxSingle *sngl_data = mxGetSingles (sngl_ra); + size_t sngl_data_nr = mxGetM (sngl_ra); + size_t sngl_data_nc = mxGetN (sngl_ra); + + plhs[0] = mxCreateNumericMatrix (sngl_data_nr, sngl_data_nc, mxSINGLE_CLASS, mxREAL); + mxSetSingles (plhs[0], sngl_data); + + mxComplexSingle *cplx_sngl_data = mxGetComplexSingles (cplx_sngl_ra); + size_t cplx_sngl_data_nr = mxGetM (cplx_sngl_ra); + size_t cplx_sngl_data_nc = mxGetN (cplx_sngl_ra); + + plhs[1] = mxCreateNumericMatrix (cplx_sngl_data_nr, cplx_sngl_data_nc, mxSINGLE_CLASS, mxCOMPLEX); + mxSetComplexSingles (plhs[1], cplx_sngl_data); + + mxDouble *dble_data = mxGetDoubles (dble_ra); + size_t dble_data_nr = mxGetM (dble_ra); + size_t dble_data_nc = mxGetN (dble_ra); + + plhs[2] = mxCreateNumericMatrix (dble_data_nr, dble_data_nc, mxDOUBLE_CLASS, mxREAL); + mxSetDoubles (plhs[2], dble_data); + + mxComplexDouble *cplx_dble_data = mxGetComplexDoubles (cplx_dble_ra); + size_t cplx_dble_data_nr = mxGetM (cplx_dble_ra); + size_t cplx_dble_data_nc = mxGetN (cplx_dble_ra); + + plhs[3] = mxCreateNumericMatrix (cplx_dble_data_nr, cplx_dble_data_nc, mxDOUBLE_CLASS, mxCOMPLEX); + mxSetComplexDoubles (plhs[3], cplx_dble_data); + +#else + + mxSingle *sngl_data = (mxSingle *) mxGetData (sngl_ra); + size_t sngl_data_nr = mxGetM (sngl_ra); + size_t sngl_data_nc = mxGetN (sngl_ra); + + mxSingle *cplx_sngl_data_real = (mxSingle *) mxGetData (cplx_sngl_ra); + mxSingle *cplx_sngl_data_imag = (mxSingle *) mxGetImagData (cplx_sngl_ra); + size_t cplx_sngl_data_nr = mxGetM (cplx_sngl_ra); + size_t cplx_sngl_data_nc = mxGetN (cplx_sngl_ra); + + mxDouble *dble_data = (mxDouble *) mxGetData (dble_ra); + size_t dble_data_nr = mxGetM (dble_ra); + size_t dble_data_nc = mxGetN (dble_ra); + + mxDouble *cplx_dble_data_real = (mxDouble *) mxGetData (cplx_dble_ra); + mxDouble *cplx_dble_data_imag = (mxDouble *) mxGetImagData (cplx_dble_ra); + size_t cplx_dble_data_nr = mxGetM (cplx_dble_ra); + size_t cplx_dble_data_nc = mxGetN (cplx_dble_ra); + + plhs[0] = mxCreateNumericMatrix (sngl_data_nr, sngl_data_nc, mxSINGLE_CLASS, mxREAL); + mxSetData (plhs[0], sngl_data); + + plhs[1] = mxCreateNumericMatrix (cplx_sngl_data_nr, cplx_sngl_data_nc, mxSINGLE_CLASS, mxCOMPLEX); + mxSetData (plhs[1], cplx_sngl_data_real); + mxSetImagData (plhs[1], cplx_sngl_data_imag); + + plhs[2] = mxCreateNumericMatrix (dble_data_nr, dble_data_nc, mxDOUBLE_CLASS, mxREAL); + mxSetData (plhs[2], dble_data); + + plhs[3] = mxCreateNumericMatrix (cplx_dble_data_nr, cplx_dble_data_nc, mxDOUBLE_CLASS, mxCOMPLEX); + mxSetData (plhs[3], cplx_dble_data_real); + mxSetImagData (plhs[3], cplx_dble_data_imag); + +#endif + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/mex/mexnumtst.tst Fri May 22 11:06:58 2020 +0200 @@ -0,0 +1,11 @@ +%!test +%! s = rand (3, 4, "single"); +%! sc = s + i * rand (3, 4, "single"); +%! d = rand (3, 4, "double"); +%! dc = d + i * rand (3, 4, "double"); +%! +%! [sx, scx, dx, dcx] = mexnumtst (s, sc, d, dc); +%! assert (s, sx) +%! assert (sc, scx) +%! assert (d, dx) +%! assert (dc, dcx)
--- a/test/mex/module.mk Wed May 06 10:05:36 2020 +0200 +++ b/test/mex/module.mk Fri May 22 11:06:58 2020 +0200 @@ -1,11 +1,13 @@ mex_TEST_FILES = \ %reldir%/bug-54096.tst \ %reldir%/bug-51725.tst \ + %reldir%/mexnumtst.tst \ $(MEX_TEST_SRC) MEX_TEST_SRC = \ %reldir%/bug_54096.c \ - %reldir%/bug_51725.c + %reldir%/bug_51725.c \ + %reldir%/mexnumtst.c MEX_TEST_FUNCTIONS = $(MEX_TEST_SRC:%.c=%.mex)
--- a/test/pkg/pkg.tst Wed May 06 10:05:36 2020 +0200 +++ b/test/pkg/pkg.tst Fri May 22 11:06:58 2020 +0200 @@ -31,6 +31,11 @@ %!shared old_prefix, old_archprefix, old_local_list, old_global_list, prefix, restorecfg, restorecache, restoreglobalcache, rmtmpdir, mfile_pkg_name, mfile_pkg_tgz +%!function test_cleanup (prefix) +%! confirm_recursive_rmdir (0, "local"); +%! sts = rmdir (prefix, "s"); +%!endfunction + %!testif HAVE_Z %! ## Do all tests in a temporary directory %! [old_prefix, old_archprefix] = pkg ("prefix"); @@ -48,7 +53,7 @@ %! pkg ("prefix", prefix, prefix); %! pkg ("local_list", fullfile (prefix, "octave_packages")); %! pkg ("global_list", fullfile (prefix, "octave_packages")); -%! rmtmpdir = @onCleanup (@() confirm_recursive_rmdir (0, "local") && rmdir (prefix, "s")); +%! rmtmpdir = @onCleanup (@() test_cleanup (prefix)); %! %! ## Create tar.gz file packages of testing directories in prefix directory %! mfile_pkg_name = {"mfile_basic_test", "mfile_minimal_test"};
--- a/test/publish/publish.tst Wed May 06 10:05:36 2020 +0200 +++ b/test/publish/publish.tst Fri May 22 11:06:58 2020 +0200 @@ -49,7 +49,7 @@ %! publish (fname{1}, opts); %! endfor %! confirm_recursive_rmdir (false, "local"); -%! rmdir (tmpDir, "s"); +%! sts = rmdir (tmpDir, "s"); %! unwind_protect_cleanup %! set (0, "defaultfigurevisible", visibility); %! graphics_toolkit (toolkit); @@ -81,7 +81,7 @@ %! str1 = fileread ("test_script.m"); %! str2 = grabcode (fullfile (tmpDir, "test_script.html")); %! confirm_recursive_rmdir (false, "local"); -%! rmdir (tmpDir, "s"); +%! sts = rmdir (tmpDir, "s"); %! ## Canonicalize strings %! str1 = strjoin (deblank (strsplit (str1, "\n")), "\n"); %! str2 = strjoin (deblank (strsplit (str2, "\n")), "\n");
--- a/test/system.tst Wed May 06 10:05:36 2020 +0200 +++ b/test/system.tst Fri May 22 11:06:58 2020 +0200 @@ -104,7 +104,7 @@ %!test %! crr = confirm_recursive_rmdir (); %! confirm_recursive_rmdir (0); -%! assert (!rmdir ("foo", "s")); +%! assert (! rmdir ("foo", "s")); %! confirm_recursive_rmdir (crr); %!test