Mercurial > octave-nkf
annotate src/ov-cx-mat.h @ 14557:e8e86ae3abbc
make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
* Array.h, Array.cc (Array<T>::diag (octave_idx_type, octave_idx_type)
const): New function.
* CMatrix.h, CMatrix.cc (ComplexMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* dMatrix.h, dMatrix.cc (Matrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* fCMatrix.h, fCMatrix.cc (FloatComplexMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* fMatrix.h, fMatrix.cc (FloatMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* CNDArray.cc, CNDArray.h (ComplexNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* boolNDArray.cc, boolNDArray.h (boolNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* chNDArray.cc, chNDArray.h (charNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* dNDArray.cc, dNDArray.h (NDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* fCNDArray.cc, fCNDArray.h (FloatComplexNDArray::diag
(octave_idx_type, octave_idx_type) const): New forwarding function.
* fNDArray.cc, fNDArray.h (FloatNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* intNDArray.cc, intNDArray.h (intNDArray<T>::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* Cell.cc, Cell.h (Cell::diag (octave_idx_type, octave_idx_type)
const): New function.
* ov.h (octave_value::diag (octave_idx_type, octave_idx_type)):
New function.
* ov-base.h, ov-base.cc (octave_base_value::diag (octave_idx_type,
octave_idx_type) const): New virtual function and default implementation.
* ov-base-mat.h (octave_base_matrix<T>::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-base-scalar.cc, ov-base-scalar.h (octave_base_scalar<T>::diag
(octave_idx_type, octave_idx_type)): New function.
* ov-complex.cc, ov-complex.h (octave_complex::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-cx-mat.cc, ov-complex.h (octave_complex_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-float.cc, ov-float.h (octave_float_scalar::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-flt-complex.cc, ov-flt-complex.h (octave_float_complex::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-flt-cx-mat.cc, ov-flt-cx-mat.h (octave_float_complex_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-flt-re-mat.cc, ov-flt-re-mat.h (octave_float_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-range.cc, ov-range.h (octave_range::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-re-mat.cc, ov-re-mat.h (octave_matrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-scalar.cc, ov-scalar.h (octave_scalar::diag (octave_idx_type,
octave_idx_type) const): New function.
* data.cc (Fdiag): Use two-arg octave_value::diag method for
dispatching. New tests.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 12 Apr 2012 16:27:39 -0400 |
| parents | 72c96de7a403 |
| children |
| rev | line source |
|---|---|
| 2376 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
3 Copyright (C) 1996-2012 John W. Eaton |
| 11523 | 4 Copyright (C) 2009-2010 VZLU Prague |
| 2376 | 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. | |
| 2376 | 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/>. | |
| 2376 | 21 |
| 22 */ | |
| 23 | |
| 24 #if !defined (octave_complex_matrix_h) | |
| 25 #define octave_complex_matrix_h 1 | |
| 26 | |
| 27 #include <cstdlib> | |
| 28 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
29 #include <iosfwd> |
| 2376 | 30 #include <string> |
| 31 | |
| 32 #include "mx-base.h" | |
| 2477 | 33 #include "oct-alloc.h" |
| 2376 | 34 #include "str-vec.h" |
| 35 | |
| 36 #include "error.h" | |
| 4944 | 37 #include "oct-stream.h" |
| 2376 | 38 #include "ov-base.h" |
| 3219 | 39 #include "ov-base-mat.h" |
| 2376 | 40 #include "ov-typeinfo.h" |
| 41 | |
| 5785 | 42 #include "MatrixType.h" |
| 43 | |
| 2376 | 44 class octave_value_list; |
| 45 | |
| 46 class tree_walker; | |
| 47 | |
| 2477 | 48 // Complex matrix values. |
| 2376 | 49 |
| 50 class | |
| 6693 | 51 OCTINTERP_API |
| 4513 | 52 octave_complex_matrix : public octave_base_matrix<ComplexNDArray> |
| 2376 | 53 { |
| 54 public: | |
| 55 | |
| 56 octave_complex_matrix (void) | |
| 4513 | 57 : octave_base_matrix<ComplexNDArray> () { } |
| 58 | |
| 59 octave_complex_matrix (const ComplexNDArray& m) | |
| 60 : octave_base_matrix<ComplexNDArray> (m) { } | |
| 2376 | 61 |
| 62 octave_complex_matrix (const ComplexMatrix& m) | |
| 4513 | 63 : octave_base_matrix<ComplexNDArray> (m) { } |
| 2376 | 64 |
| 5785 | 65 octave_complex_matrix (const ComplexMatrix& m, const MatrixType& t) |
| 66 : octave_base_matrix<ComplexNDArray> (m, t) { } | |
| 67 | |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9685
diff
changeset
|
68 octave_complex_matrix (const Array<Complex>& m) |
| 4911 | 69 : octave_base_matrix<ComplexNDArray> (ComplexNDArray (m)) { } |
| 70 | |
| 2376 | 71 octave_complex_matrix (const ComplexDiagMatrix& d) |
| 4513 | 72 : octave_base_matrix<ComplexNDArray> (ComplexMatrix (d)) { } |
| 2376 | 73 |
| 3418 | 74 octave_complex_matrix (const ComplexRowVector& v) |
| 4513 | 75 : octave_base_matrix<ComplexNDArray> (ComplexMatrix (v)) { } |
| 2376 | 76 |
| 3418 | 77 octave_complex_matrix (const ComplexColumnVector& v) |
| 4513 | 78 : octave_base_matrix<ComplexNDArray> (ComplexMatrix (v)) { } |
| 2376 | 79 |
| 80 octave_complex_matrix (const octave_complex_matrix& cm) | |
| 4513 | 81 : octave_base_matrix<ComplexNDArray> (cm) { } |
| 2376 | 82 |
| 83 ~octave_complex_matrix (void) { } | |
| 84 | |
| 5759 | 85 octave_base_value *clone (void) const { return new octave_complex_matrix (*this); } |
| 86 octave_base_value *empty_clone (void) const { return new octave_complex_matrix (); } | |
| 2376 | 87 |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
88 type_conv_info numeric_demotion_function (void) const; |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
89 |
| 5759 | 90 octave_base_value *try_narrowing_conversion (void); |
| 2410 | 91 |
| 9685 | 92 builtin_type_t builtin_type (void) const { return btyp_complex; } |
| 93 | |
| 2376 | 94 bool is_complex_matrix (void) const { return true; } |
| 95 | |
| 96 bool is_complex_type (void) const { return true; } | |
| 97 | |
| 5895 | 98 bool is_double_type (void) const { return true; } |
| 99 | |
| 7576 | 100 bool is_float_type (void) const { return true; } |
| 101 | |
| 3145 | 102 double double_value (bool = false) const; |
| 2376 | 103 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
104 float float_value (bool = false) const; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
105 |
| 3145 | 106 double scalar_value (bool frc_str_conv = false) const |
| 107 { return double_value (frc_str_conv); } | |
| 2916 | 108 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
109 float float_scalar_value (bool frc_str_conv = false) const |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
110 { return float_value (frc_str_conv); } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
111 |
| 2376 | 112 Matrix matrix_value (bool = false) const; |
| 113 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
114 FloatMatrix float_matrix_value (bool = false) const; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
115 |
| 2376 | 116 Complex complex_value (bool = false) const; |
| 117 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
118 FloatComplex float_complex_value (bool = false) const; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
119 |
| 2376 | 120 ComplexMatrix complex_matrix_value (bool = false) const; |
| 121 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
122 FloatComplexMatrix float_complex_matrix_value (bool = false) const; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
123 |
| 4550 | 124 ComplexNDArray complex_array_value (bool = false) const { return matrix; } |
| 4543 | 125 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
126 FloatComplexNDArray float_complex_array_value (bool = false) const; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
127 |
|
9853
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
128 boolNDArray bool_array_value (bool warn = false) const; |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
129 |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
130 charNDArray char_array_value (bool frc_str_conv = false) const; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
131 |
| 5164 | 132 SparseMatrix sparse_matrix_value (bool = false) const; |
| 133 | |
| 134 SparseComplexMatrix sparse_complex_matrix_value (bool = false) const; | |
| 135 | |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
136 octave_value diag (octave_idx_type k = 0) const; |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
137 |
|
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
|
138 octave_value 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 |
| 3107 | 140 void increment (void) { matrix += Complex (1.0); } |
| 2376 | 141 |
| 3107 | 142 void decrement (void) { matrix -= Complex (1.0); } |
| 2376 | 143 |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
144 void changesign (void) { matrix.changesign (); } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
145 |
| 6974 | 146 bool save_ascii (std::ostream& os); |
| 4687 | 147 |
| 148 bool load_ascii (std::istream& is); | |
| 149 | |
| 150 bool save_binary (std::ostream& os, bool& save_as_floats); | |
| 151 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
152 bool load_binary (std::istream& is, bool swap, |
| 10313 | 153 oct_mach_info::float_format fmt); |
| 4687 | 154 |
| 155 #if defined (HAVE_HDF5) | |
| 156 bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); | |
| 157 | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9853
diff
changeset
|
158 bool load_hdf5 (hid_t loc_id, const char *name); |
| 4687 | 159 #endif |
| 160 | |
| 4944 | 161 int write (octave_stream& os, int block_size, |
| 10313 | 162 oct_data_conv::data_type output_type, int skip, |
| 163 oct_mach_info::float_format flt_fmt) const | |
| 4944 | 164 { |
| 165 // Yes, for compatibility, we drop the imaginary part here. | |
| 166 return os.write (matrix_value (true), block_size, output_type, | |
| 10313 | 167 skip, flt_fmt); |
| 4944 | 168 } |
| 169 | |
| 4643 | 170 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; |
| 171 | |
| 5900 | 172 mxArray *as_mxArray (void) const; |
| 173 | |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
174 octave_value map (unary_mapper_t umap) const; |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
175 |
| 2376 | 176 private: |
| 177 | |
| 3219 | 178 DECLARE_OCTAVE_ALLOCATOR |
| 2477 | 179 |
| 3219 | 180 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA |
| 2376 | 181 }; |
| 182 | |
| 183 #endif |