octave-nkf: liboctave/array/boolNDArray.cc annotate

annotate liboctave/array/boolNDArray.cc @ 16370:7ce21619a4b9

min Matlab compatibility issue (bug #33530) * max.cc (do_minmax_red_op<charNDArray>, do_minmax_bin_op<charNDArray>): New specializations. (do_minmax_body): Handle char arrays. New tests. * chNDArray.h, chNDArray.cc (charNDArray::min, charNDArray::max): New functions.

author	Axel Mathéi <axel.mathei@gmail.com>
date	Tue, 26 Mar 2013 10:43:42 -0400
parents	648dabbb4c6b
children	d63878346099

rev	line source
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	1 // N-D Array manipulations.
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	2 /*
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	3
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13731 diff changeset	4 Copyright (C) 1996-2012 John W. Eaton
9601 a9b37bae1802 add a couple of missing copyright statements Jaroslav Hajek <highegg@gmail.com> parents: 9578 diff changeset	5 Copyright (C) 2009 VZLU Prague, a.s.
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	6
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	8
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	10 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: 5775 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5775 diff changeset	12 option) any later version.
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	13
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	17 for more details.
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	18
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	19 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: 5775 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5775 diff changeset	21 <http://www.gnu.org/licenses/>.
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	22
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	23 */
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	24
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	26 #include <config.h>
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	27 #endif
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	28
4588 19bfd295f400 [project @ 2003-11-10 17:18:48 by jwe] jwe parents: 4569 diff changeset	29 #include "Array-util.h"
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	30 #include "CNDArray.h"
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	31 #include "mx-base.h"
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	32 #include "lo-ieee.h"
8774 b756ce0002db split implementation and interface in mx-op-defs and MArray-defs Jaroslav Hajek <highegg@gmail.com> parents: 8756 diff changeset	33 #include "mx-op-defs.h"
9548 e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	34 #include "MArray-defs.h"
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	35
9743 26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	36 #include "bsxfun-defs.cc"
26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	37
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	38 // unary operations
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	39
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	40 boolNDArray
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	41 boolNDArray::operator ! (void) const
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	42 {
13731 3b52038e6e6c Help dumb compilers to resolve template parameters. Michael Goffioul <michael.goffioul@gmail.com> parents: 13139 diff changeset	43 return do_mx_unary_op<bool, bool> (*this, mx_inline_not);
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	44 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	45
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	46 boolNDArray&
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	47 boolNDArray::invert (void)
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	48 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	49 if (is_shared ())
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	50 this = ! this;
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	51 else
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	52 do_mx_inplace_op<bool> (*this, mx_inline_not2);
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	53
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	54 return *this;
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	55 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	56
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5307 diff changeset	57 // FIXME -- this is not quite the right thing.
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	58
4556 773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe] jwe parents: 4543 diff changeset	59 boolNDArray
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	60 boolNDArray::all (int dim) const
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	61 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	62 return do_mx_red_op<bool, bool> (*this, dim, mx_inline_all);
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	63 }
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	64
4556 773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe] jwe parents: 4543 diff changeset	65 boolNDArray
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	66 boolNDArray::any (int dim) const
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	67 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	68 return do_mx_red_op<bool, bool> (*this, dim, mx_inline_any);
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	69 }
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	70
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	71 NDArray
7113 a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	72 boolNDArray::sum (int dim) const
a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	73 {
10152 b6b65e71049b optimize cumsum with logicals Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	74 // NOTE: going via octave_idx_type is typically faster even though it
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	75 // requires a conversion.
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	76 return do_mx_red_op<octave_idx_type, bool> (*this, dim, mx_inline_count);
7113 a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	77 }
a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	78
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	79 NDArray
8780 ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8774 diff changeset	80 boolNDArray::cumsum (int dim) const
ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8774 diff changeset	81 {
10152 b6b65e71049b optimize cumsum with logicals Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	82 // In this case, it's better to sum directly to doubles.
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	83 return do_mx_cum_op<double , bool> (*this, dim, mx_inline_cumcount);
8780 ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8774 diff changeset	84 }
ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8774 diff changeset	85
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	86 boolNDArray
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	87 boolNDArray::concat (const boolNDArray& rb, const Array<octave_idx_type>& ra_idx)
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	88 {
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	89 if (rb.numel () > 0)
5073 e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4964 diff changeset	90 insert (rb, ra_idx);
e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4964 diff changeset	91 return *this;
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	92 }
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	93
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	94 boolNDArray&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	95 boolNDArray::insert (const boolNDArray& a, octave_idx_type r, octave_idx_type c)
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	96 {
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	97 Array<bool>::insert (a, r, c);
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	98 return *this;
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	99 }
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	100
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	101 boolNDArray&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	102 boolNDArray::insert (const boolNDArray& a, const Array<octave_idx_type>& ra_idx)
4964 269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	103 {
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	104 Array<bool>::insert (a, ra_idx);
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	105 return *this;
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	106 }
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	107
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	108
269c3d6c0569 [project @ 2004-09-04 01:16:28 by jwe] jwe parents: 4770 diff changeset	109
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	110 boolMatrix
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	111 boolNDArray::matrix_value (void) const
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	112 {
10352 a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	113 return *this;
4514 8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	114 }
8373b9b41eee [project @ 2003-09-19 21:47:10 by jwe] jwe parents: diff changeset	115
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4514 diff changeset	116 void
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	117 boolNDArray::increment_index (Array<octave_idx_type>& ra_idx,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	118 const dim_vector& dimensions,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	119 int start_dimension)
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4514 diff changeset	120 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4514 diff changeset	121 ::increment_index (ra_idx, dimensions, start_dimension);
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4514 diff changeset	122 }
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4514 diff changeset	123
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	124 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	125 boolNDArray::compute_index (Array<octave_idx_type>& ra_idx,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	126 const dim_vector& dimensions)
4556 773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe] jwe parents: 4543 diff changeset	127 {
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe] jwe parents: 4543 diff changeset	128 return ::compute_index (ra_idx, dimensions);
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe] jwe parents: 4543 diff changeset	129 }
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe] jwe parents: 4543 diff changeset	130
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7113 diff changeset	131 boolNDArray
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7113 diff changeset	132 boolNDArray::diag (octave_idx_type k) const
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7113 diff changeset	133 {
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9612 diff changeset	134 return Array<bool>::diag (k);
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7113 diff changeset	135 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7113 diff changeset	136
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	137 boolNDArray
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	138 boolNDArray::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: 14138 diff changeset	139 {
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	140 return Array<bool>::diag (m, n);
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	141 }
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	142
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9548 diff changeset	143 NDND_BOOL_OPS (boolNDArray, boolNDArray)
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9550 diff changeset	144 NDND_CMP_OPS (boolNDArray, boolNDArray)
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	145
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9548 diff changeset	146 NDS_BOOL_OPS (boolNDArray, bool)
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9550 diff changeset	147 NDS_CMP_OPS (boolNDArray, bool)
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: 4588 diff changeset	148
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9548 diff changeset	149 SND_BOOL_OPS (bool, boolNDArray)
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9550 diff changeset	150 SND_CMP_OPS (bool, boolNDArray)
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: 4588 diff changeset	151
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	152 boolNDArray&
9548 e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	153 mx_el_and_assign (boolNDArray& a, const boolNDArray& b)
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	154 {
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	155 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9607 diff changeset	156 a = mx_el_and (a, b);
9548 e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	157 else
13139 aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 11586 diff changeset	158 do_mm_inplace_op<bool, bool> (a, b, mx_inline_and2, mx_inline_and2,
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 11586 diff changeset	159 "operator &=");
9548 e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	160
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	161 return a;
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	162 }
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	163
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	164 boolNDArray&
9548 e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	165 mx_el_or_assign (boolNDArray& a, const boolNDArray& b)
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	166 {
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	167 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9607 diff changeset	168 a = mx_el_or (a, b);
9548 e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	169 else
13139 aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 11586 diff changeset	170 do_mm_inplace_op<bool, bool> (a, b, mx_inline_or2, mx_inline_or2,
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 11586 diff changeset	171 "operator \|=");
9548 e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	172
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	173 return a;
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	174 }
e5f7aee2ab8c optimize &=, \|= operators Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	175
9743 26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	176 BSXFUN_OP_DEF_MXLOOP (and, boolNDArray, mx_inline_and)
26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	177 BSXFUN_OP_DEF_MXLOOP (or, boolNDArray, mx_inline_or)

Mercurial > hg > octave-nkf

annotate liboctave/array/boolNDArray.cc @ 16370:7ce21619a4b9