octave: libinterp/octave-value/ov-bool-mat.cc annotate

annotate libinterp/octave-value/ov-bool-mat.cc @ 21691:263d18409fdf

Eliminate unused variable warnings for conditionally compiled code. We had more or less decided not to bother trying to eliminate all these warnings for cases in which external dependencies are missing. But then we get people trying to fix these in various ways, so we might as well do it for all cases and use a consistent method. * oct-conf-post.in.h (octave_unused_parameter): New function for C++ code and new macro for C code. * mk-octave-config-h.sh: Emit octave_unused_parameter function and macro for octave-config.h. * CSparse.cc, __delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, cdisplay.c, colamd.cc, convhulln.cc, dSparse.cc, dmperm.cc, fftw.cc, gl-render.cc, lo-error.c, load-save.cc, ls-hdf5.cc, ls-mat5.cc, oct-hdf5-types.cc, ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, sparse-chol.cc, sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, sparse-util.cc, symbfact.cc: Use octave_unused_parameter to eliminate warnings for conditionally compiled code.

author	John W. Eaton <jwe@octave.org>
date	Fri, 13 May 2016 09:36:14 -0400
parents	53728df3e4c9
children	aba2e6293dd8

rev	line source
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	1 /*
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19598 diff changeset	3 Copyright (C) 1996-2015 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10521 diff changeset	4 Copyright (C) 2009-2010 VZLU Prague
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	5
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	7
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	11 option) any later version.
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	12
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	16 for more details.
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	17
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	20 <http://www.gnu.org/licenses/>.
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	21
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	22 */
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	23
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	25 # include "config.h"
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	26 #endif
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	27
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3220 diff changeset	28 #include <iostream>
4726 14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe] jwe parents: 4687 diff changeset	29 #include <vector>
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2871 diff changeset	30
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	31 #include "lo-ieee.h"
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	32 #include "mx-base.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	33 #include "oct-locbuf.h"
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	34
9852 aabf7a8c2e57 implement sparse logical conversion Jaroslav Hajek <highegg@gmail.com> parents: 9850 diff changeset	35 #include "defun.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21022 diff changeset	36 #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	37 #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	38 #include "ovl.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: 19697 diff changeset	39 #include "oct-hdf5.h"
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	40 #include "ops.h"
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3145 diff changeset	41 #include "ov-base.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3145 diff changeset	42 #include "ov-base-mat.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3145 diff changeset	43 #include "ov-base-mat.cc"
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	44 #include "ov-bool.h"
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	45 #include "ov-bool-mat.h"
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	46 #include "ov-re-mat.h"
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	47 #include "pr-output.h"
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	48
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	49 #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	50 #include "ls-oct-text.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	51 #include "ls-hdf5.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	52 #include "ls-utils.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	53
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	54 template class octave_base_matrix<boolNDArray>;
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	55
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	56
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4513 diff changeset	57 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_bool_matrix,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	58 "bool matrix", "logical");
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	59
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	60 static octave_base_value *
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	61 default_numeric_conversion_function (const octave_base_value& a)
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	62 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21580 diff changeset	63 const octave_bool_matrix& v = dynamic_cast<const octave_bool_matrix&> (a);
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	64
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	65 return new octave_matrix (NDArray (v.bool_array_value ()));
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	66 }
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	67
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	68 octave_base_value::type_conv_info
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	69 octave_bool_matrix::numeric_conversion_function (void) const
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	70 {
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	71 return octave_base_value::type_conv_info (default_numeric_conversion_function,
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	72 octave_matrix::static_type_id ());
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	73 }
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	74
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	75 octave_base_value *
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	76 octave_bool_matrix::try_narrowing_conversion (void)
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	77 {
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	78 octave_base_value *retval = 0;
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	79
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	80 if (matrix.ndims () == 2)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	81 {
19317 25f535b90e52 Change boolMatrix to subclass boolNDArray rather than be another Array<bool>. Carnë Draug <carandraug@octave.org> parents: 18812 diff changeset	82 boolMatrix bm (matrix);
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	83
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	84 octave_idx_type nr = bm.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	85 octave_idx_type nc = bm.cols ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	86
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	87 if (nr == 1 && nc == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	88 retval = new octave_bool (bm (0, 0));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	89 }
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	90
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	91 return retval;
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	92 }
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	93
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	94 double
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	95 octave_bool_matrix::double_value (bool) const
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	96 {
4102 cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	97 double retval = lo_ieee_nan_value ();
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	98
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	99 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	100 err_invalid_conversion ("bool matrix", "real scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4192 diff changeset	101
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	102 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	103 "bool matrix", "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	104
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	105 retval = matrix(0, 0);
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	106
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	107 return retval;
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	108 }
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	109
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	110 float
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	111 octave_bool_matrix::float_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	112 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	113 float retval = lo_ieee_float_nan_value ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	114
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	115 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	116 err_invalid_conversion ("bool matrix", "real scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	117
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	118 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	119 "bool matrix", "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	120
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	121 retval = matrix(0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	122
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	123 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	124 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	125
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	126 Complex
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	127 octave_bool_matrix::complex_value (bool) const
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	128 {
4102 cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	129 double tmp = lo_ieee_nan_value ();
cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	130
cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	131 Complex retval (tmp, tmp);
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	132
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	133 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	134 err_invalid_conversion ("bool matrix", "complex scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4192 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 "bool matrix", "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	138
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	139 retval = matrix(0, 0);
2871 c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	140
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	141 return retval;
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	142 }
c691fdf6bebb [project @ 1997-04-19 01:26:38 by jwe] jwe parents: diff changeset	143
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	144 FloatComplex
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	145 octave_bool_matrix::float_complex_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	146 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	147 float tmp = lo_ieee_float_nan_value ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	148
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	149 FloatComplex retval (tmp, tmp);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	150
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	151 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	152 err_invalid_conversion ("bool matrix", "complex scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	153
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	154 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	155 "bool matrix", "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	156
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	157 retval = matrix(0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	158
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	159 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	160 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	161
4457 d7d9ca19960a [project @ 2003-07-11 03:05:38 by jwe] jwe parents: 4455 diff changeset	162 octave_value
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	163 octave_bool_matrix::convert_to_str_internal (bool pad, bool force,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	164 char type) const
4457 d7d9ca19960a [project @ 2003-07-11 03:05:38 by jwe] jwe parents: 4455 diff changeset	165 {
4844 9f7ef92b50b0 [project @ 2004-04-02 17:26:53 by jwe] jwe parents: 4837 diff changeset	166 octave_value tmp = octave_value (array_value ());
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	167 return tmp.convert_to_str (pad, force, type);
4457 d7d9ca19960a [project @ 2003-07-11 03:05:38 by jwe] jwe parents: 4455 diff changeset	168 }
d7d9ca19960a [project @ 2003-07-11 03:05:38 by jwe] jwe parents: 4455 diff changeset	169
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	170 void
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	171 octave_bool_matrix::print_raw (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	172 bool pr_as_read_syntax) const
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	173 {
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	174 octave_print_internal (os, matrix, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	175 current_print_indent_level ());
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	176 }
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	177
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	178 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6718 diff changeset	179 octave_bool_matrix::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	180 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	181 dim_vector dv = dims ();
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	182 if (dv.ndims () > 2)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	183 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	184 NDArray tmp = array_value ();
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	185 os << "# ndims: " << dv.ndims () << "\n";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	186
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	187 for (int i = 0; i < dv.ndims (); i++)
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	188 os << " " << dv(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	189
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	190 os << "\n" << tmp;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	191 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	192 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	193 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	194 // 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	195 // compatibility. Makes load_ascii much more complex!!
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	196 os << "# rows: " << rows () << "\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	197 << "# columns: " << columns () << "\n";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	198
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	199 Matrix tmp = matrix_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	200
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	201 os << tmp;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	202 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	203
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	204 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	205 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	206
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	207 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	208 octave_bool_matrix::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	209 {
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	210 string_vector keywords (2);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	211
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	212 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	213 keywords[1] = "rows";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	214
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	215 std::string kw;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	216 octave_idx_type val = 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	217
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	218 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	219 error ("load: failed to extract number of rows and columns");
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	220
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	221 if (kw == "ndims")
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	222 {
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	223 int mdims = static_cast<int> (val);
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	224
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	225 if (mdims < 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	226 error ("load: failed to extract number of dimensions");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	227
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	228 dim_vector dv;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	229 dv.resize (mdims);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	230
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	231 for (int i = 0; i < mdims; i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	232 is >> dv(i);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	233
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	234 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	235 error ("load: failed to extract dimensions");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	236
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	237 boolNDArray btmp (dv);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	238
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	239 if (btmp.is_empty ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	240 matrix = btmp;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	241 else
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	242 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	243 NDArray tmp(dv);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	244 is >> tmp;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	245
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	246 if (! is)
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	247 error ("load: failed to load matrix constant");
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	248
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	249 for (octave_idx_type i = 0; i < btmp.numel (); i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	250 btmp.elem (i) = (tmp.elem (i) != 0.);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	251
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	252 matrix = btmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	253 }
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	254 }
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	255 else if (kw == "rows")
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	256 {
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	257 octave_idx_type nr = val;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	258 octave_idx_type nc = 0;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	259
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	260 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	261 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	262
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	263 if (nr > 0 && nc > 0)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	264 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	265 Matrix tmp (nr, nc);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	266 is >> tmp;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	267 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	268 error ("load: failed to load matrix constant");
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	269
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	270 boolMatrix btmp (nr, nc);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	271 for (octave_idx_type j = 0; j < nc; j++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	272 for (octave_idx_type i = 0; i < nr; i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	273 btmp.elem (i,j) = (tmp.elem (i, j) != 0.);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	274
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	275 matrix = btmp;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	276 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	277 else if (nr == 0 \|\| nc == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	278 matrix = boolMatrix (nr, nc);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	279 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	280 panic_impossible ();
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	281 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	282 else
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20956 diff changeset	283 panic_impossible ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	284
21124 95f8c8cdbffe maint: Eliminate 'bool success' variable where possible. Rik <rik@octave.org> parents: 21118 diff changeset	285 return true;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	286 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	287
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	288 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	289 octave_bool_matrix::save_binary (std::ostream& os, bool& /* save_as_floats */)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	290 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	291
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	292 dim_vector dv = dims ();
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	293 if (dv.ndims () < 1)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	294 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	295
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	296 // 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	297 int32_t tmp = - dv.ndims ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	298 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	299 for (int i = 0; i < dv.ndims (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	300 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	301 tmp = dv(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	302 os.write (reinterpret_cast<char *> (&tmp), 4);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	303 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	304
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	305 boolNDArray m = bool_array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	306 bool *mtmp = m.fortran_vec ();
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	307 octave_idx_type nel = m.numel ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	308 OCTAVE_LOCAL_BUFFER (char, htmp, nel);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	309
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	310 for (octave_idx_type i = 0; i < nel; i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	311 htmp[i] = (mtmp[i] ? 1 : 0);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	312
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	313 os.write (htmp, nel);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	314
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	315 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	316 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	317
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	318 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	319 octave_bool_matrix::load_binary (std::istream& is, bool swap,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	320 oct_mach_info::float_format /* fmt */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	321 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	322 int32_t mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	323 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	324 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	325 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4844 diff changeset	326 swap_bytes<4> (&mdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	327 if (mdims >= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	328 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	329
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	330 // mdims is negative for consistency with other matrices, where it is
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	331 // negative to allow the positive value to be used for rows/cols for
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	332 // backward compatibility
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	333 mdims = - mdims;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	334 int32_t di;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	335 dim_vector dv;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	336 dv.resize (mdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	337
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	338 for (int i = 0; i < mdims; i++)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	339 {
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	340 if (! is.read (reinterpret_cast<char *> (&di), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	341 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	342 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	343 swap_bytes<4> (&di);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	344 dv(i) = di;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	345 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	346
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	347 // 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	348 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	349 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	350
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	351 if (mdims == 1)
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	352 {
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	353 mdims = 2;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	354 dv.resize (mdims);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	355 dv(1) = dv(0);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	356 dv(0) = 1;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	357 }
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	358
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	359 octave_idx_type nel = dv.numel ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	360 OCTAVE_LOCAL_BUFFER (char, htmp, nel);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	361 if (! is.read (htmp, nel))
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	362 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	363 boolNDArray m(dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	364 bool *mtmp = m.fortran_vec ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	365 for (octave_idx_type i = 0; i < nel; i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	366 mtmp[i] = (htmp[i] ? 1 : 0);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	367 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	368
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	369 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	370 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	371
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: 19697 diff changeset	372 bool
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: 19697 diff changeset	373 octave_bool_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name,
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: 19697 diff changeset	374 bool /* save_as_floats */)
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: 19697 diff changeset	375 {
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: 19697 diff changeset	376 bool retval = true;
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: 19697 diff changeset	377
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	378 #if defined (HAVE_HDF5)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4844 diff changeset	379
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	380 dim_vector dv = dims ();
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	381 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	382 if (empty)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	383 return (empty > 0);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	384
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21647 diff changeset	385 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: 17787 diff changeset	386 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: 17787 diff changeset	387 space_hid = data_hid = -1;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	388 boolNDArray m = bool_array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	389
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	390 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	391
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	392 // Octave uses column-major, while HDF5 uses row-major ordering
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	393 for (int i = 0; i < rank; i++)
20218 b2100e1659ac maint: Use cuddled parentheses when indexing dimension_vectors. Rik <rik@octave.org> parents: 20163 diff changeset	394 hdims[i] = dv(rank-i-1);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	395
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4805 diff changeset	396 space_hid = H5Screate_simple (rank, hdims, 0);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	397 if (space_hid < 0) return false;
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	398 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	399 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20979 diff changeset	400 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	401 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	402 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20979 diff changeset	403 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	404 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	405 if (data_hid < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	406 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	407 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	408 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	409 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	410
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	411 octave_idx_type nel = m.numel ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	412 bool *mtmp = m.fortran_vec ();
6276 d26c558691cd [project @ 2007-02-07 09:01:24 by jwe] jwe parents: 5958 diff changeset	413 OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nel);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	414
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	415 for (octave_idx_type i = 0; i < nel; i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	416 htmp[i] = mtmp[i];
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	417
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20979 diff changeset	418 retval = H5Dwrite (data_hid, H5T_NATIVE_HBOOL, 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: 20979 diff changeset	419 octave_H5P_DEFAULT, htmp) >= 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	420
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	421 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	422 H5Sclose (space_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	423
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: 19697 diff changeset	424 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	425 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	426 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	427
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	428 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: 19697 diff changeset	429 #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: 19697 diff changeset	430
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	431 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	432 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	433
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	434 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: 19697 diff changeset	435 octave_bool_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	436 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	437 bool retval = false;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	438
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: 19697 diff changeset	439 #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: 19697 diff changeset	440
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	441 dim_vector dv;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	442 int empty = load_hdf5_empty (loc_id, name, dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	443 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	444 matrix.resize (dv);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	445 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	446 return (empty > 0);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	447
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	448 #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: 20979 diff changeset	449 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	450 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	451 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	452 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	453 hid_t space_id = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	454
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	455 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	456
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	457 if (rank < 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	458 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	459 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	460 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	461 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	462
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	463 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	464 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	465
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	466 H5Sget_simple_extent_dims (space_id, hdims, maxdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	467
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	468 // Octave uses column-major, while HDF5 uses row-major ordering
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	469 if (rank == 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	470 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	471 dv.resize (2);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	472 dv(0) = 1;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	473 dv(1) = hdims[0];
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	474 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	475 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	476 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	477 dv.resize (rank);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4805 diff changeset	478 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: 10160 diff changeset	479 dv(j) = hdims[i];
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	480 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	481
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	482 octave_idx_type nel = dv.numel ();
6276 d26c558691cd [project @ 2007-02-07 09:01:24 by jwe] jwe parents: 5958 diff changeset	483 OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nel);
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20979 diff changeset	484 if (H5Dread (data_hid, H5T_NATIVE_HBOOL, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, htmp)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	485 >= 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	486 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	487 retval = true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	488
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	489 boolNDArray btmp (dv);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	490 for (octave_idx_type i = 0; i < nel; i++)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	491 btmp.elem (i) = htmp[i];
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	492
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	493 matrix = btmp;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	494 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	495
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	496 H5Dclose (data_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	497
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: 19697 diff changeset	498 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	499 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	500 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	501
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	502 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: 19697 diff changeset	503 #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: 19697 diff changeset	504
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	505 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	506 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4844 diff changeset	507
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	508 mxArray *
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	509 octave_bool_matrix::as_mxArray (void) const
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	510 {
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	511 mxArray *retval = new mxArray (mxLOGICAL_CLASS, dims (), mxREAL);
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	512
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	513 bool pr = static_cast<bool > (retval->get_data ());
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	514
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 6276 diff changeset	515 mwSize nel = numel ();
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	516
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	517 const bool *p = matrix.data ();
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	518
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 6276 diff changeset	519 for (mwIndex i = 0; i < nel; i++)
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	520 pr[i] = p[i];
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	521
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	522 return retval;
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	523 }
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5828 diff changeset	524
9850 85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	525 DEFUN (logical, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	526 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	527 @deftypefn {} {} logical (@var{x})\n\
18533 ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17787 diff changeset	528 Convert the numeric object @var{x} to logical type.\n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17787 diff changeset	529 \n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19863 diff changeset	530 Any nonzero values will be converted to true (1) while zero values will be\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19863 diff changeset	531 converted to false (0). The non-numeric value NaN cannot be converted and\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19863 diff changeset	532 will produce an error.\n\
18533 ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17787 diff changeset	533 \n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17787 diff changeset	534 Compatibility Note: Octave accepts complex values as input, whereas\n\
ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 17787 diff changeset	535 @sc{matlab} issues an error.\n\
9850 85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	536 @seealso{double, single, char}\n\
85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	537 @end deftypefn")
85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	538 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	539 if (args.length () != 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	540 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	541
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	542 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	543
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	544 octave_value arg = args(0);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	545
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	546 if (arg.is_bool_type ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	547 retval = arg;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	548 else if (arg.is_numeric_type ())
9850 85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	549 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	550 if (arg.is_sparse_type ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	551 retval = arg.sparse_bool_matrix_value ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	552 else if (arg.is_scalar_type ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	553 retval = arg.bool_value ();
9850 85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	554 else
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	555 retval = arg.bool_array_value ();
9850 85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	556 }
85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	557 else
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21022 diff changeset	558 err_wrong_type_arg ("logical", arg);
9850 85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	559
85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	560 return retval;
85f6c386f2bb implement built-in logical Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	561 }
12645 d3ccd2e37de6 Allow scalar integer to logical conversion (bug #33219) John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	562
d3ccd2e37de6 Allow scalar integer to logical conversion (bug #33219) John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	563 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	564 %!test
12645 d3ccd2e37de6 Allow scalar integer to logical conversion (bug #33219) John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	565 %! m = eye (2) != 0;
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20952 diff changeset	566 %! s = ! 0;
12645 d3ccd2e37de6 Allow scalar integer to logical conversion (bug #33219) John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	567 %! c = {"double", "single", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "logical"};
d3ccd2e37de6 Allow scalar integer to logical conversion (bug #33219) John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	568 %! for i = 1:numel (c)
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21301 diff changeset	569 %! assert (logical (eye (2, c{i})), m);
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21301 diff changeset	570 %! assert (logical (eye (1, c{i})), s);
12645 d3ccd2e37de6 Allow scalar integer to logical conversion (bug #33219) John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	571 %! endfor
d3ccd2e37de6 Allow scalar integer to logical conversion (bug #33219) John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	572 */

Mercurial > octave

annotate libinterp/octave-value/ov-bool-mat.cc @ 21691:263d18409fdf