Mercurial > octave-nkf
comparison libinterp/corefcn/pinv.cc @ 20587:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.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-diag.cc, ov-flt-cx-mat.cc,
ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc,
ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 05 Oct 2015 19:29:36 -0400 |
parents | 4f45eaf83908 |
children |
comparison
equal
deleted
inserted
replaced
20586:b7ac1e94266e | 20587:f90c8372b7ba |
---|---|
81 { | 81 { |
82 float tol = 0.0; | 82 float tol = 0.0; |
83 if (nargin == 2) | 83 if (nargin == 2) |
84 tol = args(1).float_value (); | 84 tol = args(1).float_value (); |
85 | 85 |
86 if (error_state) | |
87 return retval; | |
88 | |
89 if (tol < 0.0) | 86 if (tol < 0.0) |
90 { | 87 { |
91 error ("pinv: TOL must be greater than zero"); | 88 error ("pinv: TOL must be greater than zero"); |
92 return retval; | 89 return retval; |
93 } | 90 } |
101 { | 98 { |
102 double tol = 0.0; | 99 double tol = 0.0; |
103 if (nargin == 2) | 100 if (nargin == 2) |
104 tol = args(1).double_value (); | 101 tol = args(1).double_value (); |
105 | 102 |
106 if (error_state) | |
107 return retval; | |
108 | |
109 if (tol < 0.0) | 103 if (tol < 0.0) |
110 { | 104 { |
111 error ("pinv: TOL must be greater than zero"); | 105 error ("pinv: TOL must be greater than zero"); |
112 return retval; | 106 return retval; |
113 } | 107 } |
126 { | 120 { |
127 float tol = 0.0; | 121 float tol = 0.0; |
128 if (nargin == 2) | 122 if (nargin == 2) |
129 tol = args(1).float_value (); | 123 tol = args(1).float_value (); |
130 | 124 |
131 if (error_state) | |
132 return retval; | |
133 | |
134 if (tol < 0.0) | 125 if (tol < 0.0) |
135 { | 126 { |
136 error ("pinv: TOL must be greater than zero"); | 127 error ("pinv: TOL must be greater than zero"); |
137 return retval; | 128 return retval; |
138 } | 129 } |
139 | 130 |
140 if (arg.is_real_type ()) | 131 if (arg.is_real_type ()) |
141 { | 132 { |
142 FloatMatrix m = arg.float_matrix_value (); | 133 FloatMatrix m = arg.float_matrix_value (); |
143 | 134 |
144 if (! error_state) | 135 retval = m.pseudo_inverse (tol); |
145 retval = m.pseudo_inverse (tol); | |
146 } | 136 } |
147 else if (arg.is_complex_type ()) | 137 else if (arg.is_complex_type ()) |
148 { | 138 { |
149 FloatComplexMatrix m = arg.float_complex_matrix_value (); | 139 FloatComplexMatrix m = arg.float_complex_matrix_value (); |
150 | 140 |
151 if (! error_state) | 141 retval = m.pseudo_inverse (tol); |
152 retval = m.pseudo_inverse (tol); | |
153 } | 142 } |
154 else | 143 else |
155 { | 144 gripe_wrong_type_arg ("pinv", arg); |
156 gripe_wrong_type_arg ("pinv", arg); | |
157 } | |
158 } | 145 } |
159 else | 146 else |
160 { | 147 { |
161 double tol = 0.0; | 148 double tol = 0.0; |
162 if (nargin == 2) | 149 if (nargin == 2) |
163 tol = args(1).double_value (); | 150 tol = args(1).double_value (); |
164 | 151 |
165 if (error_state) | |
166 return retval; | |
167 | |
168 if (tol < 0.0) | 152 if (tol < 0.0) |
169 { | 153 { |
170 error ("pinv: TOL must be greater than zero"); | 154 error ("pinv: TOL must be greater than zero"); |
171 return retval; | 155 return retval; |
172 } | 156 } |
173 | 157 |
174 if (arg.is_real_type ()) | 158 if (arg.is_real_type ()) |
175 { | 159 { |
176 Matrix m = arg.matrix_value (); | 160 Matrix m = arg.matrix_value (); |
177 | 161 |
178 if (! error_state) | 162 retval = m.pseudo_inverse (tol); |
179 retval = m.pseudo_inverse (tol); | |
180 } | 163 } |
181 else if (arg.is_complex_type ()) | 164 else if (arg.is_complex_type ()) |
182 { | 165 { |
183 ComplexMatrix m = arg.complex_matrix_value (); | 166 ComplexMatrix m = arg.complex_matrix_value (); |
184 | 167 |
185 if (! error_state) | 168 retval = m.pseudo_inverse (tol); |
186 retval = m.pseudo_inverse (tol); | |
187 } | 169 } |
188 else | 170 else |
189 { | 171 gripe_wrong_type_arg ("pinv", arg); |
190 gripe_wrong_type_arg ("pinv", arg); | |
191 } | |
192 } | 172 } |
193 | 173 |
194 return retval; | 174 return retval; |
195 } | 175 } |
196 | 176 |