octave: liboctave/operators/Sparse-op-defs.h annotate

annotate liboctave/operators/Sparse-op-defs.h @ 27919:1891570abac8

update Octave Project Developers copyright for the new year In files that have the "Octave Project Developers" copyright notice, update for 2020.

author	John W. Eaton <jwe@octave.org>
date	Mon, 06 Jan 2020 22:29:51 -0500
parents	b442ec6dda5c
children	bd51beb6205e

rev	line source
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1 /*
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2
27919 1891570abac8 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27918 diff changeset	3 Copyright (C) 1998-2020 The Octave Project Developers
27918 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	4
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	5 See the file COPYRIGHT.md in the top-level directory of this distribution
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	6 or <https://octave.org/COPYRIGHT.html/>.
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	7
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	8
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	9 This file is part of Octave.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	10
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23442 diff changeset	11 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	12 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23442 diff changeset	13 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	14 (at your option) any later version.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	15
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	16 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	17 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	19 GNU General Public License for more details.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	20
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	21 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	22 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23442 diff changeset	23 <https://www.gnu.org/licenses/>.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	24
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	25 */
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	26
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19861 diff changeset	27 #if ! defined (octave_Sparse_op_defs_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17769 diff changeset	28 #define octave_Sparse_op_defs_h 1
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	29
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	30 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	31
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	32 #include "Array-util.h"
23442 53f5f8231c37 allow most header files to be compiled separately John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	33 #include "lo-array-errwarn.h"
53f5f8231c37 allow most header files to be compiled separately John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	34 #include "mx-inlines.cc"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8198 diff changeset	35 #include "oct-locbuf.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	36
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 18812 diff changeset	37 // sparse matrix by scalar operations.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	38
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	39 #define SPARSE_SMS_BIN_OP_1(R, F, OP, M, S) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	40 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	41 F (const M& m, const S& s) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	42 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	43 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	44 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	45 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	46 R r (nr, nc, (0.0 OP s)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	47 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	48 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	49 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	50 r.xelem (m.ridx (i), j) = m.data (i) OP s; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	51 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	52 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	53
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	54 #define SPARSE_SMS_BIN_OP_2(R, F, OP, M, S) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	55 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	56 F (const M& m, const S& s) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	57 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	58 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	59 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	60 octave_idx_type nz = m.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	61 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	62 R r (nr, nc, nz); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	63 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	64 for (octave_idx_type i = 0; i < nz; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	65 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	66 r.xdata (i) = m.data (i) OP s; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	67 r.xridx (i) = m.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	68 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	69 for (octave_idx_type i = 0; i < nc + 1; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	70 r.xcidx (i) = m.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	71 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	72 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	73 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	74 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	75
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	76 #define SPARSE_SMS_BIN_OPS(R1, R2, M, S) \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	77 SPARSE_SMS_BIN_OP_1 (R1, operator +, +, M, S) \
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	78 SPARSE_SMS_BIN_OP_1 (R1, operator -, -, M, S) \
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	79 SPARSE_SMS_BIN_OP_2 (R2, operator , , M, S) \
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	80 SPARSE_SMS_BIN_OP_2 (R2, operator /, /, M, S)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	81
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	82 #define SPARSE_SMS_CMP_OP(F, OP, M, S) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	83 SparseBoolMatrix \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	84 F (const M& m, const S& s) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	85 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	86 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	87 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	88 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	89 \
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	90 M::element_type m_zero = M::element_type (); \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	91 \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	92 if (m_zero OP s) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	93 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	94 r = SparseBoolMatrix (nr, nc, true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	95 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	96 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	97 if (! (m.data (i) OP s)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	98 r.data (m.ridx (i) + j * nr) = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	99 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	100 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	101 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	102 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	103 r = SparseBoolMatrix (nr, nc, m.nnz ()); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	104 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	105 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	106 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	107 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	108 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	109 if (m.data (i) OP s) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	110 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	111 r.ridx (nel) = m.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	112 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	113 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	114 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	115 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	116 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	117 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	118 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	119 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	120
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	121 #define SPARSE_SMS_CMP_OPS(M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	122 SPARSE_SMS_CMP_OP (mx_el_lt, <, M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	123 SPARSE_SMS_CMP_OP (mx_el_le, <=, M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	124 SPARSE_SMS_CMP_OP (mx_el_ge, >=, M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	125 SPARSE_SMS_CMP_OP (mx_el_gt, >, M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	126 SPARSE_SMS_CMP_OP (mx_el_eq, ==, M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	127 SPARSE_SMS_CMP_OP (mx_el_ne, !=, M, S)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	128
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	129 #define SPARSE_SMS_EQNE_OPS(M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	130 SPARSE_SMS_CMP_OP (mx_el_eq, ==, M, S) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	131 SPARSE_SMS_CMP_OP (mx_el_ne, !=, M, S)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	132
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	133 #define SPARSE_SMS_BOOL_OR_OP(M, S) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	134 SparseBoolMatrix \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	135 mx_el_or (const M& m, const S& s) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	136 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	137 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	138 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	139 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	140 \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	141 M::element_type lhs_zero = M::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	142 S rhs_zero = S (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	143 \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	144 if (nr > 0 && nc > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	145 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	146 if (s != rhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	147 r = SparseBoolMatrix (nr, nc, true); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	148 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	149 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	150 r = SparseBoolMatrix (nr, nc, m.nnz ()); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	151 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	152 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	153 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	154 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	155 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	156 if (m.data (i) != lhs_zero) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	157 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	158 r.ridx (nel) = m.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	159 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	160 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	161 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	162 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	163 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	164 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	165 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	166 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	167 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	168
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	169 #define SPARSE_SMS_BOOL_AND_OP(M, S) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	170 SparseBoolMatrix \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	171 mx_el_and (const M& m, const S& s) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	172 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	173 octave_idx_type nr = m.rows (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	174 octave_idx_type nc = m.cols (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	175 SparseBoolMatrix r; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	176 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	177 M::element_type lhs_zero = M::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	178 S rhs_zero = S (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	179 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	180 if (nr > 0 && nc > 0) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	181 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	182 if (s != rhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	183 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	184 r = SparseBoolMatrix (nr, nc, m.nnz ()); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	185 r.cidx (0) = static_cast<octave_idx_type> (0); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	186 octave_idx_type nel = 0; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	187 for (octave_idx_type j = 0; j < nc; j++) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	188 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	189 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	190 if (m.data (i) != lhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	191 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	192 r.ridx (nel) = m.ridx (i); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	193 r.data (nel++) = true; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	194 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	195 r.cidx (j + 1) = nel; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	196 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	197 r.maybe_compress (false); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	198 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	199 else \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	200 r = SparseBoolMatrix (nr, nc); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	201 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	202 return r; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	203 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	204
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	205 #define SPARSE_SMS_BOOL_OPS(M, S) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	206 SPARSE_SMS_BOOL_AND_OP (M, S) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	207 SPARSE_SMS_BOOL_OR_OP (M, S)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	208
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 18812 diff changeset	209 // scalar by sparse matrix operations.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	210
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	211 #define SPARSE_SSM_BIN_OP_1(R, F, OP, S, M) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	212 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	213 F (const S& s, const M& m) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	214 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	215 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	216 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	217 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	218 R r (nr, nc, (s OP 0.0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	219 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	220 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	221 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	222 r.xelem (m.ridx (i), j) = s OP m.data (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	223 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	224 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	225 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	226
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	227 #define SPARSE_SSM_BIN_OP_2(R, F, OP, S, M) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	228 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	229 F (const S& s, const M& m) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	230 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	231 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	232 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	233 octave_idx_type nz = m.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	234 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	235 R r (nr, nc, nz); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	236 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	237 for (octave_idx_type i = 0; i < nz; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	238 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	239 r.xdata (i) = s OP m.data (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	240 r.xridx (i) = m.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	241 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	242 for (octave_idx_type i = 0; i < nc + 1; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	243 r.xcidx (i) = m.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	244 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	245 r.maybe_compress(true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	246 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	247 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	248
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	249 #define SPARSE_SSM_BIN_OPS(R1, R2, S, M) \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	250 SPARSE_SSM_BIN_OP_1 (R1, operator +, +, S, M) \
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	251 SPARSE_SSM_BIN_OP_1 (R1, operator -, -, S, M) \
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	252 SPARSE_SSM_BIN_OP_2 (R2, operator , , S, M) \
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	253 SPARSE_SSM_BIN_OP_2 (R2, operator /, /, S, M)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	254
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	255 #define SPARSE_SSM_CMP_OP(F, OP, S, M) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	256 SparseBoolMatrix \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	257 F (const S& s, const M& m) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	258 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	259 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	260 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	261 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	262 \
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	263 M::element_type m_zero = M::element_type (); \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	264 \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	265 if (s OP m_zero) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	266 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	267 r = SparseBoolMatrix (nr, nc, true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	268 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	269 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	270 if (! (s OP m.data (i))) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	271 r.data (m.ridx (i) + j * nr) = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	272 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	273 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	274 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	275 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	276 r = SparseBoolMatrix (nr, nc, m.nnz ()); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	277 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	278 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	279 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	280 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	281 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	282 if (s OP m.data (i)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	283 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	284 r.ridx (nel) = m.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	285 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	286 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	287 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	288 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	289 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	290 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	291 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	292 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	293
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	294 #define SPARSE_SSM_CMP_OPS(S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	295 SPARSE_SSM_CMP_OP (mx_el_lt, <, S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	296 SPARSE_SSM_CMP_OP (mx_el_le, <=, S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	297 SPARSE_SSM_CMP_OP (mx_el_ge, >=, S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	298 SPARSE_SSM_CMP_OP (mx_el_gt, >, S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	299 SPARSE_SSM_CMP_OP (mx_el_eq, ==, S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	300 SPARSE_SSM_CMP_OP (mx_el_ne, !=, S, M)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	301
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	302 #define SPARSE_SSM_EQNE_OPS(S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	303 SPARSE_SSM_CMP_OP (mx_el_eq, ==, S, M) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	304 SPARSE_SSM_CMP_OP (mx_el_ne, !=, S, M)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	305
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	306 #define SPARSE_SSM_BOOL_OR_OP(S, M) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	307 SparseBoolMatrix \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	308 mx_el_or (const S& s, const M& m) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	309 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	310 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	311 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	312 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	313 \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	314 S lhs_zero = S (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	315 M::element_type rhs_zero = M::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	316 \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	317 if (nr > 0 && nc > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	318 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	319 if (s != lhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	320 r = SparseBoolMatrix (nr, nc, true); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	321 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	322 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	323 r = SparseBoolMatrix (nr, nc, m.nnz ()); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	324 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	325 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	326 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	327 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	328 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	329 if (m.data (i) != rhs_zero) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	330 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	331 r.ridx (nel) = m.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	332 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	333 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	334 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	335 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	336 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	337 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	338 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	339 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	340 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	341
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	342 #define SPARSE_SSM_BOOL_AND_OP(S, M) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	343 SparseBoolMatrix \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	344 mx_el_and (const S& s, const M& m) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	345 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	346 octave_idx_type nr = m.rows (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	347 octave_idx_type nc = m.cols (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	348 SparseBoolMatrix r; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	349 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	350 S lhs_zero = S (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	351 M::element_type rhs_zero = M::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	352 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	353 if (nr > 0 && nc > 0) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	354 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	355 if (s != lhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	356 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	357 r = SparseBoolMatrix (nr, nc, m.nnz ()); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	358 r.cidx (0) = static_cast<octave_idx_type> (0); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	359 octave_idx_type nel = 0; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	360 for (octave_idx_type j = 0; j < nc; j++) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	361 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	362 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	363 if (m.data (i) != rhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	364 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	365 r.ridx (nel) = m.ridx (i); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	366 r.data (nel++) = true; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	367 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	368 r.cidx (j + 1) = nel; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	369 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	370 r.maybe_compress (false); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	371 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	372 else \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	373 r = SparseBoolMatrix (nr, nc); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	374 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	375 return r; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	376 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	377
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	378 #define SPARSE_SSM_BOOL_OPS(S, M) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	379 SPARSE_SSM_BOOL_AND_OP (S, M) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	380 SPARSE_SSM_BOOL_OR_OP (S, M)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	381
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 18812 diff changeset	382 // sparse matrix by sparse matrix operations.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	383
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	384 #define SPARSE_SMSM_BIN_OP_1(R, F, OP, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	385 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	386 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	387 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	388 R r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	389 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	390 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	391 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	392 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	393 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	394 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	395 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	396 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	397 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	398 if (m1.elem (0,0) == 0.) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	399 r = OP R (m2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	400 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	401 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	402 r = R (m2_nr, m2_nc, m1.data (0) OP 0.); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	403 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	404 for (octave_idx_type j = 0 ; j < m2_nc ; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	405 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	406 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	407 octave_idx_type idxj = j * m2_nr; \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	408 for (octave_idx_type i = m2.cidx (j) ; i < m2.cidx (j+1) ; i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	409 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	410 octave_quit (); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	411 r.data (idxj + m2.ridx (i)) = m1.data (0) OP m2.data (i); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	412 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	413 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	414 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	415 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	416 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	417 else if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	418 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	419 if (m2.elem (0,0) == 0.) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	420 r = R (m1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	421 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	422 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	423 r = R (m1_nr, m1_nc, 0. OP m2.data (0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	424 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	425 for (octave_idx_type j = 0 ; j < m1_nc ; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	426 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	427 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	428 octave_idx_type idxj = j * m1_nr; \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	429 for (octave_idx_type i = m1.cidx (j) ; i < m1.cidx (j+1) ; i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	430 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	431 octave_quit (); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	432 r.data (idxj + m1.ridx (i)) = m1.data (i) OP m2.data (0); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	433 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	434 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	435 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	436 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	437 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	438 else if (m1_nr != m2_nr \|\| m1_nc != m2_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	439 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	440 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	441 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	442 r = R (m1_nr, m1_nc, (m1.nnz () + m2.nnz ())); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	443 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	444 octave_idx_type jx = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	445 r.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	446 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	447 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	448 octave_idx_type ja = m1.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	449 octave_idx_type ja_max = m1.cidx (i+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	450 bool ja_lt_max = ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	451 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	452 octave_idx_type jb = m2.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	453 octave_idx_type jb_max = m2.cidx (i+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	454 bool jb_lt_max = jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	455 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	456 while (ja_lt_max \|\| jb_lt_max) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	457 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	458 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	459 if ((! jb_lt_max) \|\| \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	460 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	461 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	462 r.ridx (jx) = m1.ridx (ja); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	463 r.data (jx) = m1.data (ja) OP 0.; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	464 jx++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	465 ja++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	466 ja_lt_max= ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	467 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	468 else if ((! ja_lt_max) \|\| \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	469 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	470 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	471 r.ridx (jx) = m2.ridx (jb); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	472 r.data (jx) = 0. OP m2.data (jb); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	473 jx++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	474 jb++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	475 jb_lt_max= jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	476 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	477 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	478 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	479 if ((m1.data (ja) OP m2.data (jb)) != 0.) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	480 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	481 r.data (jx) = m1.data (ja) OP m2.data (jb); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	482 r.ridx (jx) = m1.ridx (ja); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	483 jx++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	484 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	485 ja++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	486 ja_lt_max= ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	487 jb++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	488 jb_lt_max= jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	489 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	490 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	491 r.cidx (i+1) = jx; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	492 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	493 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	494 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	495 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	496 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	497 return r; \
5164 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
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	500 #define SPARSE_SMSM_BIN_OP_2(R, F, OP, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	501 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	502 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	503 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	504 R r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	505 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	506 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	507 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	508 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	509 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	510 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	511 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	512 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	513 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	514 if (m1.elem (0,0) == 0.) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	515 r = R (m2_nr, m2_nc); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	516 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	517 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	518 r = R (m2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	519 octave_idx_type m2_nnz = m2.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	520 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	521 for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	522 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	523 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	524 r.data (i) = m1.data (0) OP r.data (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	525 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	526 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	527 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	528 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	529 else if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	530 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	531 if (m2.elem (0,0) == 0.) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	532 r = R (m1_nr, m1_nc); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	533 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	534 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	535 r = R (m1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	536 octave_idx_type m1_nnz = m1.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	537 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	538 for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	539 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	540 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	541 r.data (i) = r.data (i) OP m2.data (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	542 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	543 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	544 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	545 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	546 else if (m1_nr != m2_nr \|\| m1_nc != m2_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	547 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	548 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	549 { \
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5604 diff changeset	550 r = R (m1_nr, m1_nc, (m1.nnz () > m2.nnz () ? m1.nnz () : m2.nnz ())); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	551 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	552 octave_idx_type jx = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	553 r.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	554 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	555 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	556 octave_idx_type ja = m1.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	557 octave_idx_type ja_max = m1.cidx (i+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	558 bool ja_lt_max = ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	559 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	560 octave_idx_type jb = m2.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	561 octave_idx_type jb_max = m2.cidx (i+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	562 bool jb_lt_max = jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	563 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	564 while (ja_lt_max \|\| jb_lt_max) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	565 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	566 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	567 if ((! jb_lt_max) \|\| \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	568 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	569 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	570 ja++; ja_lt_max= ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	571 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	572 else if ((! ja_lt_max) \|\| \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	573 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	574 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	575 jb++; jb_lt_max= jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	576 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	577 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	578 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	579 if ((m1.data (ja) OP m2.data (jb)) != 0.) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	580 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	581 r.data (jx) = m1.data (ja) OP m2.data (jb); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	582 r.ridx (jx) = m1.ridx (ja); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	583 jx++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	584 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	585 ja++; ja_lt_max= ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	586 jb++; jb_lt_max= jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	587 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	588 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	589 r.cidx (i+1) = jx; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	590 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	591 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	592 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	593 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	594 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	595 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	596 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	597
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	598 #define SPARSE_SMSM_BIN_OP_3(R, F, OP, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	599 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	600 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	601 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	602 R r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	603 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	604 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	605 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	606 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	607 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	608 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	609 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	610 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	611 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	612 if ((m1.elem (0,0) OP Complex ()) == Complex ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	613 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	614 octave_idx_type m2_nnz = m2.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	615 r = R (m2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	616 for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	617 r.data (i) = m1.elem (0,0) OP r.data (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	618 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	619 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	620 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	621 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	622 r = R (m2_nr, m2_nc, m1.elem (0,0) OP Complex ()); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	623 for (octave_idx_type j = 0 ; j < m2_nc ; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	624 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	625 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	626 octave_idx_type idxj = j * m2_nr; \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	627 for (octave_idx_type i = m2.cidx (j) ; i < m2.cidx (j+1) ; i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	628 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	629 octave_quit (); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	630 r.data (idxj + m2.ridx (i)) = m1.elem (0,0) OP m2.data (i); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	631 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	632 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	633 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	634 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	635 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	636 else if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	637 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	638 if ((Complex () OP m1.elem (0,0)) == Complex ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	639 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	640 octave_idx_type m1_nnz = m1.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	641 r = R (m1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	642 for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	643 r.data (i) = r.data (i) OP m2.elem (0,0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	644 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	645 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	646 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	647 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	648 r = R (m1_nr, m1_nc, Complex () OP m2.elem (0,0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	649 for (octave_idx_type j = 0 ; j < m1_nc ; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	650 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	651 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	652 octave_idx_type idxj = j * m1_nr; \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	653 for (octave_idx_type i = m1.cidx (j) ; i < m1.cidx (j+1) ; i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	654 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	655 octave_quit (); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	656 r.data (idxj + m1.ridx (i)) = m1.data (i) OP m2.elem (0,0); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	657 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	658 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	659 r.maybe_compress (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	660 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	661 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	662 else if (m1_nr != m2_nr \|\| m1_nc != m2_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	663 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	664 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	665 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	666 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	667 /* FIXME: Kludge... Always double/Complex, so Complex () */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	668 r = R (m1_nr, m1_nc, (Complex () OP Complex ())); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	669 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	670 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	671 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	672 octave_idx_type ja = m1.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	673 octave_idx_type ja_max = m1.cidx (i+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	674 bool ja_lt_max = ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	675 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	676 octave_idx_type jb = m2.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	677 octave_idx_type jb_max = m2.cidx (i+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	678 bool jb_lt_max = jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	679 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	680 while (ja_lt_max \|\| jb_lt_max) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	681 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	682 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	683 if ((! jb_lt_max) \|\| \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	684 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	685 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	686 /* keep those kludges coming */ \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	687 r.elem (m1.ridx (ja),i) = m1.data (ja) OP Complex (); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	688 ja++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	689 ja_lt_max= ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	690 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	691 else if ((! ja_lt_max) \|\| \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	692 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	693 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	694 /* keep those kludges coming */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	695 r.elem (m2.ridx (jb),i) = Complex () OP m2.data (jb); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	696 jb++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	697 jb_lt_max= jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	698 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	699 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	700 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	701 r.elem (m1.ridx (ja),i) = m1.data (ja) OP m2.data (jb); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	702 ja++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	703 ja_lt_max= ja < ja_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	704 jb++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	705 jb_lt_max= jb < jb_max; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	706 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	707 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	708 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	709 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	710 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	711 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	712 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	713 }
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 // Note that SM ./ SM needs to take into account the NaN and Inf values
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	716 // implied by the division by zero.
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	717 // FIXME: Are the NaNs double(NaN) or Complex(NaN,Nan) in the complex case?
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	718 #define SPARSE_SMSM_BIN_OPS(R1, R2, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	719 SPARSE_SMSM_BIN_OP_1 (R1, operator +, +, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	720 SPARSE_SMSM_BIN_OP_1 (R1, operator -, -, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	721 SPARSE_SMSM_BIN_OP_2 (R2, product, *, M1, M2) \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	722 SPARSE_SMSM_BIN_OP_3 (R2, quotient, /, M1, M2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	723
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	724 // FIXME: this macro duplicates the bodies of the template functions
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	725 // defined in the SPARSE_SSM_CMP_OP and SPARSE_SMS_CMP_OP macros.
8198 5ac184c05811 additional AIX build fix John W. Eaton <jwe@octave.org> parents: 8187 diff changeset	726
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	727 #define SPARSE_SMSM_CMP_OP(F, OP, M1, M2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	728 SparseBoolMatrix \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	729 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	730 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	731 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	732 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	733 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	734 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	735 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	736 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	737 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	738 \
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	739 M1::element_type Z1 = M1::element_type (); \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	740 M2::element_type Z2 = M2::element_type (); \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	741 \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	742 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	743 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	744 if (m1.elem (0,0) OP Z2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	745 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	746 r = SparseBoolMatrix (m2_nr, m2_nc, true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	747 for (octave_idx_type j = 0; j < m2_nc; j++) \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	748 for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	749 if (! (m1.elem (0,0) OP m2.data (i))) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	750 r.data (m2.ridx (i) + j * m2_nr) = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	751 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	752 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	753 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	754 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	755 r = SparseBoolMatrix (m2_nr, m2_nc, m2.nnz ()); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	756 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	757 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	758 for (octave_idx_type j = 0; j < m2_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	759 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	760 for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	761 if (m1.elem (0,0) OP m2.data (i)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	762 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	763 r.ridx (nel) = m2.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	764 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	765 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	766 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	767 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	768 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	769 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	770 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	771 else if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	772 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	773 if (Z1 OP m2.elem (0,0)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	774 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	775 r = SparseBoolMatrix (m1_nr, m1_nc, true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	776 for (octave_idx_type j = 0; j < m1_nc; j++) \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	777 for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	778 if (! (m1.data (i) OP m2.elem (0,0))) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	779 r.data (m1.ridx (i) + j * m1_nr) = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	780 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	781 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	782 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	783 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	784 r = SparseBoolMatrix (m1_nr, m1_nc, m1.nnz ()); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	785 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	786 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	787 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	788 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	789 for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	790 if (m1.data (i) OP m2.elem (0,0)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	791 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	792 r.ridx (nel) = m1.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	793 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	794 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	795 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	796 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	797 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	798 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	799 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	800 else if (m1_nr == m2_nr && m1_nc == m2_nc) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	801 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	802 if (m1_nr != 0 \|\| m1_nc != 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	803 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	804 if (Z1 OP Z2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	805 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	806 r = SparseBoolMatrix (m1_nr, m1_nc, true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	807 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	808 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	809 octave_idx_type i1 = m1.cidx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	810 octave_idx_type e1 = m1.cidx (j+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	811 octave_idx_type i2 = m2.cidx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	812 octave_idx_type e2 = m2.cidx (j+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	813 while (i1 < e1 \|\| i2 < e2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	814 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	815 if (i1 == e1 \|\| (i2 < e2 && m1.ridx (i1) > m2.ridx (i2))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	816 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	817 if (! (Z1 OP m2.data (i2))) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	818 r.data (m2.ridx (i2) + j * m1_nr) = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	819 i2++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	820 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	821 else if (i2 == e2 \|\| m1.ridx (i1) < m2.ridx (i2)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	822 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	823 if (! (m1.data (i1) OP Z2)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	824 r.data (m1.ridx (i1) + j * m1_nr) = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	825 i1++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	826 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	827 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	828 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	829 if (! (m1.data (i1) OP m2.data (i2))) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	830 r.data (m1.ridx (i1) + j * m1_nr) = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	831 i1++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	832 i2++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	833 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	834 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	835 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	836 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	837 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	838 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	839 { \
7269 3fade00a6ac7 [project @ 2007-12-07 19:26:20 by jwe] jwe parents: 7197 diff changeset	840 r = SparseBoolMatrix (m1_nr, m1_nc, m1.nnz () + m2.nnz ()); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	841 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	842 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	843 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	844 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	845 octave_idx_type i1 = m1.cidx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	846 octave_idx_type e1 = m1.cidx (j+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	847 octave_idx_type i2 = m2.cidx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	848 octave_idx_type e2 = m2.cidx (j+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	849 while (i1 < e1 \|\| i2 < e2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	850 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	851 if (i1 == e1 \|\| (i2 < e2 && m1.ridx (i1) > m2.ridx (i2))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	852 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	853 if (Z1 OP m2.data (i2)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	854 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	855 r.ridx (nel) = m2.ridx (i2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	856 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	857 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	858 i2++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	859 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	860 else if (i2 == e2 \|\| m1.ridx (i1) < m2.ridx (i2)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	861 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	862 if (m1.data (i1) OP Z2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	863 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	864 r.ridx (nel) = m1.ridx (i1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	865 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	866 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	867 i1++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	868 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	869 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	870 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	871 if (m1.data (i1) OP m2.data (i2)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	872 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	873 r.ridx (nel) = m1.ridx (i1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	874 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	875 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	876 i1++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	877 i2++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	878 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	879 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	880 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	881 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	882 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	883 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	884 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	885 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	886 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	887 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	888 if ((m1_nr != 0 \|\| m1_nc != 0) && (m2_nr != 0 \|\| m2_nc != 0)) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	889 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	890 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	891 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	892 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	893
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	894 #define SPARSE_SMSM_CMP_OPS(M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	895 SPARSE_SMSM_CMP_OP (mx_el_lt, <, M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	896 SPARSE_SMSM_CMP_OP (mx_el_le, <=, M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	897 SPARSE_SMSM_CMP_OP (mx_el_ge, >=, M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	898 SPARSE_SMSM_CMP_OP (mx_el_gt, >, M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	899 SPARSE_SMSM_CMP_OP (mx_el_eq, ==, M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	900 SPARSE_SMSM_CMP_OP (mx_el_ne, !=, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	901
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	902 #define SPARSE_SMSM_EQNE_OPS(M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	903 SPARSE_SMSM_CMP_OP (mx_el_eq, ==, M1, M2) \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	904 SPARSE_SMSM_CMP_OP (mx_el_ne, !=, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	905
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	906 #define SPARSE_SMSM_BOOL_AND_OP(M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	907 extern SparseBoolMatrix mx_el_and (const M1&, const M2::element_type&); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	908 extern SparseBoolMatrix mx_el_and (const M1::element_type&, const M2&); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	909 SparseBoolMatrix \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	910 mx_el_and (const M1& m1, const M2& m2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	911 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	912 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	913 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	914 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	915 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	916 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	917 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	918 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	919 \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	920 M1::element_type lhs_zero = M1::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	921 M2::element_type rhs_zero = M2::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	922 \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	923 if (m1_nr == 1 && m1_nc == 1) \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	924 return mx_el_and (m1.elem (0,0), m2); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	925 else if (m2_nr == 1 && m2_nc == 1) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	926 return mx_el_and (m1, m2.elem (0,0)); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	927 else if (m1_nr == m2_nr && m1_nc == m2_nc) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	928 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	929 if (m1_nr != 0 \|\| m1_nc != 0) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	930 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	931 r = SparseBoolMatrix (m1_nr, m1_nc, m1.nnz () + m2.nnz ()); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	932 r.cidx (0) = static_cast<octave_idx_type> (0); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	933 octave_idx_type nel = 0; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	934 for (octave_idx_type j = 0; j < m1_nc; j++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	935 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	936 octave_idx_type i1 = m1.cidx (j); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	937 octave_idx_type e1 = m1.cidx (j+1); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	938 octave_idx_type i2 = m2.cidx (j); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	939 octave_idx_type e2 = m2.cidx (j+1); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	940 while (i1 < e1 \|\| i2 < e2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	941 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	942 if (i1 == e1 \|\| (i2 < e2 && m1.ridx (i1) > m2.ridx (i2))) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	943 i2++; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	944 else if (i2 == e2 \|\| m1.ridx (i1) < m2.ridx (i2)) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	945 i1++; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	946 else \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	947 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	948 if (m1.data (i1) != lhs_zero && m2.data (i2) != rhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	949 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	950 r.ridx (nel) = m1.ridx (i1); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	951 r.data (nel++) = true; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	952 } \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	953 i1++; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	954 i2++; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	955 } \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	956 } \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	957 r.cidx (j + 1) = nel; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	958 } \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	959 r.maybe_compress (false); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	960 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	961 } \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	962 else \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	963 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	964 if ((m1_nr != 0 \|\| m1_nc != 0) && (m2_nr != 0 \|\| m2_nc != 0)) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	965 octave::err_nonconformant ("mx_el_and_", m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	966 } \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	967 return r; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	968 }
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	969
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	970 #define SPARSE_SMSM_BOOL_OR_OP(M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	971 extern SparseBoolMatrix mx_el_or (const M1&, const M2::element_type&); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	972 extern SparseBoolMatrix mx_el_or (const M1::element_type&, const M2&); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	973 SparseBoolMatrix \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	974 mx_el_or (const M1& m1, const M2& m2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	975 { \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	976 SparseBoolMatrix r; \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	977 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	978 octave_idx_type m1_nr = m1.rows (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	979 octave_idx_type m1_nc = m1.cols (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	980 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	981 octave_idx_type m2_nr = m2.rows (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	982 octave_idx_type m2_nc = m2.cols (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	983 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	984 M1::element_type lhs_zero = M1::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	985 M2::element_type rhs_zero = M2::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	986 \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	987 if (m1_nr == 1 && m1_nc == 1) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	988 return mx_el_or (m1.elem (0,0), m2); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	989 else if (m2_nr == 1 && m2_nc == 1) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	990 return mx_el_or (m1, m2.elem (0,0)); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	991 else if (m1_nr == m2_nr && m1_nc == m2_nc) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	992 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	993 if (m1_nr != 0 \|\| m1_nc != 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	994 { \
7269 3fade00a6ac7 [project @ 2007-12-07 19:26:20 by jwe] jwe parents: 7197 diff changeset	995 r = SparseBoolMatrix (m1_nr, m1_nc, m1.nnz () + m2.nnz ()); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	996 r.cidx (0) = static_cast<octave_idx_type> (0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	997 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	998 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	999 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1000 octave_idx_type i1 = m1.cidx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1001 octave_idx_type e1 = m1.cidx (j+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1002 octave_idx_type i2 = m2.cidx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1003 octave_idx_type e2 = m2.cidx (j+1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1004 while (i1 < e1 \|\| i2 < e2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1005 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1006 if (i1 == e1 \|\| (i2 < e2 && m1.ridx (i1) > m2.ridx (i2))) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1007 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1008 if (m2.data (i2) != rhs_zero) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1009 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1010 r.ridx (nel) = m2.ridx (i2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1011 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1012 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1013 i2++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1014 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1015 else if (i2 == e2 \|\| m1.ridx (i1) < m2.ridx (i2)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1016 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1017 if (m1.data (i1) != lhs_zero) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1018 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1019 r.ridx (nel) = m1.ridx (i1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1020 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1021 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1022 i1++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1023 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1024 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1025 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1026 if (m1.data (i1) != lhs_zero \|\| m2.data (i2) != rhs_zero) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1027 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1028 r.ridx (nel) = m1.ridx (i1); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1029 r.data (nel++) = true; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1030 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1031 i1++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1032 i2++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1033 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1034 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1035 r.cidx (j + 1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1036 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1037 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1038 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1039 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1040 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1041 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1042 if ((m1_nr != 0 \|\| m1_nc != 0) && (m2_nr != 0 \|\| m2_nc != 0)) \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1043 octave::err_nonconformant ("mx_el_or", m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1044 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1045 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1046 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1047
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1048 #define SPARSE_SMSM_BOOL_OPS(M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1049 SPARSE_SMSM_BOOL_AND_OP (M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1050 SPARSE_SMSM_BOOL_OR_OP (M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1051
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 18812 diff changeset	1052 // matrix by sparse matrix operations.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1053
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1054 #define SPARSE_MSM_BIN_OP_1(R, F, OP, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1055 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1056 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1057 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1058 R r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1059 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1060 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1061 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1062 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1063 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1064 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1065 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1066 if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1067 r = R (m1 OP m2.elem (0,0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1068 else if (m1_nr != m2_nr \|\| m1_nc != m2_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1069 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1070 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1071 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1072 r = R (F (m1, m2.matrix_value ())); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1073 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1074 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1075 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1076
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1077 #define SPARSE_MSM_BIN_OP_2(R, F, OP, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1078 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1079 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1080 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1081 R r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1082 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1083 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1084 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1085 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1086 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1087 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1088 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1089 if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1090 r = R (m1 OP m2.elem (0,0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1091 else if (m1_nr != m2_nr \|\| m1_nc != m2_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1092 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1093 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1094 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1095 if (do_mx_check (m1, mx_inline_all_finite<M1::element_type>)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1096 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1097 /* Sparsity pattern is preserved. */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1098 octave_idx_type m2_nz = m2.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1099 r = R (m2_nr, m2_nc, m2_nz); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1100 for (octave_idx_type j = 0, k = 0; j < m2_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1101 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1102 octave_quit (); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1103 for (octave_idx_type i = m2.cidx (j); i < m2.cidx (j+1); i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1104 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1105 octave_idx_type mri = m2.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1106 R::element_type x = m1(mri, j) OP m2.data (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1107 if (x != 0.0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1108 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1109 r.xdata (k) = x; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1110 r.xridx (k) = m2.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1111 k++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1112 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1113 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1114 r.xcidx (j+1) = k; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1115 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1116 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1117 return r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1118 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1119 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1120 r = R (F (m1, m2.matrix_value ())); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1121 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1122 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1123 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1124 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1125
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1126 #define SPARSE_MSM_BIN_OPS(R1, R2, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1127 SPARSE_MSM_BIN_OP_1 (R1, operator +, +, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1128 SPARSE_MSM_BIN_OP_1 (R1, operator -, -, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1129 SPARSE_MSM_BIN_OP_2 (R2, product, *, M1, M2) \
10900 b64803a8be4e optimize element-wise sparse-dense multiplication and division Jaroslav Hajek <highegg@gmail.com> parents: 10312 diff changeset	1130 SPARSE_MSM_BIN_OP_1 (R2, quotient, /, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1131
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1132 #define SPARSE_MSM_CMP_OP(F, OP, M1, M2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1133 SparseBoolMatrix \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1134 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1135 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1136 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1137 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1138 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1139 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1140 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1141 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1142 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1143 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1144 if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1145 r = SparseBoolMatrix (F (m1, m2.elem (0,0))); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1146 else if (m1_nr == m2_nr && m1_nc == m2_nc) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1147 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1148 if (m1_nr != 0 \|\| m1_nc != 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1149 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1150 /* Count num of nonzero elements */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1151 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1152 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1153 for (octave_idx_type i = 0; i < m1_nr; i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1154 if (m1.elem (i, j) OP m2.elem (i, j)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1155 nel++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1156 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1157 r = SparseBoolMatrix (m1_nr, m1_nc, nel); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1158 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1159 octave_idx_type ii = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1160 r.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1161 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1162 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1163 for (octave_idx_type i = 0; i < m1_nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1164 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1165 bool el = m1.elem (i, j) OP m2.elem (i, j); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1166 if (el) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1167 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1168 r.data (ii) = el; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1169 r.ridx (ii++) = i; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1170 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1171 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1172 r.cidx (j+1) = ii; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1173 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1174 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1175 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1176 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1177 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1178 if ((m1_nr != 0 \|\| m1_nc != 0) && (m2_nr != 0 \|\| m2_nc != 0)) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1179 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1180 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1181 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1182 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1183
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1184 #define SPARSE_MSM_CMP_OPS(M1, M2) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1185 SPARSE_MSM_CMP_OP (mx_el_lt, <, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1186 SPARSE_MSM_CMP_OP (mx_el_le, <=, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1187 SPARSE_MSM_CMP_OP (mx_el_ge, >=, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1188 SPARSE_MSM_CMP_OP (mx_el_gt, >, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1189 SPARSE_MSM_CMP_OP (mx_el_eq, ==, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1190 SPARSE_MSM_CMP_OP (mx_el_ne, !=, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1191
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1192 #define SPARSE_MSM_EQNE_OPS(M1, M2) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1193 SPARSE_MSM_CMP_OP (mx_el_eq, ==, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1194 SPARSE_MSM_CMP_OP (mx_el_ne, !=, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1195
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1196 #define SPARSE_MSM_BOOL_OP(F, OP, M1, M2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1197 SparseBoolMatrix \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1198 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1199 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1200 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1201 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1202 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1203 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1204 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1205 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1206 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1207 \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1208 M1::element_type lhs_zero = M1::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1209 M2::element_type rhs_zero = M2::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1210 \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1211 if (m2_nr == 1 && m2_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1212 r = SparseBoolMatrix (F (m1, m2.elem (0,0))); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1213 else if (m1_nr == m2_nr && m1_nc == m2_nc) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1214 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1215 if (m1_nr != 0 \|\| m1_nc != 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1216 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1217 /* Count num of nonzero elements */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1218 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1219 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1220 for (octave_idx_type i = 0; i < m1_nr; i++) \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1221 if ((m1.elem (i, j) != lhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1222 OP (m2.elem (i, j) != rhs_zero)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1223 nel++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1224 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1225 r = SparseBoolMatrix (m1_nr, m1_nc, nel); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1226 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1227 octave_idx_type ii = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1228 r.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1229 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1230 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1231 for (octave_idx_type i = 0; i < m1_nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1232 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1233 bool el = (m1.elem (i, j) != lhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1234 OP (m2.elem (i, j) != rhs_zero); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1235 if (el) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1236 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1237 r.data (ii) = el; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1238 r.ridx (ii++) = i; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1239 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1240 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1241 r.cidx (j+1) = ii; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1242 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1243 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1244 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1245 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1246 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1247 if ((m1_nr != 0 \|\| m1_nc != 0) && (m2_nr != 0 \|\| m2_nc != 0)) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1248 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1249 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1250 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1251 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1252
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1253 #define SPARSE_MSM_BOOL_OPS(M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1254 SPARSE_MSM_BOOL_OP (mx_el_and, &&, M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1255 SPARSE_MSM_BOOL_OP (mx_el_or, \|\|, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1256
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 18812 diff changeset	1257 // sparse matrix by matrix operations.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1258
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1259 #define SPARSE_SMM_BIN_OP_1(R, F, OP, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1260 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1261 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1262 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1263 R r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1264 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1265 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1266 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1267 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1268 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1269 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1270 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1271 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1272 r = R (m1.elem (0,0) OP m2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1273 else if (m1_nr != m2_nr \|\| m1_nc != m2_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1274 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1275 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1276 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1277 r = R (m1.matrix_value () OP m2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1278 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1279 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1280 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1281
10900 b64803a8be4e optimize element-wise sparse-dense multiplication and division Jaroslav Hajek <highegg@gmail.com> parents: 10312 diff changeset	1282 // sm .* m preserves sparsity if m contains no Infs nor Nans.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1283 #define SPARSE_SMM_BIN_OP_2_CHECK_product(ET) \
13731 3b52038e6e6c Help dumb compilers to resolve template parameters. Michael Goffioul <michael.goffioul@gmail.com> parents: 11523 diff changeset	1284 do_mx_check (m2, mx_inline_all_finite<ET>)
10900 b64803a8be4e optimize element-wise sparse-dense multiplication and division Jaroslav Hajek <highegg@gmail.com> parents: 10312 diff changeset	1285
b64803a8be4e optimize element-wise sparse-dense multiplication and division Jaroslav Hajek <highegg@gmail.com> parents: 10312 diff changeset	1286 // sm ./ m preserves sparsity if m contains no NaNs or zeros.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1287 #define SPARSE_SMM_BIN_OP_2_CHECK_quotient(ET) \
13731 3b52038e6e6c Help dumb compilers to resolve template parameters. Michael Goffioul <michael.goffioul@gmail.com> parents: 11523 diff changeset	1288 ! do_mx_check (m2, mx_inline_any_nan<ET>) && m2.nnz () == m2.numel ()
10900 b64803a8be4e optimize element-wise sparse-dense multiplication and division Jaroslav Hajek <highegg@gmail.com> parents: 10312 diff changeset	1289
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1290 #define SPARSE_SMM_BIN_OP_2(R, F, OP, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1291 R \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1292 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1293 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1294 R r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1295 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1296 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1297 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1298 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1299 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1300 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1301 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1302 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1303 r = R (m1.elem (0,0) OP m2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1304 else if (m1_nr != m2_nr \|\| m1_nc != m2_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1305 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1306 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1307 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1308 if (SPARSE_SMM_BIN_OP_2_CHECK_ ## F(M2::element_type)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1309 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1310 /* Sparsity pattern is preserved. */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1311 octave_idx_type m1_nz = m1.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1312 r = R (m1_nr, m1_nc, m1_nz); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1313 for (octave_idx_type j = 0, k = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1314 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1315 octave_quit (); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1316 for (octave_idx_type i = m1.cidx (j); i < m1.cidx (j+1); i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1317 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1318 octave_idx_type mri = m1.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1319 R::element_type x = m1.data (i) OP m2 (mri, j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1320 if (x != 0.0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1321 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1322 r.xdata (k) = x; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1323 r.xridx (k) = m1.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1324 k++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1325 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1326 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1327 r.xcidx (j+1) = k; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1328 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1329 r.maybe_compress (false); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1330 return r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1331 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1332 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1333 r = R (F (m1.matrix_value (), m2)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1334 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1335 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1336 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1337 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1338
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1339 #define SPARSE_SMM_BIN_OPS(R1, R2, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1340 SPARSE_SMM_BIN_OP_1 (R1, operator +, +, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1341 SPARSE_SMM_BIN_OP_1 (R1, operator -, -, M1, M2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1342 SPARSE_SMM_BIN_OP_2 (R2, product, *, M1, M2) \
10900 b64803a8be4e optimize element-wise sparse-dense multiplication and division Jaroslav Hajek <highegg@gmail.com> parents: 10312 diff changeset	1343 SPARSE_SMM_BIN_OP_2 (R2, quotient, /, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1344
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1345 #define SPARSE_SMM_CMP_OP(F, OP, M1, M2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1346 SparseBoolMatrix \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1347 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1348 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1349 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1350 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1351 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1352 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1353 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1354 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1355 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1356 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1357 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1358 r = SparseBoolMatrix (F (m1.elem (0,0), m2)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1359 else if (m1_nr == m2_nr && m1_nc == m2_nc) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1360 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1361 if (m1_nr != 0 \|\| m1_nc != 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1362 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1363 /* Count num of nonzero elements */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1364 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1365 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1366 for (octave_idx_type i = 0; i < m1_nr; i++) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1367 if (m1.elem (i, j) OP m2.elem (i, j)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1368 nel++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1369 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1370 r = SparseBoolMatrix (m1_nr, m1_nc, nel); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1371 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1372 octave_idx_type ii = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1373 r.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1374 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1375 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1376 for (octave_idx_type i = 0; i < m1_nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1377 { \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1378 bool el = m1.elem (i, j) OP m2.elem (i, j); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1379 if (el) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1380 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1381 r.data (ii) = el; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1382 r.ridx (ii++) = i; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1383 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1384 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1385 r.cidx (j+1) = ii; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1386 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1387 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1388 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1389 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1390 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1391 if ((m1_nr != 0 \|\| m1_nc != 0) && (m2_nr != 0 \|\| m2_nc != 0)) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1392 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1393 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1394 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1395 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1396
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1397 #define SPARSE_SMM_CMP_OPS(M1, M2) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1398 SPARSE_SMM_CMP_OP (mx_el_lt, <, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1399 SPARSE_SMM_CMP_OP (mx_el_le, <=, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1400 SPARSE_SMM_CMP_OP (mx_el_ge, >=, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1401 SPARSE_SMM_CMP_OP (mx_el_gt, >, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1402 SPARSE_SMM_CMP_OP (mx_el_eq, ==, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1403 SPARSE_SMM_CMP_OP (mx_el_ne, !=, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1404
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1405 #define SPARSE_SMM_EQNE_OPS(M1, M2) \
25664 fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1406 SPARSE_SMM_CMP_OP (mx_el_eq, ==, M1, M2) \
fc6081e9607b eliminate unused conversions from type specs and operator macros John W. Eaton <jwe@octave.org> parents: 25663 diff changeset	1407 SPARSE_SMM_CMP_OP (mx_el_ne, !=, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1408
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1409 #define SPARSE_SMM_BOOL_OP(F, OP, M1, M2) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1410 SparseBoolMatrix \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1411 F (const M1& m1, const M2& m2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1412 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1413 SparseBoolMatrix r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1414 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1415 octave_idx_type m1_nr = m1.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1416 octave_idx_type m1_nc = m1.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1417 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1418 octave_idx_type m2_nr = m2.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1419 octave_idx_type m2_nc = m2.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1420 \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1421 M1::element_type lhs_zero = M1::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1422 M2::element_type rhs_zero = M2::element_type (); \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1423 \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1424 if (m1_nr == 1 && m1_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1425 r = SparseBoolMatrix (F (m1.elem (0,0), m2)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1426 else if (m1_nr == m2_nr && m1_nc == m2_nc) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1427 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1428 if (m1_nr != 0 \|\| m1_nc != 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1429 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1430 /* Count num of nonzero elements */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1431 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1432 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1433 for (octave_idx_type i = 0; i < m1_nr; i++) \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1434 if ((m1.elem (i, j) != lhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1435 OP (m2.elem (i, j) != rhs_zero)) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1436 nel++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1437 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1438 r = SparseBoolMatrix (m1_nr, m1_nc, nel); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1439 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1440 octave_idx_type ii = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1441 r.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1442 for (octave_idx_type j = 0; j < m1_nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1443 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1444 for (octave_idx_type i = 0; i < m1_nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1445 { \
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1446 bool el = (m1.elem (i, j) != lhs_zero) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1447 OP (m2.elem (i, j) != rhs_zero); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1448 if (el) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1449 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1450 r.data (ii) = el; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1451 r.ridx (ii++) = i; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1452 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1453 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1454 r.cidx (j+1) = ii; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1455 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1456 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1457 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1458 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1459 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1460 if ((m1_nr != 0 \|\| m1_nc != 0) && (m2_nr != 0 \|\| m2_nc != 0)) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1461 octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1462 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1463 return r; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1464 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1465
25663 2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1466 #define SPARSE_SMM_BOOL_OPS(M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1467 SPARSE_SMM_BOOL_OP (mx_el_and, &&, M1, M2) \
2de707ae8de4 eliminate LHS_ZERO and RHS_ZERO args from sparse macros John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1468 SPARSE_SMM_BOOL_OP (mx_el_or, \|\|, M1, M2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1469
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1470 // Avoid some code duplication. Maybe we should use templates.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1471
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1472 #define SPARSE_CUMSUM(RET_TYPE, ELT_TYPE, FCN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1473 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1474 octave_idx_type nr = rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1475 octave_idx_type nc = cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1476 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1477 RET_TYPE retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1478 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1479 if (nr > 0 && nc > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1480 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1481 if ((nr == 1 && dim == -1) \|\| dim == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1482 /* Ugly!! Is there a better way? */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1483 retval = transpose (). FCN (0) .transpose (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1484 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1485 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1486 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1487 for (octave_idx_type i = 0; i < nc; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1488 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1489 ELT_TYPE t = ELT_TYPE (); \
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1490 for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1491 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1492 t += data (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1493 if (t != ELT_TYPE ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1494 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1495 if (j == cidx (i+1) - 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1496 nel += nr - ridx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1497 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1498 nel += ridx (j+1) - ridx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1499 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1500 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1501 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1502 retval = RET_TYPE (nr, nc, nel); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1503 retval.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1504 octave_idx_type ii = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1505 for (octave_idx_type i = 0; i < nc; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1506 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1507 ELT_TYPE t = ELT_TYPE (); \
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1508 for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1509 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1510 t += data (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1511 if (t != ELT_TYPE ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1512 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1513 if (j == cidx (i+1) - 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1514 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1515 for (octave_idx_type k = ridx (j); k < nr; k++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1516 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1517 retval.data (ii) = t; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1518 retval.ridx (ii++) = k; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1519 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1520 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1521 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1522 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1523 for (octave_idx_type k = ridx (j); k < ridx (j+1); k++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1524 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1525 retval.data (ii) = t; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1526 retval.ridx (ii++) = k; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1527 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1528 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1529 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1530 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1531 retval.cidx (i+1) = ii; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1532 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1533 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1534 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1535 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1536 retval = RET_TYPE (nr,nc); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1537 \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1538 return retval
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1539
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1540 #define SPARSE_CUMPROD(RET_TYPE, ELT_TYPE, FCN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1541 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1542 octave_idx_type nr = rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1543 octave_idx_type nc = cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1544 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1545 RET_TYPE retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1546 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1547 if (nr > 0 && nc > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1548 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1549 if ((nr == 1 && dim == -1) \|\| dim == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1550 /* Ugly!! Is there a better way? */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1551 retval = transpose (). FCN (0) .transpose (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1552 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1553 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1554 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1555 for (octave_idx_type i = 0; i < nc; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1556 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1557 octave_idx_type jj = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1558 for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1559 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1560 if (jj == ridx (j)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1561 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1562 nel++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1563 jj++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1564 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1565 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1566 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1567 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1568 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1569 retval = RET_TYPE (nr, nc, nel); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1570 retval.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1571 octave_idx_type ii = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1572 for (octave_idx_type i = 0; i < nc; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1573 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1574 ELT_TYPE t = ELT_TYPE (1.); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1575 octave_idx_type jj = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1576 for (octave_idx_type j = cidx (i); j < cidx (i+1); j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1577 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1578 if (jj == ridx (j)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1579 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1580 t *= data (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1581 retval.data (ii) = t; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1582 retval.ridx (ii++) = jj++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1583 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1584 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1585 break; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1586 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1587 retval.cidx (i+1) = ii; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1588 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1589 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1590 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1591 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1592 retval = RET_TYPE (nr,nc); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1593 \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1594 return retval
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1595
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1596 #define SPARSE_BASE_REDUCTION_OP(RET_TYPE, EL_TYPE, ROW_EXPR, COL_EXPR, \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1597 INIT_VAL, MT_RESULT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1598 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1599 octave_idx_type nr = rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1600 octave_idx_type nc = cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1601 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1602 RET_TYPE retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1603 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1604 if (nr > 0 && nc > 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1605 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1606 if ((nr == 1 && dim == -1) \|\| dim == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1607 { \
7269 3fade00a6ac7 [project @ 2007-12-07 19:26:20 by jwe] jwe parents: 7197 diff changeset	1608 /* Define j here to allow fancy definition for prod method */ \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1609 octave_idx_type j = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1610 OCTAVE_LOCAL_BUFFER (EL_TYPE, tmp, nr); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1611 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1612 for (octave_idx_type i = 0; i < nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1613 tmp[i] = INIT_VAL; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1614 for (j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1615 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1616 for (octave_idx_type i = cidx (j); i < cidx (j + 1); i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1617 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1618 ROW_EXPR; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1619 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1620 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1621 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1622 for (octave_idx_type i = 0; i < nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1623 if (tmp[i] != EL_TYPE ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1624 nel++; \
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1625 retval = RET_TYPE (nr, static_cast<octave_idx_type> (1), nel); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1626 retval.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1627 retval.cidx (1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1628 nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1629 for (octave_idx_type i = 0; i < nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1630 if (tmp[i] != EL_TYPE ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1631 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1632 retval.data (nel) = tmp[i]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1633 retval.ridx (nel++) = i; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1634 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1635 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1636 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1637 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1638 OCTAVE_LOCAL_BUFFER (EL_TYPE, tmp, nc); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1639 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1640 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1641 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1642 tmp[j] = INIT_VAL; \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1643 for (octave_idx_type i = cidx (j); i < cidx (j + 1); i++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1644 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1645 COL_EXPR; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1646 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1647 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1648 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1649 for (octave_idx_type i = 0; i < nc; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1650 if (tmp[i] != EL_TYPE ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1651 nel++; \
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1652 retval = RET_TYPE (static_cast<octave_idx_type> (1), nc, nel); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1653 retval.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1654 nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1655 for (octave_idx_type i = 0; i < nc; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1656 if (tmp[i] != EL_TYPE ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1657 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1658 retval.data (nel) = tmp[i]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1659 retval.ridx (nel++) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1660 retval.cidx (i+1) = retval.cidx (i) + 1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1661 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1662 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1663 retval.cidx (i+1) = retval.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1664 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1665 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1666 else if (nc == 0 && (nr == 0 \|\| (nr == 1 && dim == -1))) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1667 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1668 if (MT_RESULT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1669 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1670 retval = RET_TYPE (static_cast<octave_idx_type> (1), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1671 static_cast<octave_idx_type> (1), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1672 static_cast<octave_idx_type> (1)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1673 retval.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1674 retval.cidx (1) = 1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1675 retval.ridx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1676 retval.data (0) = MT_RESULT; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1677 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1678 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1679 retval = RET_TYPE (static_cast<octave_idx_type> (1), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1680 static_cast<octave_idx_type> (1), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1681 static_cast<octave_idx_type> (0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1682 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1683 else if (nr == 0 && (dim == 0 \|\| dim == -1)) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1684 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1685 if (MT_RESULT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1686 { \
7197 e1c865f21751 [project @ 2007-11-27 01:38:48 by jwe] jwe parents: 7017 diff changeset	1687 retval = RET_TYPE (static_cast<octave_idx_type> (1), nc, nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1688 retval.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1689 for (octave_idx_type i = 0; i < nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1690 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1691 retval.ridx (i) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1692 retval.cidx (i+1) = i+1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1693 retval.data (i) = MT_RESULT; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1694 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1695 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1696 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1697 retval = RET_TYPE (static_cast<octave_idx_type> (1), nc, \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1698 static_cast<octave_idx_type> (0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1699 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1700 else if (nc == 0 && dim == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1701 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1702 if (MT_RESULT) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1703 { \
7197 e1c865f21751 [project @ 2007-11-27 01:38:48 by jwe] jwe parents: 7017 diff changeset	1704 retval = RET_TYPE (nr, static_cast<octave_idx_type> (1), nr); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1705 retval.cidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1706 retval.cidx (1) = nr; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1707 for (octave_idx_type i = 0; i < nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1708 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1709 retval.ridx (i) = i; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1710 retval.data (i) = MT_RESULT; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1711 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1712 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1713 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1714 retval = RET_TYPE (nr, static_cast<octave_idx_type> (1), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1715 static_cast<octave_idx_type> (0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1716 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1717 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1718 retval.resize (nr > 0, nc > 0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1719 \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1720 return retval
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1721
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1722 #define SPARSE_REDUCTION_OP_ROW_EXPR(OP) \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1723 tmp[ridx (i)] OP data (i)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1724
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1725 #define SPARSE_REDUCTION_OP_COL_EXPR(OP) \
7269 3fade00a6ac7 [project @ 2007-12-07 19:26:20 by jwe] jwe parents: 7197 diff changeset	1726 tmp[j] OP data (i)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1727
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1728 #define SPARSE_REDUCTION_OP(RET_TYPE, EL_TYPE, OP, INIT_VAL, MT_RESULT) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1729 SPARSE_BASE_REDUCTION_OP (RET_TYPE, EL_TYPE, \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1730 SPARSE_REDUCTION_OP_ROW_EXPR (OP), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1731 SPARSE_REDUCTION_OP_COL_EXPR (OP), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1732 INIT_VAL, MT_RESULT)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1733
7350 288614c6634d [project @ 2008-01-07 16:50:34 by jwe] jwe parents: 7344 diff changeset	1734 // Don't break from this loop if the test succeeds because
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1735 // we are looping over the rows and not the columns in the inner loop.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1736 #define SPARSE_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1737 if (data (i) TEST_OP 0.0) \
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1738 tmp[ridx (i)] = TEST_TRUE_VAL;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1739
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1740 #define SPARSE_ANY_ALL_OP_COL_CODE(TEST_OP, TEST_TRUE_VAL) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1741 if (data (i) TEST_OP 0.0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1742 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1743 tmp[j] = TEST_TRUE_VAL; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1744 break; \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1745 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1746
7269 3fade00a6ac7 [project @ 2007-12-07 19:26:20 by jwe] jwe parents: 7197 diff changeset	1747 #define SPARSE_ANY_ALL_OP(DIM, INIT_VAL, MT_RESULT, TEST_OP, TEST_TRUE_VAL) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1748 SPARSE_BASE_REDUCTION_OP (SparseBoolMatrix, char, \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1749 SPARSE_ANY_ALL_OP_ROW_CODE (TEST_OP, TEST_TRUE_VAL), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1750 SPARSE_ANY_ALL_OP_COL_CODE (TEST_OP, TEST_TRUE_VAL), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1751 INIT_VAL, MT_RESULT)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1752
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1753 #define SPARSE_ALL_OP(DIM) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1754 if ((rows () == 1 && dim == -1) \|\| dim == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1755 return transpose (). all (0). transpose (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1756 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1757 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1758 SPARSE_ANY_ALL_OP (DIM, (cidx (j+1) - cidx (j) < nr ? false : true), \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1759 true, ==, false); \
7269 3fade00a6ac7 [project @ 2007-12-07 19:26:20 by jwe] jwe parents: 7197 diff changeset	1760 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1761
7269 3fade00a6ac7 [project @ 2007-12-07 19:26:20 by jwe] jwe parents: 7197 diff changeset	1762 #define SPARSE_ANY_OP(DIM) SPARSE_ANY_ALL_OP (DIM, false, false, !=, true)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1763
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1764 #define SPARSE_SPARSE_MUL(RET_TYPE, RET_EL_TYPE, EL_TYPE) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1765 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1766 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1767 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1768 octave_idx_type a_nr = a.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1769 octave_idx_type a_nc = a.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1770 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1771 if (nr == 1 && nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1772 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1773 RET_EL_TYPE s = m.elem (0,0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1774 octave_idx_type nz = a.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1775 RET_TYPE r (a_nr, a_nc, nz); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1776 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1777 for (octave_idx_type i = 0; i < nz; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1778 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1779 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1780 r.data (i) = s * a.data (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1781 r.ridx (i) = a.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1782 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1783 for (octave_idx_type i = 0; i < a_nc + 1; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1784 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1785 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1786 r.cidx (i) = a.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1787 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1788 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1789 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1790 return r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1791 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1792 else if (a_nr == 1 && a_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1793 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1794 RET_EL_TYPE s = a.elem (0,0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1795 octave_idx_type nz = m.nnz (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1796 RET_TYPE r (nr, nc, nz); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1797 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1798 for (octave_idx_type i = 0; i < nz; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1799 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1800 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1801 r.data (i) = m.data (i) * s; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1802 r.ridx (i) = m.ridx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1803 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1804 for (octave_idx_type i = 0; i < nc + 1; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1805 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1806 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1807 r.cidx (i) = m.cidx (i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1808 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1809 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1810 r.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1811 return r; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1812 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1813 else if (nc != a_nr) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1814 octave::err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1815 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1816 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1817 OCTAVE_LOCAL_BUFFER (octave_idx_type, w, nr); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1818 RET_TYPE retval (nr, a_nc, static_cast<octave_idx_type> (0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1819 for (octave_idx_type i = 0; i < nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1820 w[i] = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1821 retval.xcidx (0) = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1822 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1823 octave_idx_type nel = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1824 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1825 for (octave_idx_type i = 0; i < a_nc; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1826 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1827 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1828 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1829 octave_idx_type col = a.ridx (j); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1830 for (octave_idx_type k = m.cidx (col) ; k < m.cidx (col+1); k++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1831 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1832 if (w[m.ridx (k)] < i + 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1833 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1834 w[m.ridx (k)] = i + 1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1835 nel++; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1836 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1837 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1838 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1839 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1840 retval.xcidx (i+1) = nel; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1841 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1842 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1843 if (nel == 0) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1844 return RET_TYPE (nr, a_nc); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1845 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1846 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1847 for (octave_idx_type i = 0; i < nr; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1848 w[i] = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1849 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1850 OCTAVE_LOCAL_BUFFER (RET_EL_TYPE, Xcol, nr); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1851 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1852 retval.change_capacity (nel); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1853 /* The optimal break-point as estimated from simulations */ \
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1854 /* Note that Mergesort is O(nz log(nz)) while searching all */ \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1855 /* values is O(nr), where nz here is nonzero per row of */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1856 /* length nr. The test itself was then derived from the */ \
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1857 /* simulation with random square matrices and the observation */ \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1858 /* of the number of nonzero elements in the output matrix */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1859 /* it was found that the breakpoints were */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1860 /* nr: 500 1000 2000 5000 10000 */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1861 /* nz: 6 25 97 585 2202 */ \
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1862 /* The below is a simplication of the 'polyfit'-ed parameters */ \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1863 /* to these breakpoints */ \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1864 octave_idx_type n_per_col = (a_nc > 43000 ? 43000 : \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1865 (a_nc * a_nc) / 43000); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1866 octave_idx_type ii = 0; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1867 octave_idx_type *ri = retval.xridx (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1868 octave_sort<octave_idx_type> sort; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1869 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1870 for (octave_idx_type i = 0; i < a_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1871 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1872 if (retval.xcidx (i+1) - retval.xcidx (i) > n_per_col) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1873 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1874 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1875 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1876 octave_idx_type col = a.ridx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1877 EL_TYPE tmpval = a.data (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1878 for (octave_idx_type k = m.cidx (col) ; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1879 k < m.cidx (col+1); k++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1880 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1881 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1882 octave_idx_type row = m.ridx (k); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1883 if (w[row] < i + 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1884 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1885 w[row] = i + 1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1886 Xcol[row] = tmpval * m.data (k); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1887 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1888 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1889 Xcol[row] += tmpval * m.data (k); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1890 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1891 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1892 for (octave_idx_type k = 0; k < nr; k++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1893 if (w[k] == i + 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1894 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1895 retval.xdata (ii) = Xcol[k]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1896 retval.xridx (ii++) = k; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1897 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1898 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1899 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1900 { \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1901 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1902 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1903 octave_idx_type col = a.ridx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1904 EL_TYPE tmpval = a.data (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1905 for (octave_idx_type k = m.cidx (col) ; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1906 k < m.cidx (col+1); k++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1907 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1908 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1909 octave_idx_type row = m.ridx (k); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1910 if (w[row] < i + 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1911 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1912 w[row] = i + 1; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1913 retval.xridx (ii++) = row; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1914 Xcol[row] = tmpval * m.data (k); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1915 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1916 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1917 Xcol[row] += tmpval * m.data (k); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1918 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1919 } \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1920 sort.sort (ri + retval.xcidx (i), ii - retval.xcidx (i)); \
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1921 for (octave_idx_type k = retval.xcidx (i); k < ii; k++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1922 retval.xdata (k) = Xcol[retval.xridx (k)]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1923 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1924 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1925 retval.maybe_compress (true); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1926 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1927 } \
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1928 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1929
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1930 #define SPARSE_FULL_MUL(RET_TYPE, EL_TYPE) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1931 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1932 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1933 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1934 octave_idx_type a_nr = a.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1935 octave_idx_type a_nc = a.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1936 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1937 if (nr == 1 && nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1938 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1939 RET_TYPE retval = m.elem (0,0) * a; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1940 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1941 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1942 else if (nc != a_nr) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1943 octave::err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1944 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1945 { \
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1946 RET_TYPE::element_type zero = RET_TYPE::element_type (); \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1947 \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1948 RET_TYPE retval (nr, a_nc, zero); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1949 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1950 for (octave_idx_type i = 0; i < a_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1951 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1952 for (octave_idx_type j = 0; j < a_nr; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1953 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1954 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1955 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1956 EL_TYPE tmpval = a.elem (j,i); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1957 for (octave_idx_type k = m.cidx (j) ; k < m.cidx (j+1); k++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1958 retval.elem (m.ridx (k),i) += tmpval * m.data (k); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1959 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1960 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1961 return retval; \
7802 1a446f28ce68 implement optimized sparse-dense transposed multiplication Jaroslav Hajek <highegg@gmail.com> parents: 7350 diff changeset	1962 }
1a446f28ce68 implement optimized sparse-dense transposed multiplication Jaroslav Hajek <highegg@gmail.com> parents: 7350 diff changeset	1963
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1964 #define SPARSE_FULL_TRANS_MUL(RET_TYPE, EL_TYPE, CONJ_OP) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1965 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1966 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1967 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1968 octave_idx_type a_nr = a.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1969 octave_idx_type a_nc = a.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1970 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1971 if (nr == 1 && nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1972 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1973 RET_TYPE retval = CONJ_OP (m.elem (0,0)) * a; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1974 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1975 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1976 else if (nr != a_nr) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1977 octave::err_nonconformant ("operator *", nc, nr, a_nr, a_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1978 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1979 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1980 RET_TYPE retval (nc, a_nc); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1981 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1982 for (octave_idx_type i = 0; i < a_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1983 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1984 for (octave_idx_type j = 0; j < nc; j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1985 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1986 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1987 \
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1988 EL_TYPE acc = EL_TYPE (); \
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1989 for (octave_idx_type k = m.cidx (j) ; k < m.cidx (j+1); k++) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1990 acc += a.elem (m.ridx (k),i) * CONJ_OP (m.data (k)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1991 retval.xelem (j,i) = acc; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1992 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1993 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1994 return retval; \
5429 2042301733ce [project @ 2005-08-25 12:21:24 by dbateman] dbateman parents: 5307 diff changeset	1995 }
2042301733ce [project @ 2005-08-25 12:21:24 by dbateman] dbateman parents: 5307 diff changeset	1996
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	1997 #define FULL_SPARSE_MUL(RET_TYPE, EL_TYPE) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1998 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1999 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2000 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2001 octave_idx_type a_nr = a.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2002 octave_idx_type a_nc = a.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2003 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2004 if (a_nr == 1 && a_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2005 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2006 RET_TYPE retval = m * a.elem (0,0); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2007 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2008 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2009 else if (nc != a_nr) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2010 octave::err_nonconformant ("operator *", nr, nc, a_nr, a_nc); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2011 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2012 { \
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	2013 RET_TYPE::element_type zero = RET_TYPE::element_type (); \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	2014 \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	2015 RET_TYPE retval (nr, a_nc, zero); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2016 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2017 for (octave_idx_type i = 0; i < a_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2018 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2019 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2020 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2021 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2022 octave_idx_type col = a.ridx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2023 EL_TYPE tmpval = a.data (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2024 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2025 for (octave_idx_type k = 0 ; k < nr; k++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2026 retval.xelem (k,i) += tmpval * m.elem (k,col); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2027 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2028 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2029 return retval; \
7802 1a446f28ce68 implement optimized sparse-dense transposed multiplication Jaroslav Hajek <highegg@gmail.com> parents: 7350 diff changeset	2030 }
1a446f28ce68 implement optimized sparse-dense transposed multiplication Jaroslav Hajek <highegg@gmail.com> parents: 7350 diff changeset	2031
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	2032 #define FULL_SPARSE_MUL_TRANS(RET_TYPE, EL_TYPE, CONJ_OP) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2033 octave_idx_type nr = m.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2034 octave_idx_type nc = m.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2035 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2036 octave_idx_type a_nr = a.rows (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2037 octave_idx_type a_nc = a.cols (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2038 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2039 if (a_nr == 1 && a_nc == 1) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2040 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2041 RET_TYPE retval = m * CONJ_OP (a.elem (0,0)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2042 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2043 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2044 else if (nc != a_nc) \
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2045 octave::err_nonconformant ("operator *", nr, nc, a_nc, a_nr); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2046 else \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2047 { \
25665 dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	2048 RET_TYPE::element_type zero = RET_TYPE::element_type (); \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	2049 \
dc073ccde64e eliminate more zero args in macros and type definitions for operators John W. Eaton <jwe@octave.org> parents: 25664 diff changeset	2050 RET_TYPE retval (nr, a_nr, zero); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2051 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2052 for (octave_idx_type i = 0; i < a_nc ; i++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2053 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2054 octave_quit (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2055 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2056 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2057 octave_idx_type col = a.ridx (j); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2058 EL_TYPE tmpval = CONJ_OP (a.data (j)); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2059 for (octave_idx_type k = 0 ; k < nr; k++) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2060 retval.xelem (k,col) += tmpval * m.elem (k,i); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2061 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2062 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2063 return retval; \
5429 2042301733ce [project @ 2005-08-25 12:21:24 by dbateman] dbateman parents: 5307 diff changeset	2064 }
2042301733ce [project @ 2005-08-25 12:21:24 by dbateman] dbateman parents: 5307 diff changeset	2065
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2066 #endif

Mercurial > octave

annotate liboctave/operators/Sparse-op-defs.h @ 27919:1891570abac8