Mercurial > octave-nkf
comparison liboctave/array/fMatrix.cc @ 18083:938f01339043
maint: Use Octave coding convention for indexing vs. function calls in liboctave/array.
* CMatrix.cc, CSparse.cc, Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc,
fMatrix.cc, idx-vector.cc: Use Octave coding convention for indexing vs.
function calls in liboctave/array.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 04 Dec 2013 18:56:47 -0800 |
| parents | 49a5a4be04a1 |
| children | 8e056300994b |
comparison
equal
deleted
inserted
replaced
| 18080:35464baa7d99 | 18083:938f01339043 |
|---|---|
| 3306 | 3306 |
| 3307 for (octave_idx_type j = 0; j < nc; j++) | 3307 for (octave_idx_type j = 0; j < nc; j++) |
| 3308 for (octave_idx_type i = 0; i < nr; i++) | 3308 for (octave_idx_type i = 0; i < nr; i++) |
| 3309 { | 3309 { |
| 3310 octave_quit (); | 3310 octave_quit (); |
| 3311 result (i, j) = xmin (d, m (i, j)); | 3311 result(i, j) = xmin (d, m(i, j)); |
| 3312 } | 3312 } |
| 3313 | 3313 |
| 3314 return result; | 3314 return result; |
| 3315 } | 3315 } |
| 3316 | 3316 |
| 3326 | 3326 |
| 3327 for (octave_idx_type j = 0; j < nc; j++) | 3327 for (octave_idx_type j = 0; j < nc; j++) |
| 3328 for (octave_idx_type i = 0; i < nr; i++) | 3328 for (octave_idx_type i = 0; i < nr; i++) |
| 3329 { | 3329 { |
| 3330 octave_quit (); | 3330 octave_quit (); |
| 3331 result (i, j) = xmin (m (i, j), d); | 3331 result(i, j) = xmin (m(i, j), d); |
| 3332 } | 3332 } |
| 3333 | 3333 |
| 3334 return result; | 3334 return result; |
| 3335 } | 3335 } |
| 3336 | 3336 |
| 3353 | 3353 |
| 3354 for (octave_idx_type j = 0; j < nc; j++) | 3354 for (octave_idx_type j = 0; j < nc; j++) |
| 3355 for (octave_idx_type i = 0; i < nr; i++) | 3355 for (octave_idx_type i = 0; i < nr; i++) |
| 3356 { | 3356 { |
| 3357 octave_quit (); | 3357 octave_quit (); |
| 3358 result (i, j) = xmin (a (i, j), b (i, j)); | 3358 result(i, j) = xmin (a(i, j), b(i, j)); |
| 3359 } | 3359 } |
| 3360 | 3360 |
| 3361 return result; | 3361 return result; |
| 3362 } | 3362 } |
| 3363 | 3363 |
| 3373 | 3373 |
| 3374 for (octave_idx_type j = 0; j < nc; j++) | 3374 for (octave_idx_type j = 0; j < nc; j++) |
| 3375 for (octave_idx_type i = 0; i < nr; i++) | 3375 for (octave_idx_type i = 0; i < nr; i++) |
| 3376 { | 3376 { |
| 3377 octave_quit (); | 3377 octave_quit (); |
| 3378 result (i, j) = xmax (d, m (i, j)); | 3378 result(i, j) = xmax (d, m(i, j)); |
| 3379 } | 3379 } |
| 3380 | 3380 |
| 3381 return result; | 3381 return result; |
| 3382 } | 3382 } |
| 3383 | 3383 |
| 3393 | 3393 |
| 3394 for (octave_idx_type j = 0; j < nc; j++) | 3394 for (octave_idx_type j = 0; j < nc; j++) |
| 3395 for (octave_idx_type i = 0; i < nr; i++) | 3395 for (octave_idx_type i = 0; i < nr; i++) |
| 3396 { | 3396 { |
| 3397 octave_quit (); | 3397 octave_quit (); |
| 3398 result (i, j) = xmax (m (i, j), d); | 3398 result(i, j) = xmax (m(i, j), d); |
| 3399 } | 3399 } |
| 3400 | 3400 |
| 3401 return result; | 3401 return result; |
| 3402 } | 3402 } |
| 3403 | 3403 |
| 3420 | 3420 |
| 3421 for (octave_idx_type j = 0; j < nc; j++) | 3421 for (octave_idx_type j = 0; j < nc; j++) |
| 3422 for (octave_idx_type i = 0; i < nr; i++) | 3422 for (octave_idx_type i = 0; i < nr; i++) |
| 3423 { | 3423 { |
| 3424 octave_quit (); | 3424 octave_quit (); |
| 3425 result (i, j) = xmax (a (i, j), b (i, j)); | 3425 result(i, j) = xmax (a(i, j), b(i, j)); |
| 3426 } | 3426 } |
| 3427 | 3427 |
| 3428 return result; | 3428 return result; |
| 3429 } | 3429 } |
| 3430 | 3430 |