Mercurial > octave-nkf

comparison liboctave/fDiagMatrix.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents fd0a3ac60b0e
children 72c96de7a403
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
182 octave_idx_type r = rows (); 182 octave_idx_type r = rows ();
183 octave_idx_type c = cols (); 183 octave_idx_type c = cols ();
184 if (i < 0 || i >= r) 184 if (i < 0 || i >= r)
185 { 185 {
186 (*current_liboctave_error_handler) ("invalid row selection"); 186 (*current_liboctave_error_handler) ("invalid row selection");
187 return FloatRowVector (); 187 return FloatRowVector ();
188 } 188 }
189 189
190 FloatRowVector retval (c, 0.0); 190 FloatRowVector retval (c, 0.0);
191 if (r <= c || (r > c && i < c)) 191 if (r <= c || (r > c && i < c))
192 retval.elem (i) = elem (i, i); 192 retval.elem (i) = elem (i, i);
198 FloatDiagMatrix::row (char *s) const 198 FloatDiagMatrix::row (char *s) const
199 { 199 {
200 if (! s) 200 if (! s)
201 { 201 {
202 (*current_liboctave_error_handler) ("invalid row selection"); 202 (*current_liboctave_error_handler) ("invalid row selection");
203 return FloatRowVector (); 203 return FloatRowVector ();
204 } 204 }
205 205
206 char c = *s; 206 char c = *s;
207 if (c == 'f' || c == 'F') 207 if (c == 'f' || c == 'F')
208 return row (static_cast<octave_idx_type>(0)); 208 return row (static_cast<octave_idx_type>(0));
209 else if (c == 'l' || c == 'L') 209 else if (c == 'l' || c == 'L')
210 return row (rows () - 1); 210 return row (rows () - 1);
211 else 211 else
212 { 212 {
213 (*current_liboctave_error_handler) ("invalid row selection"); 213 (*current_liboctave_error_handler) ("invalid row selection");
214 return FloatRowVector (); 214 return FloatRowVector ();
215 } 215 }
216 } 216 }
217 217
218 FloatColumnVector 218 FloatColumnVector
219 FloatDiagMatrix::column (octave_idx_type i) const 219 FloatDiagMatrix::column (octave_idx_type i) const
221 octave_idx_type r = rows (); 221 octave_idx_type r = rows ();
222 octave_idx_type c = cols (); 222 octave_idx_type c = cols ();
223 if (i < 0 || i >= c) 223 if (i < 0 || i >= c)
224 { 224 {
225 (*current_liboctave_error_handler) ("invalid column selection"); 225 (*current_liboctave_error_handler) ("invalid column selection");
226 return FloatColumnVector (); 226 return FloatColumnVector ();
227 } 227 }
228 228
229 FloatColumnVector retval (r, 0.0); 229 FloatColumnVector retval (r, 0.0);
230 if (r >= c || (r < c && i < r)) 230 if (r >= c || (r < c && i < r))
231 retval.elem (i) = elem (i, i); 231 retval.elem (i) = elem (i, i);
237 FloatDiagMatrix::column (char *s) const 237 FloatDiagMatrix::column (char *s) const
238 { 238 {
239 if (! s) 239 if (! s)
240 { 240 {
241 (*current_liboctave_error_handler) ("invalid column selection"); 241 (*current_liboctave_error_handler) ("invalid column selection");
242 return FloatColumnVector (); 242 return FloatColumnVector ();
243 } 243 }
244 244
245 char c = *s; 245 char c = *s;
246 if (c == 'f' || c == 'F') 246 if (c == 'f' || c == 'F')
247 return column (static_cast<octave_idx_type>(0)); 247 return column (static_cast<octave_idx_type>(0));
248 else if (c == 'l' || c == 'L') 248 else if (c == 'l' || c == 'L')
249 return column (cols () - 1); 249 return column (cols () - 1);
250 else 250 else
251 { 251 {
252 (*current_liboctave_error_handler) ("invalid column selection"); 252 (*current_liboctave_error_handler) ("invalid column selection");
253 return FloatColumnVector (); 253 return FloatColumnVector ();
254 } 254 }
255 } 255 }
256 256
257 FloatDiagMatrix 257 FloatDiagMatrix
258 FloatDiagMatrix::inverse (void) const 258 FloatDiagMatrix::inverse (void) const