jwe/octave: libinterp/octave-value/ov-re-mat.cc annotate

annotate libinterp/octave-value/ov-re-mat.cc @ 28131:4c21f99b4ad5

handle interleaved complex data and new typed data access functions for mex * mexproto.h, mex.cc, mxarray.h (mxMakeArrayReal, mxMakeArrayComplex, mxGetDoubles, mxGetSingles, mxGetInt8s, mxGetInt16s, mxGetInt32s, mxGetInt64s, mxGetUint8s, mxGetUint16s, mxGetUint32s, mxGetUint64s, mxGetComplexDoubles, mxGetComplexSingles, mxSetDoubles, mxSetSingles, mxSetInt8s, mxSetInt16s, mxSetInt32s, mxSetInt64s, mxSetUint8s, mxSetUint16s, mxSetUint32s, mxSetUint64s, mxSetComplexDoubles, mxSetComplexSingles): New functions. Provide corresponding member functions in mxArray class hierarchy to handle the actual operations. (mxGetComplexInt8s, mxGetComplexInt16s, mxGetComplexInt32s, mxGetComplexInt64s, mxGetComplexUint8s, mxGetComplexUint16s, mxGetComplexUint32s, mxGetComplexUint64s, mxSetComplexInt8s, mxSetComplexInt16s, mxSetComplexInt32s, mxSetComplexInt64s, mxSetComplexUint8s, mxSetComplexUint16s, mxSetComplexUint32s, mxSetComplexUint64s): Add prototypes and functions, but leave commented out since we don't have complex integer data. (class mxArray_number, class mxArray_sparse): Handle interleaved complex data. In mxArray_octave_value and mxArray_matlab constructors, handle interleaved flag in constructor to determine data layout to use when creating mxArray_number or mxArray_sparse objects. (mex::make_value): Check flag in mex function to determine whether to create arrays with interleaved complex. * ov.h, ov.cc, ov-base.h, ov-base.cc, ov-base-diag.h, ov-base-diag.cc, ov-bool-mat.h, ov-bool-mat.cc, ov-bool-sparse.h, ov-bool-sparse.cc, ov-bool.h, ov-bool.cc, ov-cell.h, ov-cell.cc, ov-ch-mat.h, ov-ch-mat.cc, ov-class.h, ov-class.cc, ov-complex.h, ov-complex.cc, ov-cx-mat.h, ov-cx-mat.cc, ov-cx-sparse.h, ov-cx-sparse.cc, ov-float.h, ov-float.cc, ov-flt-complex.h, ov-flt-complex.cc, ov-flt-cx-mat.h, ov-flt-cx-mat.cc, ov-flt-re-mat.h, ov-flt-re-mat.cc, ov-intx.h, ov-lazy-idx.h, ov-perm.h, ov-perm.cc, ov-range.h, ov-range.cc, ov-re-mat.h, ov-re-mat.cc, ov-re-sparse.h, ov-re-sparse.cc, ov-scalar.h, ov-scalar.cc, ov-struct.h, ov-struct.cc: In all as_mxArray methods, handle new interleaved input to optionally create objects that will use interleaved complex data.

author	John W. Eaton <jwe@octave.org>
date	Tue, 18 Feb 2020 13:16:41 -0500
parents	bd51beb6205e
children	7854d5752dd2

