Mercurial > octave
comparison liboctave/array/fMatrix.cc @ 29569:29a1f8fd8ee6
move idx_vector classes inside octave namespace
* idx-vector.h, idx-vector.cc:
Move idx_vector classes inside octave namespace. Update all uses
outside of octave namespace to use octave:: tag.
* Sparse.h: Eliminate forward declaration of idx_vector.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 28 Apr 2021 13:46:02 -0400 |
| parents | 7854d5752dd2 |
| children | aef11bb4e6d1 |
comparison
equal
deleted
inserted
replaced
| 29568:a7cbd0e54e7a | 29569:29a1f8fd8ee6 |
|---|---|
| 404 octave_idx_type r2, octave_idx_type c2) const | 404 octave_idx_type r2, octave_idx_type c2) const |
| 405 { | 405 { |
| 406 if (r1 > r2) { std::swap (r1, r2); } | 406 if (r1 > r2) { std::swap (r1, r2); } |
| 407 if (c1 > c2) { std::swap (c1, c2); } | 407 if (c1 > c2) { std::swap (c1, c2); } |
| 408 | 408 |
| 409 return index (idx_vector (r1, r2+1), idx_vector (c1, c2+1)); | 409 return index (octave::idx_vector (r1, r2+1), octave::idx_vector (c1, c2+1)); |
| 410 } | 410 } |
| 411 | 411 |
| 412 FloatMatrix | 412 FloatMatrix |
| 413 FloatMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, | 413 FloatMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, |
| 414 octave_idx_type nr, octave_idx_type nc) const | 414 octave_idx_type nr, octave_idx_type nc) const |
| 415 { | 415 { |
| 416 return index (idx_vector (r1, r1 + nr), idx_vector (c1, c1 + nc)); | 416 return index (octave::idx_vector (r1, r1 + nr), octave::idx_vector (c1, c1 + nc)); |
| 417 } | 417 } |
| 418 | 418 |
| 419 // extract row or column i. | 419 // extract row or column i. |
| 420 | 420 |
| 421 FloatRowVector | 421 FloatRowVector |
| 422 FloatMatrix::row (octave_idx_type i) const | 422 FloatMatrix::row (octave_idx_type i) const |
| 423 { | 423 { |
| 424 return index (idx_vector (i), idx_vector::colon); | 424 return index (octave::idx_vector (i), octave::idx_vector::colon); |
| 425 } | 425 } |
| 426 | 426 |
| 427 FloatColumnVector | 427 FloatColumnVector |
| 428 FloatMatrix::column (octave_idx_type i) const | 428 FloatMatrix::column (octave_idx_type i) const |
| 429 { | 429 { |
| 430 return index (idx_vector::colon, idx_vector (i)); | 430 return index (octave::idx_vector::colon, octave::idx_vector (i)); |
| 431 } | 431 } |
| 432 | 432 |
| 433 // Local function to calculate the 1-norm. | 433 // Local function to calculate the 1-norm. |
| 434 static | 434 static |
| 435 float | 435 float |