octave-nkf: liboctave/array/MSparse.h annotate

annotate liboctave/array/MSparse.h @ 20603:f61c67865d9f

Don't return A for inv (A) when A is a singular Diagonal matrix (bug #46103). * dDiagMatrix.cc (inverse), fDiagMatrix.cc (inverse): return octave_Inf for the inverse of a diagonal element whose value is 0. * test/diag-perm.tst: Add tests for new behavior.

author	Rik <rik@octave.org>
date	Wed, 07 Oct 2015 07:41:44 -0700
parents	2aa4fb60ae77
children

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
19731 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 17769 diff changeset	3 Copyright (C) 2004-2015 David Bateman
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10785 diff changeset	4 Copyright (C) 1998-2004 Andy Adler
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6823 diff changeset	5
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6823 diff changeset	6 This file is part of Octave.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	7
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6823 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6823 diff changeset	11 option) any later version.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	12
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	16 for more details.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	17
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	18 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: 6823 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6823 diff changeset	20 <http://www.gnu.org/licenses/>.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	21
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	22 */
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	23
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	24 #if !defined (octave_MSparse_h)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	25 #define octave_MSparse_h 1
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	26
20541 2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	27 #ifdef HAVE_CONFIG_H
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	28 #include <config.h>
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	29 #endif
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	30
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	31 #include <functional>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	32
20541 2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	33 #include "quit.h"
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	34 #include "lo-error.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	35 #include "Sparse.h"
20541 2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	36 #include "MArray.h"
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	37 #include "Array-util.h"
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	38
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	39
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	40 // Two dimensional sparse array with math ops.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	41 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	42 class
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	43 MSparse : public Sparse<T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	44 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	45 public:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	46
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	47 MSparse (void) : Sparse<T> () { }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	48
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	49 MSparse (octave_idx_type n, octave_idx_type m) : Sparse<T> (n, m) { }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	50
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	51 MSparse (const dim_vector& dv, octave_idx_type nz = 0)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	52 : Sparse<T> (dv, nz) { }
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: 6708 diff changeset	53
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	54 MSparse (const MSparse<T>& a) : Sparse<T> (a) { }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	55
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	56 MSparse (const MSparse<T>& a, const dim_vector& dv) : Sparse<T> (a, dv) { }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	57
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	58 MSparse (const Sparse<T>& a) : Sparse<T> (a) { }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	59
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	60 template <class U>
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	61 MSparse (const Sparse<U>& a) : Sparse<T> (a) { }
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	62
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	63 MSparse (const Array<T>& a, const idx_vector& r, const idx_vector& c,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	64 octave_idx_type nr = -1, octave_idx_type nc = -1,
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10516 diff changeset	65 bool sum_terms = true, octave_idx_type nzm = -1)
b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10516 diff changeset	66 : Sparse<T> (a, r, c, nr, nc, sum_terms, nzm) { }
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	67
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	68 explicit MSparse (octave_idx_type r, octave_idx_type c, T val)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	69 : Sparse<T> (r, c, val) { }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	70
13030 b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	71 explicit MSparse (const PermMatrix& a) : Sparse<T>(a) { }
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	72
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	73 MSparse (octave_idx_type r, octave_idx_type c, octave_idx_type num_nz)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	74 : Sparse<T> (r, c, num_nz) { }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	75
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	76 ~MSparse (void) { }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	77
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	78 MSparse<T>& operator = (const MSparse<T>& a)
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	79 {
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	80 Sparse<T>::operator = (a);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	81 return *this;
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	82 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	83
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	84 MSparse<T>& insert (const Sparse<T>& a, octave_idx_type r, octave_idx_type c)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	85 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	86 Sparse<T>::insert (a, r, c);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	87 return *this;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	88 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	89
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: 6708 diff changeset	90 MSparse<T>& insert (const Sparse<T>& a, const Array<octave_idx_type>& indx)
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: 6708 diff changeset	91 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: 6708 diff changeset	92 Sparse<T>::insert (a, indx);
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: 6708 diff changeset	93 return *this;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: 6708 diff changeset	94 }
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: 6708 diff changeset	95
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	96 MSparse<T> transpose (void) const { return Sparse<T>::transpose (); }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	97
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	98 MSparse<T> squeeze (void) const { return Sparse<T>::squeeze (); }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	99
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	100 MSparse<T> reshape (const dim_vector& new_dims) const
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	101 { return Sparse<T>::reshape (new_dims); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	102
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	103 MSparse<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	104 { return Sparse<T>::permute (vec, inv); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	105
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	106 MSparse<T> ipermute (const Array<octave_idx_type>& vec) const
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	107 { return Sparse<T>::ipermute (vec); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	108
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7602 diff changeset	109 MSparse<T> diag (octave_idx_type k = 0) const
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7602 diff changeset	110 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7602 diff changeset	111 return Sparse<T>::diag (k);
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7602 diff changeset	112 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7602 diff changeset	113
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	114 // FIXME: should go away.
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	115 template <class U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	116 MSparse<U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	117 map (U (&fcn) (T)) const
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	118 { return Sparse<T>::template map<U> (fcn); }
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	119
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	120 template <class U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	121 MSparse<U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	122 map (U (&fcn) (const T&)) const
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	123 { return Sparse<T>::template map<U> (fcn); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	124 };
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	125
20541 2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	126 // Include operator templates for MSparse
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	127 #include "MSparse.cc"
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	128
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	129 // A macro that can be used to declare and instantiate OP= operators.
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	130 #define SPARSE_OP_ASSIGN_DECL(T, OP, API) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	131 template API MSparse<T>& \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	132 operator OP (MSparse<T>&, const MSparse<T>&)
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	133
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	134 // A macro that can be used to declare and instantiate unary operators.
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	135 #define SPARSE_UNOP_DECL(T, OP, API) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	136 template API MSparse<T> \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	137 operator OP (const MSparse<T>&)
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	138
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	139 // A macro that can be used to declare and instantiate binary operators.
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	140 #define SPARSE_BINOP_DECL(A_T, T, F, API, X_T, Y_T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	141 template API A_T<T> \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	142 F (const X_T&, const Y_T&)
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	143
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	144 // A function that can be used to forward OP= operations from derived
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	145 // classes back to us.
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	146 #define SPARSE_OP_ASSIGN_FWD_FCN(R, F, T, C_X, X_T, C_Y, Y_T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	147 inline R \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	148 F (X_T& x, const Y_T& y) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	149 { \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	150 return R (F (C_X (x), C_Y (y))); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	151 }
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	152
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	153 // A function that can be used to forward unary operations from derived
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	154 // classes back to us.
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	155 #define SPARSE_UNOP_FWD_FCN(R, F, T, C_X, X_T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	156 inline R \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	157 F (const X_T& x) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	158 { \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	159 return R (F (C_X (x))); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	160 }
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	161
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	162 // A function that can be used to forward binary operations from derived
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	163 // classes back to us.
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	164 #define SPARSE_BINOP_FWD_FCN(R, F, T, C_X, X_T, C_Y, Y_T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	165 inline R \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	166 F (const X_T& x, const Y_T& y) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	167 { \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	168 return R (F (C_X (x), C_Y (y))); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	169 }
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	170
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	171 // Instantiate all the MSparse friends for MSparse element type T.
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	172 #define INSTANTIATE_SPARSE_FRIENDS(T, API) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	173 SPARSE_OP_ASSIGN_DECL (T, +=, API); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	174 SPARSE_OP_ASSIGN_DECL (T, -=, API); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	175 SPARSE_UNOP_DECL (T, +, API); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	176 SPARSE_UNOP_DECL (T, -, API); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	177 SPARSE_BINOP_DECL (MArray, T, operator +, API, MSparse<T>, T); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	178 SPARSE_BINOP_DECL (MArray, T, operator -, API, MSparse<T>, T); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	179 SPARSE_BINOP_DECL (MSparse, T, operator *, API, MSparse<T>, T); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	180 SPARSE_BINOP_DECL (MSparse, T, operator /, API, MSparse<T>, T); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	181 SPARSE_BINOP_DECL (MArray, T, operator +, API, T, MSparse<T>); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	182 SPARSE_BINOP_DECL (MArray, T, operator -, API, T, MSparse<T>); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	183 SPARSE_BINOP_DECL (MSparse, T, operator *, API, T, MSparse<T>); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	184 SPARSE_BINOP_DECL (MSparse, T, operator /, API, T, MSparse<T>); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	185 SPARSE_BINOP_DECL (MSparse, T, operator +, API, MSparse<T>, MSparse<T>); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	186 SPARSE_BINOP_DECL (MSparse, T, operator -, API, MSparse<T>, MSparse<T>); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	187 SPARSE_BINOP_DECL (MSparse, T, quotient, API, MSparse<T>, MSparse<T>); \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	188 SPARSE_BINOP_DECL (MSparse, T, product, API, MSparse<T>, MSparse<T>);
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	189
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	190 // Define all the MSparse forwarding functions for return type R and
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	191 // MSparse element type T
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	192 #define SPARSE_FORWARD_DEFS(B, R, F, T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	193 SPARSE_OP_ASSIGN_FWD_FCN \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	194 (R, operator +=, T, dynamic_cast<B<T>&>, R, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	195 SPARSE_OP_ASSIGN_FWD_FCN \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	196 (R, operator -=, T, dynamic_cast<B<T>&>, R, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	197 SPARSE_UNOP_FWD_FCN (R, operator +, T, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	198 SPARSE_UNOP_FWD_FCN (R, operator -, T, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	199 SPARSE_BINOP_FWD_FCN (F, operator +, T, dynamic_cast<const B<T>&>, R, , T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	200 SPARSE_BINOP_FWD_FCN (F, operator -, T, dynamic_cast<const B<T>&>, R, , T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	201 SPARSE_BINOP_FWD_FCN (R, operator *, T, dynamic_cast<const B<T>&>, R, , T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	202 SPARSE_BINOP_FWD_FCN (R, operator /, T, dynamic_cast<const B<T>&>, R, , T) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	203 SPARSE_BINOP_FWD_FCN (F, operator +, T, , T, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	204 SPARSE_BINOP_FWD_FCN (F, operator -, T, , T, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	205 SPARSE_BINOP_FWD_FCN (R, operator *, T, , T, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	206 SPARSE_BINOP_FWD_FCN (R, operator /, T, , T, dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	207 SPARSE_BINOP_FWD_FCN \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	208 (R, operator +, T, dynamic_cast<const B<T>&>, R, \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	209 dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	210 SPARSE_BINOP_FWD_FCN \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	211 (R, operator -, T, dynamic_cast<const B<T>&>, R, \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	212 dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	213 SPARSE_BINOP_FWD_FCN \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	214 (R, product, T, dynamic_cast<const B<T>&>, R, \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	215 dynamic_cast<const B<T>&>, R) \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	216 SPARSE_BINOP_FWD_FCN \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	217 (R, quotient, T, dynamic_cast<const B<T>&>, R, \
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	218 dynamic_cast<const B<T>&>, R)
2aa4fb60ae77 MSparse code simplification by macro removal without reduction of functionality. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19731 diff changeset	219
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	220 #endif

Mercurial > octave-nkf

annotate liboctave/array/MSparse.h @ 20603:f61c67865d9f