octave: libinterp/corefcn/sparse-xpow.cc annotate

annotate libinterp/corefcn/sparse-xpow.cc @ 31234:a1318deb4584

sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) sparse-xpow.cc: Return 0x0 matrix for empty inputs of all sizes. Return early for all-zeros matrix with positive power. Add FIXME for all-zeros matrix with negative power. Add BISTs.

author	Arun Giridhar <arungiridhar@gmail.com>
date	Tue, 20 Sep 2022 09:00:02 -0400
parents	a026fb2be108
children	b542b88ad3b6

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30390 diff changeset	3 // Copyright (C) 1998-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	27 # include "config.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	28 #endif
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	29
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	30 #include <cassert>
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	31
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	32 #include <limits>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	33
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	34 #include "Array-util.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	35 #include "oct-cmplx.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	36 #include "quit.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	37
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	38 #include "error.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	39 #include "ovl.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	40 #include "utils.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	41
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	42 #include "dSparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	43 #include "CSparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	44 #include "ov-re-sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	45 #include "ov-cx-sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	46 #include "sparse-xpow.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	47
29990 b839c36fd106 move sparse xdiv and xpow operator functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	48 OCTAVE_NAMESPACE_BEGIN
b839c36fd106 move sparse xdiv and xpow operator functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	49
31226 44cf6bbeeca9 sparse-xpow.cc: Change return type from int to bool for internal function Arun Giridhar <arungiridhar@gmail.com> parents: 31225 diff changeset	50 static inline bool
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	51 xisint (double x)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	52 {
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	53 return (octave::math::x_nint (x) == x
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	54 && ((x >= 0 && x < std::numeric_limits<int>::max ())
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	55 \|\| (x <= 0 && x > std::numeric_limits<int>::min ())));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	56 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	57
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	58 // Safer pow functions. Only two make sense for sparse matrices, the
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	59 // others should all promote to full matrices.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	60
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	61 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	62 xpow (const SparseMatrix& a, double b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	63 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	64 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	65
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	66 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	67 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	68
31234 a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	69 if (nr == 0 \|\| nc == 0)
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	70 return SparseMatrix();
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	71
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	72 // If we are here, A is not empty ==> A needs to be square.
31231 a026fb2be108 sparse-xpow.cc: Return empty matrix for empty input (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31227 diff changeset	73 if (nr != nc)
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	74 error ("for A^b, A must be a square matrix. Use .^ for elementwise power.");
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	75
28144 c31c9eaa1f28 sparse-xpow.cc: use xisint instead of static_cast<int> to check int values John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	76 if (! xisint (b))
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	77 error ("use full(a) ^ full(b)");
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	78
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	79 int btmp = static_cast<int> (b);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	80 if (btmp == 0)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	81 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	82 SparseMatrix tmp = SparseMatrix (nr, nr, nr);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	83 for (octave_idx_type i = 0; i < nr; i++)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	84 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	85 tmp.data (i) = 1.0;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	86 tmp.ridx (i) = i;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	87 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	88 for (octave_idx_type i = 0; i < nr + 1; i++)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	89 tmp.cidx (i) = i;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	90
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	91 retval = tmp;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	92 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	93 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	94 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	95 SparseMatrix atmp;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	96 if (btmp < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	97 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	98 btmp = -btmp;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	99
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	100 octave_idx_type info;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	101 double rcond = 0.0;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	102 MatrixType mattyp (a);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	103
31234 a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	104 // FIXME: This causes an error if the input sparse matrix is all-zeros.
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	105 // That behavior is inconsistent with A ^ b when A is a full all-zeros
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	106 // matrix, which just returns Inf of the same size with a warning.
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	107 atmp = a.inverse (mattyp, info, rcond, 1);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	108
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	109 if (info == -1)
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	110 warning ("inverse: matrix singular to machine precision, rcond = %g", rcond);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	111 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	112 else
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	113 atmp = a;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	114
31234 a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	115 if (atmp.nnz() == 0) // Fast return for all-zeros matrix
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	116 return atmp;
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	117
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	118 SparseMatrix result (atmp);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	119
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	120 btmp--;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	121
31224 45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	122 // There are two approaches to the actual exponentiation.
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	123 // Exponentiation by squaring uses only a logarithmic number
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	124 // of multiplications but the matrices it multiplies tend to be dense
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	125 // towards the end.
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	126 // Linear multiplication uses a linear number of multiplications
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	127 // but one of the matrices it uses will be as sparse as the original matrix.
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	128 //
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	129 // The time to multiply fixed-size matrices is strongly affected by their
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	130 // sparsity. Denser matrices take much longer to multiply together.
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	131 // See this URL for a worked-through example:
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	132 // https://octave.discourse.group/t/3216/4
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	133 //
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	134 // The tradeoff is between many fast multiplications or a few slow ones.
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	135 //
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	136 // Large exponents favor the squaring technique, and sparse matrices favor
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	137 // linear multiplication.
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	138 //
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	139 // We calculate a threshold based on the sparsity of the input
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	140 // and use squaring for exponents larger than that.
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	141 //
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	142 // FIXME: Improve this threshold calculation.
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	143
31224 45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	144 uint64_t sparsity = atmp.numel() / atmp.nnz(); // reciprocal of density
31227 0dec459a4064 sparse-xpow.cc: Performance tweak for threshold selection Arun Giridhar <arungiridhar@gmail.com> parents: 31226 diff changeset	145 int threshold = (sparsity >= 1000) ? 40
0dec459a4064 sparse-xpow.cc: Performance tweak for threshold selection Arun Giridhar <arungiridhar@gmail.com> parents: 31226 diff changeset	146 : (sparsity >= 100) ? 20
31224 45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	147 : 3;
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	148
31224 45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	149 if (btmp > threshold) // use squaring technique
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	150 {
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	151 while (btmp > 0)
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	152 {
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	153 if (btmp & 1)
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	154 result = result * atmp;
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	155
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	156 btmp >>= 1;
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	157
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	158 if (btmp > 0)
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	159 atmp = atmp * atmp;
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	160 }
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	161 }
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	162 else // use linear multiplication
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	163 {
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	164 for (int i = 0; i < btmp; i++)
45984c799215 sparse-xpow.cc: Use faster multiplication technique based on input matrix sparsity Arun Giridhar <arungiridhar@gmail.com> parents: 30564 diff changeset	165 result = result * atmp;
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	166 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	167
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	168 retval = result;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	169 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	170
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	171 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	172 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	173
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	174 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	175 xpow (const SparseComplexMatrix& a, double b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	176 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	177 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	178
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	179 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	180 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	181
31234 a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	182 if (nr == 0 \|\| nc == 0)
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	183 return SparseMatrix();
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	184
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	185 // If we are here, A is not empty ==> A needs to be square.
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	186 if (nr != nc)
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	187 error ("for A^b, A must be a square matrix. Use .^ for elementwise power.");
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	188
28144 c31c9eaa1f28 sparse-xpow.cc: use xisint instead of static_cast<int> to check int values John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	189 if (! xisint (b))
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	190 error ("use full(a) ^ full(b)");
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	191
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	192 int btmp = static_cast<int> (b);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	193 if (btmp == 0)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	194 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	195 SparseMatrix tmp = SparseMatrix (nr, nr, nr);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	196 for (octave_idx_type i = 0; i < nr; i++)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	197 {
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	198 tmp.data (i) = 1.0;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	199 tmp.ridx (i) = i;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	200 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	201 for (octave_idx_type i = 0; i < nr + 1; i++)
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	202 tmp.cidx (i) = i;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	203
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	204 retval = tmp;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	205 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	206 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	207 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	208 SparseComplexMatrix atmp;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	209 if (btmp < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	210 {
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	211 btmp = -btmp;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	212
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	213 octave_idx_type info;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	214 double rcond = 0.0;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	215 MatrixType mattyp (a);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	216
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	217 atmp = a.inverse (mattyp, info, rcond, 1);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	218
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	219 if (info == -1)
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	220 warning ("inverse: matrix singular to machine precision, rcond = %g", rcond);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	221 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	222 else
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	223 atmp = a;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	224
31234 a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	225 if (atmp.nnz() == 0) // Fast return for all-zeros matrix
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	226 return atmp;
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	227
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	228 SparseComplexMatrix result (atmp);
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	229
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	230 btmp--;
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	231
31225 3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	232 // Select multiplication sequence based on sparsity of atmp.
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	233 // See the long comment in xpow (const SparseMatrix& a, double b)
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	234 // for more details.
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	235 //
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	236 // FIXME: Improve this threshold calculation.
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	237
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	238 uint64_t sparsity = atmp.numel() / atmp.nnz(); // reciprocal of density
31227 0dec459a4064 sparse-xpow.cc: Performance tweak for threshold selection Arun Giridhar <arungiridhar@gmail.com> parents: 31226 diff changeset	239 int threshold = (sparsity >= 1000) ? 40
0dec459a4064 sparse-xpow.cc: Performance tweak for threshold selection Arun Giridhar <arungiridhar@gmail.com> parents: 31226 diff changeset	240 : (sparsity >= 100) ? 20
31225 3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	241 : 3;
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	242
31225 3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	243 if (btmp > threshold) // use squaring technique
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	244 {
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	245 while (btmp > 0)
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	246 {
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	247 if (btmp & 1)
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	248 result = result * atmp;
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	249
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	250 btmp >>= 1;
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	251
31225 3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	252 if (btmp > 0)
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	253 atmp = atmp * atmp;
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	254 }
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	255 }
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	256 else // use linear multiplication
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	257 {
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	258 for (int i = 0; i < btmp; i++)
3eab70385569 sparse-xpow.cc: Use faster multiplication technique, this time for complex Arun Giridhar <arungiridhar@gmail.com> parents: 31224 diff changeset	259 result = result * atmp;
20982 d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	260 }
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	261
d27f66b4b8e6 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	262 retval = result;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	263 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	264
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	265 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	266 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	267
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	268 // Safer pow functions that work elementwise for matrices.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	269 //
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	270 // op2 \ op1: s m cs cm
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	271 // +-- +---+---+----+----+
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	272 // scalar \| \| * \| 3 \| * \| 9 \|
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	273 // +---+---+----+----+
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	274 // matrix \| 1 \| 4 \| 7 \| 10 \|
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	275 // +---+---+----+----+
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	276 // complex_scalar \| * \| 5 \| * \| 11 \|
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	277 // +---+---+----+----+
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	278 // complex_matrix \| 2 \| 6 \| 8 \| 12 \|
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	279 // +---+---+----+----+
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	280 //
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	281 // * -> not needed.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	282
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17749 diff changeset	283 // FIXME: these functions need to be fixed so that things
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	284 // like
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	285 //
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	286 // a = -1; b = [ 0, 0.5, 1 ]; r = a .^ b
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	287 //
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	288 // and
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	289 //
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	290 // a = -1; b = [ 0, 0.5, 1 ]; for i = 1:3, r(i) = a .^ b(i), end
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	291 //
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	292 // produce identical results. Also, it would be nice if -1^0.5
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	293 // produced a pure imaginary result instead of a complex number with a
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	294 // small real part. But perhaps that's really a problem with the math
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	295 // library...
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	296
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	297 // Handle special case of scalar-sparse-matrix .^ sparse-matrix.
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	298 // Forwarding to the scalar elem_xpow function and then converting the
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	299 // result back to a sparse matrix is a bit wasteful but it does not
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	300 // seem worth the effort to optimize -- how often does this case come up
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	301 // in practice?
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	302
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21121 diff changeset	303 template <typename S, typename SM>
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	304 inline octave_value
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	305 scalar_xpow (const S& a, const SM& b)
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	306 {
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	307 octave_value val = elem_xpow (a, b);
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	308
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23220 diff changeset	309 if (val.iscomplex ())
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	310 return SparseComplexMatrix (val.complex_matrix_value ());
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	311 else
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	312 return SparseMatrix (val.matrix_value ());
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	313 }
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	314
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	315 /*
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	316 %!assert (sparse (2) .^ [3, 4], sparse ([8, 16]))
22470 9d4cb0cf9cd2 maint: tag xtests and tests that fail on some systems with bug numbers Mike Miller <mtmiller@octave.org> parents: 22407 diff changeset	317 %!assert <47775> (sparse (2i) .^ [3, 4], sparse ([-0-8i, 16]))
31234 a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	318
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	319 %!test <*63080>
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	320 %! Z = sparse ([]);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	321 %! A = sparse (zeros (0, 2));
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	322 %! B = sparse (zeros (2, 0));
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	323 %! assert (Z ^ 1, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	324 %! assert (Z ^ 0, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	325 %! assert (Z ^ -1, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	326 %! assert (A ^ 1, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	327 %! assert (A ^ 0, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	328 %! assert (A ^ -1, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	329 %! assert (B ^ 1, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	330 %! assert (B ^ 0, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	331 %! assert (B ^ -1, Z);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	332
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	333 %!test <*63080>
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	334 %! A = sparse (zeros (2, 2));
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	335 %! assert (A ^ 1, A);
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	336 %! assert (A ^ 0, sparse (eye (2, 2)));
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	337
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	338 %!test <63080>
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	339 %! A = sparse (zeros (2, 2));
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	340 %! assert (A ^ -1, sparse (inf (2, 2)));
a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	341
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	342 */
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	343
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	344 // -- 1 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	345 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	346 elem_xpow (double a, const SparseMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	347 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	348 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	349
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	350 octave_idx_type nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	351 octave_idx_type nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	352
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	353 double d1, d2;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	354
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	355 if (a < 0.0 && ! b.all_integers (d1, d2))
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	356 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	357 Complex atmp (a);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	358 ComplexMatrix result (nr, nc);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	359
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	360 for (octave_idx_type j = 0; j < nc; j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	361 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	362 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	363 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	364 octave_quit ();
30390 a61e1a0f6024 maint: style check C++ files in libinterp/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29990 diff changeset	365 result(i, j) = std::pow (atmp, b(i, j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	366 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	367 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	368
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	369 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	370 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	371 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	372 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	373 Matrix result (nr, nc);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	374
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	375 for (octave_idx_type j = 0; j < nc; j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	376 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	377 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	378 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	379 octave_quit ();
30390 a61e1a0f6024 maint: style check C++ files in libinterp/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29990 diff changeset	380 result(i, j) = std::pow (a, b(i, j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	381 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	382 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	383
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	384 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	385 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	386
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	387 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	388 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	389
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	390 // -- 2 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	391 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	392 elem_xpow (double a, const SparseComplexMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	393 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	394 octave_idx_type nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	395 octave_idx_type nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	396
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	397 Complex atmp (a);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	398 ComplexMatrix result (nr, nc);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	399
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	400 for (octave_idx_type j = 0; j < nc; j++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	401 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	402 for (octave_idx_type i = 0; i < nr; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	403 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	404 octave_quit ();
30390 a61e1a0f6024 maint: style check C++ files in libinterp/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29990 diff changeset	405 result(i, j) = std::pow (atmp, b(i, j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	406 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	407 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	408
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	409 return result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	410 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	411
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	412 // -- 3 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	413 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	414 elem_xpow (const SparseMatrix& a, double b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	415 {
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17787 diff changeset	416 // FIXME: What should a .^ 0 give? Matlab gives a
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	417 // sparse matrix with same structure as a, which is strictly
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	418 // incorrect. Keep compatibility.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	419
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	420 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	421
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10315 diff changeset	422 octave_idx_type nz = a.nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	423
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	424 if (b <= 0.0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	425 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	426 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	427 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	428
28144 c31c9eaa1f28 sparse-xpow.cc: use xisint instead of static_cast<int> to check int values John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	429 if (! xisint (b) && a.any_element_is_negative ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	430 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	431 ComplexMatrix result (nr, nc, Complex (std::pow (0.0, b)));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	432
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17749 diff changeset	433 // FIXME: avoid apparent GNU libm bug by
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	434 // converting A and B to complex instead of just A.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	435 Complex btmp (b);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	436
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	437 for (octave_idx_type j = 0; j < nc; j++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	438 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	439 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	440 octave_quit ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	441
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	442 Complex atmp (a.data (i));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	443
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	444 result(a.ridx (i), j) = std::pow (atmp, btmp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	445 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	446
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	447 retval = octave_value (result);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	448 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	449 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	450 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	451 Matrix result (nr, nc, (std::pow (0.0, b)));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	452
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	453 for (octave_idx_type j = 0; j < nc; j++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	454 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	455 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	456 octave_quit ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	457 result(a.ridx (i), j) = std::pow (a.data (i), b);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	458 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	459
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	460 retval = octave_value (result);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	461 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	462 }
28144 c31c9eaa1f28 sparse-xpow.cc: use xisint instead of static_cast<int> to check int values John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	463 else if (! xisint (b) && a.any_element_is_negative ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	464 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	465 SparseComplexMatrix result (a);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	466
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	467 for (octave_idx_type i = 0; i < nz; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	468 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	469 octave_quit ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	470
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17749 diff changeset	471 // FIXME: avoid apparent GNU libm bug by
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	472 // converting A and B to complex instead of just A.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	473
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	474 Complex atmp (a.data (i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	475 Complex btmp (b);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	476
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	477 result.data (i) = std::pow (atmp, btmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	478 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	479
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	480 result.maybe_compress (true);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	481
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	482 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	483 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	484 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	485 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	486 SparseMatrix result (a);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	487
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	488 for (octave_idx_type i = 0; i < nz; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	489 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	490 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	491 result.data (i) = std::pow (a.data (i), b);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	492 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	493
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	494 result.maybe_compress (true);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	495
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	496 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	497 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	498
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	499 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	500 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	501
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	502 // -- 4 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	503 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	504 elem_xpow (const SparseMatrix& a, const SparseMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	505 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	506 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	507
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	508 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	509 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	510
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	511 octave_idx_type b_nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	512 octave_idx_type b_nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	513
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	514 if (a.numel () == 1 && b.numel () > 1)
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	515 return scalar_xpow (a(0), b);
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	516
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	517 if (nr != b_nr \|\| nc != b_nc)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	518 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	519
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	520 int convert_to_complex = 0;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	521 for (octave_idx_type j = 0; j < nc; j++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	522 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	523 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	524 if (a.data(i) < 0.0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	525 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	526 double btmp = b (a.ridx (i), j);
28144 c31c9eaa1f28 sparse-xpow.cc: use xisint instead of static_cast<int> to check int values John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	527 if (! xisint (btmp))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	528 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	529 convert_to_complex = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	530 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	531 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	532 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	533 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	534
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	535 done:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	536
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	537 // This is a dumb operator for sparse matrices anyway, and there is
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	538 // no sensible way to handle the 0.^0 versus the 0.^x cases. Therefore
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	539 // allocate a full matrix filled for the 0.^0 case and shrink it later
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	540 // as needed.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	541
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	542 if (convert_to_complex)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	543 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	544 SparseComplexMatrix complex_result (nr, nc, Complex (1.0, 0.0));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	545
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	546 for (octave_idx_type j = 0; j < nc; j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	547 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	548 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	549 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	550 octave_quit ();
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	551 complex_result.xelem (a.ridx (i), j)
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	552 = std::pow (Complex (a.data (i)), Complex (b(a.ridx (i), j)));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	553 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	554 }
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	555 complex_result.maybe_compress (true);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	556 retval = complex_result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	557 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	558 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	559 {
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	560 SparseMatrix result (nr, nc, 1.0);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	561
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	562 for (octave_idx_type j = 0; j < nc; j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	563 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	564 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	565 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	566 octave_quit ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	567 result.xelem (a.ridx (i), j) = std::pow (a.data (i),
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	568 b(a.ridx (i), j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	569 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	570 }
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	571 result.maybe_compress (true);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	572 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	573 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	574
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	575 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	576 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	577
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	578 // -- 5 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	579 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	580 elem_xpow (const SparseMatrix& a, const Complex& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	581 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	582 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	583
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	584 if (b == 0.0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	585 // Can this case ever happen, due to automatic retyping with maybe_mutate?
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	586 retval = octave_value (NDArray (a.dims (), 1));
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	587 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	588 {
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10315 diff changeset	589 octave_idx_type nz = a.nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	590 SparseComplexMatrix result (a);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	591
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	592 for (octave_idx_type i = 0; i < nz; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	593 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	594 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	595 result.data (i) = std::pow (Complex (a.data (i)), b);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	596 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	597
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	598 result.maybe_compress (true);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	599
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	600 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	601 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	602
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	603 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	604 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	605
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	606 // -- 6 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	607 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	608 elem_xpow (const SparseMatrix& a, const SparseComplexMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	609 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	610 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	611 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	612
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	613 octave_idx_type b_nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	614 octave_idx_type b_nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	615
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	616 if (a.numel () == 1 && b.numel () > 1)
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	617 return scalar_xpow (a(0), b);
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	618
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	619 if (nr != b_nr \|\| nc != b_nc)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	620 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	621
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	622 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0));
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	623 for (octave_idx_type j = 0; j < nc; j++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	624 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	625 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	626 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	627 octave_quit ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	628 result.xelem (a.ridx(i), j) = std::pow (a.data (i), b(a.ridx (i), j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	629 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	630 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	631
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	632 result.maybe_compress (true);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	633
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	634 return result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	635 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	636
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	637 // -- 7 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	638 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	639 elem_xpow (const Complex& a, const SparseMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	640 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	641 octave_idx_type nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	642 octave_idx_type nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	643
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	644 ComplexMatrix result (nr, nc);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	645
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	646 for (octave_idx_type j = 0; j < nc; j++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	647 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	648 for (octave_idx_type i = 0; i < nr; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	649 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	650 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	651 double btmp = b (i, j);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	652 if (xisint (btmp))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	653 result (i, j) = std::pow (a, static_cast<int> (btmp));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	654 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	655 result (i, j) = std::pow (a, btmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	656 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	657 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	658
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	659 return result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	660 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	661
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	662 // -- 8 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	663 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	664 elem_xpow (const Complex& a, const SparseComplexMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	665 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	666 octave_idx_type nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	667 octave_idx_type nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	668
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	669 ComplexMatrix result (nr, nc);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	670 for (octave_idx_type j = 0; j < nc; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	671 for (octave_idx_type i = 0; i < nr; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	672 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	673 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	674 result (i, j) = std::pow (a, b (i, j));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	675 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	676
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	677 return result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	678 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	679
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	680 // -- 9 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	681 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	682 elem_xpow (const SparseComplexMatrix& a, double b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	683 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	684 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	685
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	686 if (b <= 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	687 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	688 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	689 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	690
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	691 ComplexMatrix result (nr, nc, Complex (std::pow (0.0, b)));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	692
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	693 if (xisint (b))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	694 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	695 for (octave_idx_type j = 0; j < nc; j++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	696 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	697 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	698 octave_quit ();
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	699 result (a.ridx (i), j)
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	700 = std::pow (a.data (i), static_cast<int> (b));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	701 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	702 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	703 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	704 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	705 for (octave_idx_type j = 0; j < nc; j++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	706 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	707 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	708 octave_quit ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	709 result (a.ridx (i), j) = std::pow (a.data (i), b);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	710 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	711 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	712
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	713 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	714 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	715 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	716 {
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10315 diff changeset	717 octave_idx_type nz = a.nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	718
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	719 SparseComplexMatrix result (a);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	720
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	721 if (xisint (b))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	722 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	723 for (octave_idx_type i = 0; i < nz; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	724 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	725 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	726 result.data (i) = std::pow (a.data (i), static_cast<int> (b));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	727 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	728 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	729 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	730 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	731 for (octave_idx_type i = 0; i < nz; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	732 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	733 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	734 result.data (i) = std::pow (a.data (i), b);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	735 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	736 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	737
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	738 result.maybe_compress (true);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	739
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	740 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	741 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	742
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	743 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	744 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	745
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	746 // -- 10 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	747 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	748 elem_xpow (const SparseComplexMatrix& a, const SparseMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	749 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	750 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	751 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	752
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	753 octave_idx_type b_nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	754 octave_idx_type b_nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	755
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	756 if (a.numel () == 1 && b.numel () > 1)
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	757 return scalar_xpow (a(0), b);
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	758
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	759 if (nr != b_nr \|\| nc != b_nc)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	760 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	761
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	762 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0));
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	763 for (octave_idx_type j = 0; j < nc; j++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	764 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	765 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	766 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	767 octave_quit ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	768 double btmp = b(a.ridx (i), j);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	769
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	770 if (xisint (btmp))
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	771 result.xelem (a.ridx (i), j) = std::pow (a.data (i),
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	772 static_cast<int> (btmp));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	773 else
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	774 result.xelem (a.ridx (i), j) = std::pow (a.data (i), btmp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	775 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	776 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	777
5953 164214586706 [project @ 2006-08-22 15:31:32 by jwe] jwe parents: 5785 diff changeset	778 result.maybe_compress (true);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	779
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	780 return result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	781 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	782
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	783 // -- 11 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	784 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	785 elem_xpow (const SparseComplexMatrix& a, const Complex& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	786 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	787 octave_value retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	788
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	789 if (b == 0.0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	790 // Can this case ever happen, due to automatic retyping with maybe_mutate?
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	791 retval = octave_value (NDArray (a.dims (), 1));
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	792 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	793 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	794
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10315 diff changeset	795 octave_idx_type nz = a.nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	796
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	797 SparseComplexMatrix result (a);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	798
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	799 for (octave_idx_type i = 0; i < nz; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	800 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	801 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	802 result.data (i) = std::pow (a.data (i), b);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	803 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	804
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	805 result.maybe_compress (true);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	806
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	807 retval = result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	808 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	809
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	810 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	811 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	812
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	813 // -- 12 --
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	814 octave_value
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	815 elem_xpow (const SparseComplexMatrix& a, const SparseComplexMatrix& b)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	816 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	817 octave_idx_type nr = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	818 octave_idx_type nc = a.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	819
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	820 octave_idx_type b_nr = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	821 octave_idx_type b_nc = b.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	822
15282 06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	823 if (a.numel () == 1 && b.numel () > 1)
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	824 return scalar_xpow (a(0), b);
06ce57277bfb handle scalar-sparse-matrix .^ matrix ops John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	825
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	826 if (nr != b_nr \|\| nc != b_nc)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	827 octave::err_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	828
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	829 SparseComplexMatrix result (nr, nc, Complex (1.0, 0.0));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	830 for (octave_idx_type j = 0; j < nc; j++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	831 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	832 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	833 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	834 octave_quit ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17749 diff changeset	835 result.xelem (a.ridx (i), j) = std::pow (a.data (i),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17749 diff changeset	836 b(a.ridx (i), j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	837 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	838 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	839 result.maybe_compress (true);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	840
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	841 return result;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	842 }
29990 b839c36fd106 move sparse xdiv and xpow operator functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	843
31234 a1318deb4584 sparse-xpow.cc: Improve consistency between sparse and full matrices (bug #63080) Arun Giridhar <arungiridhar@gmail.com> parents: 31231 diff changeset	844
29990 b839c36fd106 move sparse xdiv and xpow operator functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	845 OCTAVE_NAMESPACE_END

Mercurial > octave

annotate libinterp/corefcn/sparse-xpow.cc @ 31234:a1318deb4584