Mercurial > hg > octave-nkf
annotate liboctave/chNDArray.cc @ 12747:901d466ee55a stable release-3-4-1
Version 3.4.1 released.
* configure.ac (AC_INIT): Version is now 3.4.1.
(OCTAVE_API_VERSION_NUMBER): Now 45.
(OCTAVE_RELEASE_DATE): Now 2011-06-15.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 15 Jun 2011 10:35:37 -0400 |
| parents | 12df7854fa7c |
| children | 72c96de7a403 |
| rev | line source |
|---|---|
| 4514 | 1 // N-D Array manipulations. |
| 2 /* | |
| 3 | |
| 11523 | 4 Copyright (C) 2003-2011 John W. Eaton |
| 4514 | 5 |
| 6 This file is part of Octave. | |
| 7 | |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 4514 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 4514 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 4588 | 28 #include "Array-util.h" |
| 4514 | 29 #include "chNDArray.h" |
| 30 #include "mx-base.h" | |
| 31 #include "lo-ieee.h" | |
| 4915 | 32 #include "lo-mappers.h" |
|
8774
b756ce0002db
split implementation and interface in mx-op-defs and MArray-defs
Jaroslav Hajek <highegg@gmail.com>
parents:
8750
diff
changeset
|
33 #include "mx-op-defs.h" |
| 4514 | 34 |
|
10107
fd262afea1d1
optimize bsxfun for chars
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
35 #include "bsxfun-defs.cc" |
|
fd262afea1d1
optimize bsxfun for chars
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
36 |
| 5775 | 37 // FIXME -- this is not quite the right thing. |
| 4514 | 38 |
| 4556 | 39 boolNDArray |
| 4514 | 40 charNDArray::all (int dim) const |
| 41 { | |
|
10362
b47ab50a6aa8
simplify appliers in mx-inlines.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
42 return do_mx_red_op<bool, char> (*this, dim, mx_inline_all); |
| 4514 | 43 } |
| 44 | |
| 4556 | 45 boolNDArray |
| 4514 | 46 charNDArray::any (int dim) const |
| 47 { | |
|
10362
b47ab50a6aa8
simplify appliers in mx-inlines.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
48 return do_mx_red_op<bool, char> (*this, dim, mx_inline_any); |
| 4514 | 49 } |
| 50 | |
| 4915 | 51 charNDArray |
| 5275 | 52 charNDArray::concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx) |
| 4915 | 53 { |
| 4940 | 54 if (rb.numel () > 0) |
| 5073 | 55 insert (rb, ra_idx); |
| 56 return *this; | |
| 4915 | 57 } |
| 58 | |
| 59 charNDArray | |
| 5275 | 60 charNDArray::concat (const NDArray& rb, const Array<octave_idx_type>& ra_idx) |
| 4758 | 61 { |
| 4915 | 62 charNDArray tmp (rb.dims ()); |
| 5275 | 63 octave_idx_type nel = rb.numel (); |
| 4915 | 64 |
| 4940 | 65 if (rb.numel () == 0) |
| 5073 | 66 return *this; |
| 4915 | 67 |
| 5275 | 68 for (octave_idx_type i = 0; i < nel; i++) |
| 4915 | 69 { |
| 70 double d = rb.elem (i); | |
| 71 | |
| 72 if (xisnan (d)) | |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
73 { |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
74 (*current_liboctave_error_handler) |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
75 ("invalid conversion from NaN to character"); |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
76 return *this; |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
77 } |
| 4915 | 78 else |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
79 { |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
80 octave_idx_type ival = NINTbig (d); |
| 4915 | 81 |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
82 if (ival < 0 || ival > UCHAR_MAX) |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
83 // FIXME -- is there something |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
84 // better we could do? Should we warn the user? |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
85 ival = 0; |
| 4915 | 86 |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
87 tmp.elem (i) = static_cast<char>(ival); |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
88 } |
| 4915 | 89 } |
| 90 | |
| 5073 | 91 insert (tmp, ra_idx); |
| 92 return *this; | |
| 4915 | 93 } |
| 94 | |
| 95 charNDArray& | |
| 5275 | 96 charNDArray::insert (const charNDArray& a, octave_idx_type r, octave_idx_type c) |
| 4915 | 97 { |
| 98 Array<char>::insert (a, r, c); | |
| 99 return *this; | |
| 100 } | |
| 101 | |
| 102 charNDArray& | |
| 5275 | 103 charNDArray::insert (const charNDArray& a, const Array<octave_idx_type>& ra_idx) |
| 4915 | 104 { |
| 105 Array<char>::insert (a, ra_idx); | |
| 106 return *this; | |
| 4758 | 107 } |
| 108 | |
| 4514 | 109 charMatrix |
| 110 charNDArray::matrix_value (void) const | |
| 111 { | |
| 10352 | 112 return *this; |
| 4514 | 113 } |
| 114 | |
| 4532 | 115 void |
| 5275 | 116 charNDArray::increment_index (Array<octave_idx_type>& ra_idx, |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
117 const dim_vector& dimensions, |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
118 int start_dimension) |
| 4532 | 119 { |
| 120 ::increment_index (ra_idx, dimensions, start_dimension); | |
| 121 } | |
| 122 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
123 octave_idx_type |
| 5275 | 124 charNDArray::compute_index (Array<octave_idx_type>& ra_idx, |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10267
diff
changeset
|
125 const dim_vector& dimensions) |
| 4556 | 126 { |
| 127 return ::compute_index (ra_idx, dimensions); | |
| 128 } | |
| 129 | |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
130 charNDArray |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
131 charNDArray::diag (octave_idx_type k) const |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
132 { |
|
10267
479c7df0cc96
don't instantiate MArray<char>
Jaroslav Hajek <highegg@gmail.com>
parents:
10158
diff
changeset
|
133 return Array<char>::diag (k); |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
134 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
135 |
|
9578
7dafdb8b062f
refactor comparison ops implementations
Jaroslav Hajek <highegg@gmail.com>
parents:
9550
diff
changeset
|
136 NDS_CMP_OPS (charNDArray, char) |
|
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
9227
diff
changeset
|
137 NDS_BOOL_OPS (charNDArray, char) |
| 6456 | 138 |
|
9578
7dafdb8b062f
refactor comparison ops implementations
Jaroslav Hajek <highegg@gmail.com>
parents:
9550
diff
changeset
|
139 SND_CMP_OPS (char, charNDArray) |
|
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
9227
diff
changeset
|
140 SND_BOOL_OPS (char, charNDArray) |
| 6456 | 141 |
|
9578
7dafdb8b062f
refactor comparison ops implementations
Jaroslav Hajek <highegg@gmail.com>
parents:
9550
diff
changeset
|
142 NDND_CMP_OPS (charNDArray, charNDArray) |
|
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
9227
diff
changeset
|
143 NDND_BOOL_OPS (charNDArray, charNDArray) |
| 6456 | 144 |
|
10107
fd262afea1d1
optimize bsxfun for chars
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
145 BSXFUN_STDREL_DEFS_MXLOOP (charNDArray) |