Mercurial > octave
comparison libinterp/corefcn/sparse-xpow.cc @ 22327:d0562b3159c7
move more classes inside octave namespace
* ov-complex.cc, quit.h, lo-array-errwarn.h, lo-array-errwarn.cc,
lo-array-gripes.cc: Move classes inside octave namespace.
* NEWS, file-editor-tab.cc, Cell.cc, __qp__.cc, cellfun.cc, daspk.cc,
dasrt.cc, dassl.cc, data.cc, error.cc, error.h, errwarn.cc, errwarn.h,
file-io.cc, gcd.cc, graphics.cc, graphics.in.h, gripes.cc, gripes.h,
input.cc, interpreter.cc, interpreter.h, inv.cc, jit-typeinfo.cc,
load-path.cc, ls-mat-ascii.cc, ls-mat5.cc, lsode.cc, mex.cc,
oct-handle.h, oct-map.cc, oct-stream.cc, quad.cc, rand.cc,
sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, sub2ind.cc, toplev.cc,
utils.cc, variables.cc, xdiv.cc, xpow.cc, __eigs__.cc,
__init_gnuplot__.cc, ov-base-diag.cc, ov-base-mat.cc,
ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-class.cc,
ov-classdef.cc, ov-complex.h, ov-complex.cc, ov-cx-mat.cc,
ov-cx-sparse.cc, ov-fcn-handle.cc, ov-float.cc, ov-float.h,
ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc,
ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov.cc,
op-cs-cs.cc, op-fcs-fcs.cc, op-fs-fs.cc, op-int.h, op-s-s.cc, ops.h,
oct-parse.in.yy, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt.cc,
Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc,
MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc,
dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc,
fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc,
fNDArray.cc, fRowVector.cc, idx-vector.cc, quit.cc, quit.h,
gepbalance.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h,
Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, cmd-edit.cc,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc,
lo-array-gripes.h, oct-binmap.h: Update to use namespace.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 17 Aug 2016 03:41:42 -0400 |
| parents | bac0d6f07a3e |
| children | 34ce5be04942 |
comparison
equal
deleted
inserted
replaced
| 22326:71dd9d5a5ecd | 22327:d0562b3159c7 |
|---|---|
| 414 | 414 |
| 415 if (a.numel () == 1 && b.numel () > 1) | 415 if (a.numel () == 1 && b.numel () > 1) |
| 416 return scalar_xpow (a(0), b); | 416 return scalar_xpow (a(0), b); |
| 417 | 417 |
| 418 if (nr != b_nr || nc != b_nc) | 418 if (nr != b_nr || nc != b_nc) |
| 419 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); | 419 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); |
| 420 | 420 |
| 421 int convert_to_complex = 0; | 421 int convert_to_complex = 0; |
| 422 for (octave_idx_type j = 0; j < nc; j++) | 422 for (octave_idx_type j = 0; j < nc; j++) |
| 423 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) | 423 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) |
| 424 { | 424 { |
| 516 | 516 |
| 517 if (a.numel () == 1 && b.numel () > 1) | 517 if (a.numel () == 1 && b.numel () > 1) |
| 518 return scalar_xpow (a(0), b); | 518 return scalar_xpow (a(0), b); |
| 519 | 519 |
| 520 if (nr != b_nr || nc != b_nc) | 520 if (nr != b_nr || nc != b_nc) |
| 521 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); | 521 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); |
| 522 | 522 |
| 523 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); | 523 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); |
| 524 for (octave_idx_type j = 0; j < nc; j++) | 524 for (octave_idx_type j = 0; j < nc; j++) |
| 525 { | 525 { |
| 526 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) | 526 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) |
| 656 | 656 |
| 657 if (a.numel () == 1 && b.numel () > 1) | 657 if (a.numel () == 1 && b.numel () > 1) |
| 658 return scalar_xpow (a(0), b); | 658 return scalar_xpow (a(0), b); |
| 659 | 659 |
| 660 if (nr != b_nr || nc != b_nc) | 660 if (nr != b_nr || nc != b_nc) |
| 661 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); | 661 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); |
| 662 | 662 |
| 663 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); | 663 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); |
| 664 for (octave_idx_type j = 0; j < nc; j++) | 664 for (octave_idx_type j = 0; j < nc; j++) |
| 665 { | 665 { |
| 666 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) | 666 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) |
| 723 | 723 |
| 724 if (a.numel () == 1 && b.numel () > 1) | 724 if (a.numel () == 1 && b.numel () > 1) |
| 725 return scalar_xpow (a(0), b); | 725 return scalar_xpow (a(0), b); |
| 726 | 726 |
| 727 if (nr != b_nr || nc != b_nc) | 727 if (nr != b_nr || nc != b_nc) |
| 728 err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); | 728 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc); |
| 729 | 729 |
| 730 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); | 730 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0)); |
| 731 for (octave_idx_type j = 0; j < nc; j++) | 731 for (octave_idx_type j = 0; j < nc; j++) |
| 732 { | 732 { |
| 733 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) | 733 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) |