rev	line source
27928 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	3 // Copyright (C) 1996-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	24 ////////////////////////////////////////////////////////////////////////
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21231 diff changeset	27 # include "config.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	28 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	29
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	30 #include <istream>
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	31 #include <limits>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	32 #include <ostream>
4726 14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe] jwe parents: 4699 diff changeset	33 #include <vector>
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	34
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	35 #include "dNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	36 #include "fNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	37 #include "int8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	38 #include "int16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	39 #include "int32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	40 #include "int64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	41 #include "uint8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	42 #include "uint16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	43 #include "uint32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	44 #include "uint64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	45
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	46 #include "data-conv.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	47 #include "lo-ieee.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	48 #include "lo-utils.h"
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	49 #include "lo-specfun.h"
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	50 #include "lo-mappers.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	51 #include "mach-info.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	52 #include "mx-base.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4102 diff changeset	53 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	54 #include "oct-locbuf.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	55
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	56 #include "defun.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21024 diff changeset	57 #include "errwarn.h"
15149 62a35ae7d6a2 use forward decls for mxArray in ov.h and ov-base.h John W. Eaton <jwe@octave.org> parents: 15057 diff changeset	58 #include "mxarray.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	59 #include "ovl.h"
2979 a3556d2adec9 [project @ 1997-05-15 22:35:37 by jwe] jwe parents: 2974 diff changeset	60 #include "oct-lvalue.h"
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	61 #include "oct-hdf5.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	62 #include "oct-stream.h"
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	63 #include "ops.h"
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3109 diff changeset	64 #include "ov-base.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3109 diff changeset	65 #include "ov-base-mat.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3109 diff changeset	66 #include "ov-base-mat.cc"
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	67 #include "ov-scalar.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	68 #include "ov-re-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	69 #include "ov-flt-re-mat.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	70 #include "ov-complex.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	71 #include "ov-cx-mat.h"
7004 45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	72 #include "ov-re-sparse.h"
8399 c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	73 #include "ov-re-diag.h"
c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	74 #include "ov-cx-diag.h"
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	75 #include "ov-lazy-idx.h"
8399 c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	76 #include "ov-perm.h"
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	77 #include "pr-flt-fmt.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	78 #include "pr-output.h"
2948 56be458e237f [project @ 1997-05-09 13:37:35 by jwe] jwe parents: 2916 diff changeset	79 #include "variables.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	80
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	81 #include "byte-swap.h"
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20228 diff changeset	82 #include "ls-oct-text.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	83 #include "ls-utils.h"
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	84 #include "ls-hdf5.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	85
22022 278fc29b69ca maint: Eliminate unnecessary double newline blocks (only whitespace changes). Rik <rik@octave.org> parents: 21966 diff changeset	86
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	87 template class octave_base_matrix<NDArray>;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	88
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4513 diff changeset	89 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_matrix, "matrix", "double");
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	90
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	91 static octave_base_value *
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	92 default_numeric_demotion_function (const octave_base_value& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	93 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	94 const octave_matrix& v = dynamic_cast<const octave_matrix&> (a);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	95
8754 900a5bf52309 Fix invalid conversion error on implicit demotion of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 8650 diff changeset	96 return new octave_float_matrix (v.float_array_value ());
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	97 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	98
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7922 diff changeset	99 octave_base_value::type_conv_info
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	100 octave_matrix::numeric_demotion_function (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	101 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	102 return octave_base_value::type_conv_info
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	103 (default_numeric_demotion_function,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	104 octave_float_matrix::static_type_id ());
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	105 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	106
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	107 octave_base_value *
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	108 octave_matrix::try_narrowing_conversion (void)
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	109 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23220 diff changeset	110 octave_base_value *retval = nullptr;
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	111
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	112 if (matrix.numel () == 1)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	113 retval = new octave_scalar (matrix (0));
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	114
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	115 return retval;
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	116 }
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	117
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	118 double
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	119 octave_matrix::double_value (bool) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	120 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23457 diff changeset	121 if (isempty ())
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	122 err_invalid_conversion ("real matrix", "real scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	123
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	124 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	125 "real matrix", "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	126
22477 6bf1cbb90705 Remove unnecessary initializations in float_value and double_value methods Julien Bect <julien.bect@centralesupelec.fr> parents: 22407 diff changeset	127 return matrix(0, 0);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	128 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	129
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	130 float
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	131 octave_matrix::float_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	132 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23457 diff changeset	133 if (isempty ())
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	134 err_invalid_conversion ("real matrix", "real scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	135
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	136 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	137 "real matrix", "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	138
22477 6bf1cbb90705 Remove unnecessary initializations in float_value and double_value methods Julien Bect <julien.bect@centralesupelec.fr> parents: 22407 diff changeset	139 return matrix(0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	140 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	141
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	142 // FIXME
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	143
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	144 Matrix
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	145 octave_matrix::matrix_value (bool) const
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	146 {
19320 d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray. Carnë Draug <carandraug@octave.org> parents: 18200 diff changeset	147 return Matrix (matrix);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	148 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	149
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	150 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	151 octave_matrix::float_matrix_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	152 {
19320 d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray. Carnë Draug <carandraug@octave.org> parents: 18200 diff changeset	153 return FloatMatrix (Matrix (matrix));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	154 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	155
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	156 Complex
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	157 octave_matrix::complex_value (bool) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	158 {
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	159 if (rows () == 0 \|\| columns () == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	160 err_invalid_conversion ("real matrix", "complex scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	161
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	162 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	163 "real matrix", "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	164
22508 0b278f54f60a Remove unnecessary initializations in complex_value methods. Julien Bect <jbect@users.sourceforge.net> parents: 22477 diff changeset	165 return Complex (matrix(0, 0), 0);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	166 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	167
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	168 FloatComplex
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	169 octave_matrix::float_complex_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	170 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	171 float tmp = lo_ieee_float_nan_value ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	172
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	173 FloatComplex retval (tmp, tmp);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	174
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	175 if (rows () == 0 \|\| columns () == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	176 err_invalid_conversion ("real matrix", "complex scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	177
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	178 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	179 "real matrix", "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	180
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	181 retval = matrix(0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	182
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	183 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	184 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	185
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	186 // FIXME
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	187
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	188 ComplexMatrix
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	189 octave_matrix::complex_matrix_value (bool) const
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	190 {
19320 d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray. Carnë Draug <carandraug@octave.org> parents: 18200 diff changeset	191 return ComplexMatrix (Matrix (matrix));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	192 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	193
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	194 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	195 octave_matrix::float_complex_matrix_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	196 {
19320 d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray. Carnë Draug <carandraug@octave.org> parents: 18200 diff changeset	197 return FloatComplexMatrix (Matrix (matrix));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	198 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	199
4699 5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	200 ComplexNDArray
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	201 octave_matrix::complex_array_value (bool) const
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	202 {
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	203 return ComplexNDArray (matrix);
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	204 }
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	205
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	206 FloatComplexNDArray
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	207 octave_matrix::float_complex_array_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	208 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	209 return FloatComplexNDArray (matrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	210 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	211
5898 da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	212 boolNDArray
5943 c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5900 diff changeset	213 octave_matrix::bool_array_value (bool warn) const
5898 da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	214 {
7922 935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7885 diff changeset	215 if (matrix.any_element_is_nan ())
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	216 octave::err_nan_to_logical_conversion ();
21120 499b851fbfae Replace pattern if/err_XXX/else/code with if/err_XXX/ code. Rik <rik@octave.org> parents: 21118 diff changeset	217 if (warn && matrix.any_element_not_one_or_zero ())
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21024 diff changeset	218 warn_logical_conversion ();
5943 c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5900 diff changeset	219
5898 da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	220 return boolNDArray (matrix);
da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	221 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	222
4758 a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	223 charNDArray
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	224 octave_matrix::char_array_value (bool) const
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	225 {
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	226 charNDArray retval (dims ());
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	227
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	228 octave_idx_type nel = numel ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	229
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	230 for (octave_idx_type i = 0; i < nel; i++)
25691 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25438 diff changeset	231 retval.elem (i) = static_cast<char> (matrix.elem (i));
4758 a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	232
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	233 return retval;
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	234 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	235
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	236 SparseMatrix
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	237 octave_matrix::sparse_matrix_value (bool) const
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	238 {
19320 d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray. Carnë Draug <carandraug@octave.org> parents: 18200 diff changeset	239 return SparseMatrix (Matrix (matrix));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	240 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	241
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	242 SparseComplexMatrix
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	243 octave_matrix::sparse_complex_matrix_value (bool) const
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	244 {
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17787 diff changeset	245 // FIXME: Need a SparseComplexMatrix (Matrix) constructor to make
870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17787 diff changeset	246 // this function more efficient. Then this should become
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	247 // return SparseComplexMatrix (matrix.matrix_value ());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	248 return SparseComplexMatrix (sparse_matrix_value ());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	249 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	250
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	251 octave_value
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	252 octave_matrix::as_double (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	253 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	254 return NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	255 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	256
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	257 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	258 octave_matrix::as_single (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	259 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	260 return FloatNDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	261 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	262
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	263 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	264 octave_matrix::as_int8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	265 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	266 return int8NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	267 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	268
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	269 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	270 octave_matrix::as_int16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	271 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	272 return int16NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	273 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	274
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	275 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	276 octave_matrix::as_int32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	277 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	278 return int32NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	279 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	280
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	281 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	282 octave_matrix::as_int64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	283 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	284 return int64NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	285 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	286
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	287 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	288 octave_matrix::as_uint8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	289 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	290 return uint8NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	291 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	292
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	293 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	294 octave_matrix::as_uint16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	295 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	296 return uint16NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	297 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	298
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	299 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	300 octave_matrix::as_uint32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	301 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	302 return uint32NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	303 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	304
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	305 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	306 octave_matrix::as_uint64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	307 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	308 return uint64NDArray (matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	309 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	310
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	311 octave_value
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	312 octave_matrix::diag (octave_idx_type k) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	313 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	314 octave_value retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	315 if (k == 0 && matrix.ndims () == 2
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	316 && (matrix.rows () == 1 \|\| matrix.columns () == 1))
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	317 retval = DiagMatrix (DiagArray2<double> (matrix));
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	318 else
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	319 retval = octave_base_matrix<NDArray>::diag (k);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	320
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	321 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	322 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	323
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	324 octave_value
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	325 octave_matrix::diag (octave_idx_type m, octave_idx_type n) const
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	326 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	327 if (matrix.ndims () != 2
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	328 \|\| (matrix.rows () != 1 && matrix.columns () != 1))
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	329 error ("diag: expecting vector argument");
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	330
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	331 Matrix mat (matrix);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	332
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	333 return mat.diag (m, n);
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	334 }
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	335
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	336 // We override these two functions to allow reshaping both
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	337 // the matrix and the index cache.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	338 octave_value
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	339 octave_matrix::reshape (const dim_vector& new_dims) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	340 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	341 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	342 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	343 return new octave_matrix (matrix.reshape (new_dims),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	344 idx_vector (idx_cache->as_array ().reshape (new_dims),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	345 idx_cache->extent (0)));
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	346 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	347 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	348 return octave_base_matrix<NDArray>::reshape (new_dims);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	349 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	350
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	351 octave_value
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	352 octave_matrix::squeeze (void) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	353 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	354 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	355 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	356 return new octave_matrix (matrix.squeeze (),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	357 idx_vector (idx_cache->as_array ().squeeze (),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	358 idx_cache->extent (0)));
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	359 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	360 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	361 return octave_base_matrix<NDArray>::squeeze ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	362 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	363
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	364 octave_value
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	365 octave_matrix::sort (octave_idx_type dim, sortmode mode) const
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	366 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	367 if (idx_cache)
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	368 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	369 // This is a valid index matrix, so sort via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	370 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	371 return octave_lazy_index (*idx_cache).sort (dim, mode);
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	372 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	373 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	374 return octave_base_matrix<NDArray>::sort (dim, mode);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	375 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	376
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	377 octave_value
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	378 octave_matrix::sort (Array<octave_idx_type> &sidx, octave_idx_type dim,
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	379 sortmode mode) const
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	380 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	381 if (idx_cache)
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	382 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	383 // This is a valid index matrix, so sort via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	384 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	385 return octave_lazy_index (*idx_cache).sort (sidx, dim, mode);
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	386 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	387 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	388 return octave_base_matrix<NDArray>::sort (sidx, dim, mode);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	389 }
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	390
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	391 sortmode
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23577 diff changeset	392 octave_matrix::issorted (sortmode mode) const
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	393 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	394 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	395 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	396 // This is a valid index matrix, so check via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	397 // generally more efficient.
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23577 diff changeset	398 return idx_cache->as_array ().issorted (mode);
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	399 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	400 else
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23577 diff changeset	401 return octave_base_matrix<NDArray>::issorted (mode);
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	402 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	403 Array<octave_idx_type>
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	404 octave_matrix::sort_rows_idx (sortmode mode) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	405 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	406 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	407 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	408 // This is a valid index matrix, so sort via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	409 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	410 return octave_lazy_index (*idx_cache).sort_rows_idx (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	411 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	412 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	413 return octave_base_matrix<NDArray>::sort_rows_idx (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	414 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	415
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	416 sortmode
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	417 octave_matrix::is_sorted_rows (sortmode mode) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	418 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	419 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	420 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	421 // This is a valid index matrix, so check via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	422 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	423 return idx_cache->as_array ().is_sorted_rows (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	424 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	425 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	426 return octave_base_matrix<NDArray>::is_sorted_rows (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	427 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	428
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	429 octave_value
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	430 octave_matrix::convert_to_str_internal (bool, bool, char type) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	431 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	432 octave_value retval;
4844 9f7ef92b50b0 [project @ 2004-04-02 17:26:53 by jwe] jwe parents: 4837 diff changeset	433 dim_vector dv = dims ();
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	434 octave_idx_type nel = dv.numel ();
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	435
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	436 charNDArray chm (dv);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	437
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	438 bool warned = false;
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	439
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	440 for (octave_idx_type i = 0; i < nel; i++)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	441 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	442 octave_quit ();
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	443
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	444 double d = matrix(i);
4844 9f7ef92b50b0 [project @ 2004-04-02 17:26:53 by jwe] jwe parents: 4837 diff changeset	445
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	446 if (octave::math::isnan (d))
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	447 octave::err_nan_to_character_conversion ();
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	448
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	449 int ival = octave::math::nint (d);
4844 9f7ef92b50b0 [project @ 2004-04-02 17:26:53 by jwe] jwe parents: 4837 diff changeset	450
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	451 if (ival < 0 \|\| ival > std::numeric_limits<unsigned char>::max ())
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	452 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	453 // FIXME: is there something better we could do?
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	454
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	455 ival = 0;
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	456
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	457 if (! warned)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	458 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	459 ::warning ("range error for conversion to character value");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	460 warned = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	461 }
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	462 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	463
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	464 chm(i) = static_cast<char> (ival);
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	465 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	466
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9470 diff changeset	467 retval = octave_value (chm, type);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	468
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	469 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	470 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	471
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	472 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6717 diff changeset	473 octave_matrix::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	474 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	475 dim_vector dv = dims ();
5958 85c7dc4afe6b [project @ 2006-08-23 18:35:38 by jwe] jwe parents: 5956 diff changeset	476
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	477 if (dv.ndims () > 2)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	478 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	479 NDArray tmp = array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	480
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	481 os << "# ndims: " << dv.ndims () << "\n";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	482
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	483 for (int i=0; i < dv.ndims (); i++)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	484 os << ' ' << dv(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	485
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	486 os << "\n" << tmp;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	487 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	488 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	489 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	490 // Keep this case, rather than use generic code above for backward
20449 df4165dfc676 maint: Fix misspelled word compatibility in code comments. Rik <rik@octave.org> parents: 20447 diff changeset	491 // compatibility. Makes load_ascii much more complex!!
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	492 os << "# rows: " << rows () << "\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	493 << "# columns: " << columns () << "\n";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	494
5958 85c7dc4afe6b [project @ 2006-08-23 18:35:38 by jwe] jwe parents: 5956 diff changeset	495 os << matrix_value ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	496 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	497
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	498 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	499 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	500
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	501 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	502 octave_matrix::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	503 {
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	504 string_vector keywords(2);
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	505
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	506 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	507 keywords[1] = "rows";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	508
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	509 std::string kw;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	510 octave_idx_type val = 0;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	511
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	512 if (! extract_keyword (is, keywords, kw, val, true))
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	513 error ("load: failed to extract number of rows and columns");
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	514
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	515 if (kw == "ndims")
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	516 {
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	517 int mdims = static_cast<int> (val);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	518
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	519 if (mdims < 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	520 error ("load: failed to extract number of dimensions");
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	521
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	522 dim_vector dv;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	523 dv.resize (mdims);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	524
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	525 for (int i = 0; i < mdims; i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	526 is >> dv(i);
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	527
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	528 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	529 error ("load: failed to read dimensions");
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	530
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	531 NDArray tmp(dv);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	532
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	533 is >> tmp;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	534
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	535 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	536 error ("load: failed to load matrix constant");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	537
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	538 matrix = tmp;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	539 }
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	540 else if (kw == "rows")
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	541 {
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	542 octave_idx_type nr = val;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	543 octave_idx_type nc = 0;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	544
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	545 if (nr < 0 \|\| ! extract_keyword (is, "columns", nc) \|\| nc < 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	546 error ("load: failed to extract number of rows and columns");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	547
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	548 if (nr > 0 && nc > 0)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	549 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	550 Matrix tmp (nr, nc);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	551 is >> tmp;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	552 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	553 error ("load: failed to load matrix constant");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	554
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	555 matrix = tmp;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	556 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	557 else if (nr == 0 \|\| nc == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	558 matrix = Matrix (nr, nc);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	559 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	560 panic_impossible ();
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	561 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	562 else
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	563 panic_impossible ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	564
21124 95f8c8cdbffe maint: Eliminate 'bool success' variable where possible. Rik <rik@octave.org> parents: 21120 diff changeset	565 return true;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	566 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	567
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	568 bool
26401 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26379 diff changeset	569 octave_matrix::save_binary (std::ostream& os, bool save_as_floats)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	570 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	571
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	572 dim_vector dv = dims ();
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	573 if (dv.ndims () < 1)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	574 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	575
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	576 // Use negative value for ndims to differentiate with old format!!
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	577 int32_t tmp = - dv.ndims ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	578 os.write (reinterpret_cast<char *> (&tmp), 4);
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	579 for (int i = 0; i < dv.ndims (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	580 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	581 tmp = dv(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	582 os.write (reinterpret_cast<char *> (&tmp), 4);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	583 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	584
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	585 NDArray m = array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	586 save_type st = LS_DOUBLE;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	587 if (save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	588 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	589 if (m.too_large_for_float ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	590 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	591 warning ("save: some values too large to save as floats --");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	592 warning ("save: saving as doubles instead");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	593 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	594 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	595 st = LS_FLOAT;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	596 }
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	597 else if (dv.numel () > 8192) // FIXME: make this configurable.
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	598 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	599 double max_val, min_val;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	600 if (m.all_integers (max_val, min_val))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	601 st = get_save_type (max_val, min_val);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	602 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	603
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	604 const double *mtmp = m.data ();
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	605 write_doubles (os, mtmp, st, dv.numel ());
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	606
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	607 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	608 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	609
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	610 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	611 octave_matrix::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	612 octave::mach_info::float_format fmt)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	613 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	614 char tmp;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	615 int32_t mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	616 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	617 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	618 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	619 swap_bytes<4> (&mdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	620 if (mdims < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	621 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	622 mdims = - mdims;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	623 int32_t di;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	624 dim_vector dv;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	625 dv.resize (mdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	626
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	627 for (int i = 0; i < mdims; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	628 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	629 if (! is.read (reinterpret_cast<char *> (&di), 4))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	630 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	631 if (swap)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	632 swap_bytes<4> (&di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	633 dv(i) = di;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	634 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	635
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	636 // Convert an array with a single dimension to be a row vector.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	637 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	638 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	639
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	640 if (mdims == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	641 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	642 mdims = 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	643 dv.resize (mdims);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	644 dv(1) = dv(0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	645 dv(0) = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	646 }
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	647
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	648 if (! is.read (reinterpret_cast<char *> (&tmp), 1))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	649 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	650
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	651 NDArray m(dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	652 double *re = m.fortran_vec ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	653 read_doubles (is, re, static_cast<save_type> (tmp), dv.numel (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	654 swap, fmt);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	655
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	656 if (! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	657 return false;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	658
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	659 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	660 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	661 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	662 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	663 int32_t nr, nc;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	664 nr = mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	665 if (! is.read (reinterpret_cast<char *> (&nc), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	666 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	667 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	668 swap_bytes<4> (&nc);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	669 if (! is.read (reinterpret_cast<char *> (&tmp), 1))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	670 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	671 Matrix m (nr, nc);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	672 double *re = m.fortran_vec ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	673 octave_idx_type len = nr * nc;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	674 read_doubles (is, re, static_cast<save_type> (tmp), len, swap, fmt);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	675
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	676 if (! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	677 return false;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	678
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	679 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	680 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	681 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	682 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	683
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	684 bool
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	685 octave_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	686 bool save_as_floats)
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	687 {
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	688 bool retval = false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	689
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	690 #if defined (HAVE_HDF5)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	691
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	692 dim_vector dv = dims ();
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	693 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	694 if (empty)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	695 return (empty > 0);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	696
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	697 int rank = dv.ndims ();
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	698 hid_t space_hid, data_hid;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	699 space_hid = data_hid = -1;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	700 NDArray m = array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	701
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	702 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	703
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	704 // Octave uses column-major, while HDF5 uses row-major ordering
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	705 for (int i = 0; i < rank; i++)
20218 b2100e1659ac maint: Use cuddled parentheses when indexing dimension_vectors. Rik <rik@octave.org> parents: 19863 diff changeset	706 hdims[i] = dv(rank-i-1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	707
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23708 diff changeset	708 space_hid = H5Screate_simple (rank, hdims, nullptr);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	709
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	710 if (space_hid < 0) return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	711
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	712 hid_t save_type_hid = H5T_NATIVE_DOUBLE;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	713
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	714 if (save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	715 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	716 if (m.too_large_for_float ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	717 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	718 warning ("save: some values too large to save as floats --");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	719 warning ("save: saving as doubles instead");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	720 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	721 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	722 save_type_hid = H5T_NATIVE_FLOAT;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	723 }
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	724 #if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	725 // hdf5 currently doesn't support float/integer conversions
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	726 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	727 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	728 double max_val, min_val;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	729
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	730 if (m.all_integers (max_val, min_val))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	731 save_type_hid
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	732 = save_type_to_hdf5 (get_save_type (max_val, min_val));
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	733 }
20945 9d9270e2f98f eliminate comments after preprocessor conditionals John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	734 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	735
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	736 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	737 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21013 diff changeset	738 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	739 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	740 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21013 diff changeset	741 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	742 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	743 if (data_hid < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	744 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	745 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	746 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	747 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	748
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	749 double *mtmp = m.fortran_vec ();
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21013 diff changeset	750 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21013 diff changeset	751 octave_H5P_DEFAULT, mtmp) >= 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	752
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	753 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	754 H5Sclose (space_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	755
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	756 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	757 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	758 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	759 octave_unused_parameter (save_as_floats);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	760
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	761 warn_save ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	762 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	763
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	764 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	765 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	766
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	767 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	768 octave_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	769 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	770 bool retval = false;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	771
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	772 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	773
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	774 dim_vector dv;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	775 int empty = load_hdf5_empty (loc_id, name, dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	776 if (empty > 0)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	777 matrix.resize (dv);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	778 if (empty)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	779 return (empty > 0);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	780
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	781 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21013 diff changeset	782 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	783 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	784 hid_t data_hid = H5Dopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	785 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	786 hid_t space_id = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	787
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	788 hsize_t rank = H5Sget_simple_extent_ndims (space_id);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	789
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	790 if (rank < 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	791 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	792 H5Sclose (space_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	793 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	794 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	795 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	796
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	797 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	798 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	799
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	800 H5Sget_simple_extent_dims (space_id, hdims, maxdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	801
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	802 // Octave uses column-major, while HDF5 uses row-major ordering
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	803 if (rank == 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	804 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	805 dv.resize (2);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	806 dv(0) = 1;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	807 dv(1) = hdims[0];
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	808 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	809 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	810 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	811 dv.resize (rank);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4805 diff changeset	812 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	813 dv(j) = hdims[i];
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	814 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	815
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	816 NDArray m (dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	817 double *re = m.fortran_vec ();
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21013 diff changeset	818 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21013 diff changeset	819 octave_H5P_DEFAULT, re) >= 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	820 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	821 retval = true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	822 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	823 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	824
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	825 H5Sclose (space_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	826 H5Dclose (data_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	827
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	828 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	829 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	830 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	831
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	832 warn_load ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	833 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	834
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	835 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	836 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	837
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	838 void
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	839 octave_matrix::print_raw (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	840 bool pr_as_read_syntax) const
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	841 {
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	842 octave_print_internal (os, matrix, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	843 current_print_indent_level ());
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	844 }
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	845
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	846 mxArray *
28131 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	847 octave_matrix::as_mxArray (bool interleaved) const
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	848 {
28131 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	849 mxArray *retval = new mxArray (interleaved, mxDOUBLE_CLASS, dims (), mxREAL);
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	850
28131 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	851 mxDouble pd = static_cast<mxDouble > (retval->get_data ());
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	852
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 5958 diff changeset	853 mwSize nel = numel ();
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	854
28131 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	855 const double *pdata = matrix.data ();
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	856
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 5958 diff changeset	857 for (mwIndex i = 0; i < nel; i++)
28131 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	858 pd[i] = pdata[i];
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	859
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	860 return retval;
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	861 }
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	862
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	863 // This uses a smarter strategy for doing the complex->real mappers. We
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	864 // allocate an array for a real result and keep filling it until a complex
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	865 // result is produced.
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	866 static octave_value
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	867 do_rc_map (const NDArray& a, Complex (&fcn) (double))
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	868 {
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	869 octave_idx_type n = a.numel ();
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 26401 diff changeset	870 NDArray rr (a.dims ());
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	871
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	872 for (octave_idx_type i = 0; i < n; i++)
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	873 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	874 octave_quit ();
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	875
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	876 Complex tmp = fcn (a(i));
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	877 if (tmp.imag () == 0.0)
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 26401 diff changeset	878 rr.xelem (i) = tmp.real ();
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	879 else
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	880 {
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 26401 diff changeset	881 ComplexNDArray rc (a.dims ());
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	882
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	883 for (octave_idx_type j = 0; j < i; j++)
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 26401 diff changeset	884 rc.xelem (j) = rr.xelem (j);
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	885
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 26401 diff changeset	886 rc.xelem (i) = tmp;
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	887
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	888 for (octave_idx_type j = i+1; j < n; j++)
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	889 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	890 octave_quit ();
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	891
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 26401 diff changeset	892 rc.xelem (j) = fcn (a(j));
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	893 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	894
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	895 return new octave_complex_matrix (rc);
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	896 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	897 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	898
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	899 return rr;
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	900 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	901
8650 a1ae2aae903e abs,real,imag,conj: use code from mx-inlines rather than the generic map Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	902 octave_value
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	903 octave_matrix::map (unary_mapper_t umap) const
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	904 {
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	905 switch (umap)
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	906 {
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	907 case umap_imag:
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	908 return NDArray (matrix.dims (), 0.0);
8650 a1ae2aae903e abs,real,imag,conj: use code from mx-inlines rather than the generic map Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	909
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	910 case umap_real:
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	911 case umap_conj:
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	912 return matrix;
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	913
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	914 // Mappers handled specially.
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	915 #define ARRAY_METHOD_MAPPER(UMAP, FCN) \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	916 case umap_ ## UMAP: \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	917 return octave_value (matrix.FCN ())
8998 a48fba01e4ac optimize isnan/isinf/isfinite mappers Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	918
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	919 ARRAY_METHOD_MAPPER (abs, abs);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	920 ARRAY_METHOD_MAPPER (isnan, isnan);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	921 ARRAY_METHOD_MAPPER (isinf, isinf);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	922 ARRAY_METHOD_MAPPER (isfinite, isfinite);
8998 a48fba01e4ac optimize isnan/isinf/isfinite mappers Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	923
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	924 #define ARRAY_MAPPER(UMAP, TYPE, FCN) \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	925 case umap_ ## UMAP: \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	926 return octave_value (matrix.map<TYPE> (FCN))
8998 a48fba01e4ac optimize isnan/isinf/isfinite mappers Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	927
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	928 #define RC_ARRAY_MAPPER(UMAP, TYPE, FCN) \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	929 case umap_ ## UMAP: \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	930 return do_rc_map (matrix, FCN)
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	931
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	932 RC_ARRAY_MAPPER (acos, Complex, octave::math::rc_acos);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	933 RC_ARRAY_MAPPER (acosh, Complex, octave::math::rc_acosh);
23708 750e42a35adc Use imag, real, arg from std library for Complex types. Rik <rik@octave.org> parents: 23619 diff changeset	934 ARRAY_MAPPER (angle, double, std::arg);
750e42a35adc Use imag, real, arg from std library for Complex types. Rik <rik@octave.org> parents: 23619 diff changeset	935 ARRAY_MAPPER (arg, double,std::arg);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	936 RC_ARRAY_MAPPER (asin, Complex, octave::math::rc_asin);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	937 ARRAY_MAPPER (asinh, double, octave::math::asinh);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	938 ARRAY_MAPPER (atan, double, ::atan);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	939 RC_ARRAY_MAPPER (atanh, Complex, octave::math::rc_atanh);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	940 ARRAY_MAPPER (erf, double, octave::math::erf);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	941 ARRAY_MAPPER (erfinv, double, octave::math::erfinv);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	942 ARRAY_MAPPER (erfcinv, double, octave::math::erfcinv);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	943 ARRAY_MAPPER (erfc, double, octave::math::erfc);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	944 ARRAY_MAPPER (erfcx, double, octave::math::erfcx);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	945 ARRAY_MAPPER (erfi, double, octave::math::erfi);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	946 ARRAY_MAPPER (dawson, double, octave::math::dawson);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	947 ARRAY_MAPPER (gamma, double, octave::math::gamma);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	948 RC_ARRAY_MAPPER (lgamma, Complex, octave::math::rc_lgamma);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	949 ARRAY_MAPPER (cbrt, double, octave::math::cbrt);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	950 ARRAY_MAPPER (ceil, double, ::ceil);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	951 ARRAY_MAPPER (cos, double, ::cos);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	952 ARRAY_MAPPER (cosh, double, ::cosh);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	953 ARRAY_MAPPER (exp, double, ::exp);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	954 ARRAY_MAPPER (expm1, double, octave::math::expm1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	955 ARRAY_MAPPER (fix, double, octave::math::fix);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	956 ARRAY_MAPPER (floor, double, ::floor);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	957 RC_ARRAY_MAPPER (log, Complex, octave::math::rc_log);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	958 RC_ARRAY_MAPPER (log2, Complex, octave::math::rc_log2);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	959 RC_ARRAY_MAPPER (log10, Complex, octave::math::rc_log10);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	960 RC_ARRAY_MAPPER (log1p, Complex, octave::math::rc_log1p);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	961 ARRAY_MAPPER (round, double, octave::math::round);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	962 ARRAY_MAPPER (roundb, double, octave::math::roundb);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	963 ARRAY_MAPPER (signum, double, octave::math::signum);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	964 ARRAY_MAPPER (sin, double, ::sin);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	965 ARRAY_MAPPER (sinh, double, ::sinh);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	966 RC_ARRAY_MAPPER (sqrt, Complex, octave::math::rc_sqrt);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	967 ARRAY_MAPPER (tan, double, ::tan);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	968 ARRAY_MAPPER (tanh, double, ::tanh);
23619 6ed4d6e306ba maint: Deprecate is_NA and replace with isna. Rik <rik@octave.org> parents: 23588 diff changeset	969 ARRAY_MAPPER (isna, bool, octave::math::isna);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	970 ARRAY_MAPPER (xsignbit, double, octave::math::signbit);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	971
18196 1b6db9303933 allow toupper and tolower to handle numeric values (bug #33537) John W. Eaton <jwe@octave.org> parents: 18100 diff changeset	972 // Special cases for Matlab compatibility.
1b6db9303933 allow toupper and tolower to handle numeric values (bug #33537) John W. Eaton <jwe@octave.org> parents: 18100 diff changeset	973 case umap_xtolower:
1b6db9303933 allow toupper and tolower to handle numeric values (bug #33537) John W. Eaton <jwe@octave.org> parents: 18100 diff changeset	974 case umap_xtoupper:
1b6db9303933 allow toupper and tolower to handle numeric values (bug #33537) John W. Eaton <jwe@octave.org> parents: 18100 diff changeset	975 return matrix;
1b6db9303933 allow toupper and tolower to handle numeric values (bug #33537) John W. Eaton <jwe@octave.org> parents: 18100 diff changeset	976
18197 0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	977 case umap_xisalnum:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	978 case umap_xisalpha:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	979 case umap_xisascii:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	980 case umap_xiscntrl:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	981 case umap_xisdigit:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	982 case umap_xisgraph:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	983 case umap_xislower:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	984 case umap_xisprint:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	985 case umap_xispunct:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	986 case umap_xisspace:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	987 case umap_xisupper:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	988 case umap_xisxdigit:
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	989 {
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	990 octave_value str_conv = convert_to_str (true, true);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	991 return str_conv.map (umap);
18197 0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	992 }
0d5721873d6b avoid some tests that rely on ordering of enum values John W. Eaton <jwe@octave.org> parents: 18196 diff changeset	993
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	994 default:
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	995 return octave_base_value::map (umap);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	996 }
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	997 }

Mercurial > jwe > octave

annotate libinterp/octave-value/ov-re-mat.cc @ 28131:4c21f99b4ad5