Mercurial > jwe > octave

comparison libinterp/octave-value/ov-flt-cx-mat.cc @ 21118:3ac9f47fb04b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Invert pattern if/code/else/err_XXX to if !/err_XXX/code. * daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, load-save.cc, lsode.cc, quad.cc, xnorm.cc, xpow.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-struct.cc, ov.cc, pt-idx.cc, Array-util.cc, Array.cc, Sparse.cc, lo-specfun.cc, mx-inlines.cc, oct-binmap.h: Invert pattern if/code/else/err_XXX to if !/err_XXX/code.
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 16:08:30 -0800
parents dfcb9d74b253
children 499b851fbfae
comparison
equal deleted inserted replaced
21117:c1df36373272 21118:3ac9f47fb04b
94 94
95 if (! force_conversion) 95 if (! force_conversion)
96 warn_implicit_conversion ("Octave:imag-to-real", 96 warn_implicit_conversion ("Octave:imag-to-real",
97 "complex matrix", "real scalar"); 97 "complex matrix", "real scalar");
98 98
99 if (rows () > 0 && columns () > 0) 99 if (rows () == 0 || columns () == 0)
100 {
101 warn_implicit_conversion ("Octave:array-to-scalar",
102 "complex matrix", "real scalar");
103
104 retval = std::real (matrix (0, 0));
105 }
106 else
107 err_invalid_conversion ("complex matrix", "real scalar"); 100 err_invalid_conversion ("complex matrix", "real scalar");
101
102 warn_implicit_conversion ("Octave:array-to-scalar",
103 "complex matrix", "real scalar");
104
105 retval = std::real (matrix(0, 0));
108 106
109 return retval; 107 return retval;
110 } 108 }
111 109
112 float 110 float
116 114
117 if (! force_conversion) 115 if (! force_conversion)
118 warn_implicit_conversion ("Octave:imag-to-real", 116 warn_implicit_conversion ("Octave:imag-to-real",
119 "complex matrix", "real scalar"); 117 "complex matrix", "real scalar");
120 118
121 if (rows () > 0 && columns () > 0) 119 if (rows () == 0 || columns () == 0)
122 {
123 warn_implicit_conversion ("Octave:array-to-scalar",
124 "complex matrix", "real scalar");
125
126 retval = std::real (matrix (0, 0));
127 }
128 else
129 err_invalid_conversion ("complex matrix", "real scalar"); 120 err_invalid_conversion ("complex matrix", "real scalar");
121
122 warn_implicit_conversion ("Octave:array-to-scalar",
123 "complex matrix", "real scalar");
124
125 retval = std::real (matrix(0, 0));
130 126
131 return retval; 127 return retval;
132 } 128 }
133 129
134 Matrix 130 Matrix
164 { 160 {
165 double tmp = lo_ieee_nan_value (); 161 double tmp = lo_ieee_nan_value ();
166 162
167 Complex retval (tmp, tmp); 163 Complex retval (tmp, tmp);
168 164
169 if (rows () > 0 && columns () > 0) 165 if (rows () == 0 || columns () == 0)
170 {
171 warn_implicit_conversion ("Octave:array-to-scalar",
172 "complex matrix", "complex scalar");
173
174 retval = matrix (0, 0);
175 }
176 else
177 err_invalid_conversion ("complex matrix", "complex scalar"); 166 err_invalid_conversion ("complex matrix", "complex scalar");
167
168 warn_implicit_conversion ("Octave:array-to-scalar",
169 "complex matrix", "complex scalar");
170
171 retval = matrix(0, 0);
178 172
179 return retval; 173 return retval;
180 } 174 }
181 175
182 FloatComplex 176 FloatComplex
184 { 178 {
185 float tmp = lo_ieee_float_nan_value (); 179 float tmp = lo_ieee_float_nan_value ();
186 180
187 FloatComplex retval (tmp, tmp); 181 FloatComplex retval (tmp, tmp);
188 182
189 if (rows () > 0 && columns () > 0) 183 if (rows () == 0 || columns () == 0)
190 {
191 warn_implicit_conversion ("Octave:array-to-scalar",
192 "complex matrix", "complex scalar");
193
194 retval = matrix (0, 0);
195 }
196 else
197 err_invalid_conversion ("complex matrix", "complex scalar"); 184 err_invalid_conversion ("complex matrix", "complex scalar");
185
186 warn_implicit_conversion ("Octave:array-to-scalar",
187 "complex matrix", "complex scalar");
188
189 retval = matrix(0, 0);
198 190
199 return retval; 191 return retval;
200 } 192 }
201 193
202 ComplexMatrix 194 ComplexMatrix