annotate liboctave/sparse-dmsolve.cc @ 6469:a848b846cb3a ss-2-9-10

[project @ 2007-03-27 18:42:11 by jwe]
author jwe
date Tue, 27 Mar 2007 18:42:11 +0000
parents 11fcab4c461d
children be176b7e110a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
1 /*
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
2
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
3 Copyright (C) 2006 David Bateman
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
4
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
5 Octave is free software; you can redistribute it and/or modify it
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
6 under the terms of the GNU General Public License as published by the
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
7 Free Software Foundation; either version 2, or (at your option) any
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
8 later version.
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
9
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
10 Octave is distributed in the hope that it will be useful, but WITHOUT
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
13 for more details.
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
14
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
16 along with this program; see the file COPYING. If not, write to the
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
18 Boston, MA 02110-1301, USA.
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
19
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
20 */
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
21
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
22 #ifdef HAVE_CONFIG_H
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
23 #include <config.h>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
24 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
25
5797
11fcab4c461d [project @ 2006-05-09 06:15:17 by dbateman]
dbateman
parents: 5794
diff changeset
26 #include <vector>
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5792
diff changeset
27
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
28 #include "MArray2.h"
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
29 #include "MSparse.h"
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
30 #include "SparseQR.h"
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
31 #include "SparseCmplxQR.h"
5785
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman]
dbateman
parents: 5775
diff changeset
32 #include "MatrixType.h"
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
33 #include "oct-sort.h"
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
34
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
35 template <class T>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
36 static MSparse<T>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
37 dmsolve_extract (const MSparse<T> &A, const octave_idx_type *Pinv,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
38 const octave_idx_type *Q, octave_idx_type rst,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
39 octave_idx_type rend, octave_idx_type cst,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
40 octave_idx_type cend, octave_idx_type maxnz = -1,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
41 bool lazy = false)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
42 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
43 octave_idx_type nz = (rend - rst) * (cend - cst);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
44 maxnz = (maxnz < 0 ? A.nnz () : maxnz);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
45 MSparse<T> B (rend - rst, cend - cst, (nz < maxnz ? nz : maxnz));
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
46 // Some sparse functions can support lazy indexing (where elements
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
47 // in the row are in no particular order), even though octave in
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
48 // general can't. For those functions that can using it is a big
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
49 // win here in terms of speed.
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
50 if (lazy)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
51 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
52 nz = 0;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
53 for (octave_idx_type j = cst ; j < cend ; j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
54 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
55 octave_idx_type qq = (Q ? Q [j] : j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
56 B.xcidx (j - cst) = nz;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
57 for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
58 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
59 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
60 octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p));
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
61 if (r >= rst && r < rend)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
62 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
63 B.xdata (nz) = A.data (p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
64 B.xridx (nz++) = r - rst ;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
65 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
66 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
67 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
68 B.xcidx (cend - cst) = nz ;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
69 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
70 else
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
71 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
72 OCTAVE_LOCAL_BUFFER (T, X, rend - rst);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
73 octave_sort<octave_idx_type> sort;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
74 octave_idx_type *ri = B.xridx();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
75 nz = 0;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
76 for (octave_idx_type j = cst ; j < cend ; j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
77 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
78 octave_idx_type qq = (Q ? Q [j] : j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
79 B.xcidx (j - cst) = nz;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
80 for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
81 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
82 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
83 octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p));
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
84 if (r >= rst && r < rend)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
85 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
86 X [r-rst] = A.data (p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
87 B.xridx (nz++) = r - rst ;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
88 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
89 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
90 sort.sort (ri + B.xcidx (j - cst), nz - B.xcidx (j - cst));
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
91 for (octave_idx_type p = B.cidx (j - cst); p < nz; p++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
92 B.xdata (p) = X [B.xridx (p)];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
93 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
94 B.xcidx (cend - cst) = nz ;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
95 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
96
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
97 return B;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
98 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
99
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
100 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
101 static MSparse<double>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
102 dmsolve_extract (const MSparse<double> &A, const octave_idx_type *Pinv,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
103 const octave_idx_type *Q, octave_idx_type rst,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
104 octave_idx_type rend, octave_idx_type cst,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
105 octave_idx_type cend, octave_idx_type maxnz,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
106 bool lazy);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
107
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
108 static MSparse<Complex>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
109 dmsolve_extract (const MSparse<Complex> &A, const octave_idx_type *Pinv,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
110 const octave_idx_type *Q, octave_idx_type rst,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
111 octave_idx_type rend, octave_idx_type cst,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
112 octave_idx_type cend, octave_idx_type maxnz,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
113 bool lazy);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
114 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
115
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
116 template <class T>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
117 static MArray2<T>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
118 dmsolve_extract (const MArray2<T> &m, const octave_idx_type *,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
119 const octave_idx_type *, octave_idx_type r1,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
120 octave_idx_type r2, octave_idx_type c1,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
121 octave_idx_type c2)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
122 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
123 r2 -= 1;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
124 c2 -= 1;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
125 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
126 if (c1 > c2) { octave_idx_type tmp = c1; c1 = c2; c2 = tmp; }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
127
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
128 octave_idx_type new_r = r2 - r1 + 1;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
129 octave_idx_type new_c = c2 - c1 + 1;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
130
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
131 MArray2<T> result (new_r, new_c);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
132
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
133 for (octave_idx_type j = 0; j < new_c; j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
134 for (octave_idx_type i = 0; i < new_r; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
135 result.xelem (i, j) = m.elem (r1+i, c1+j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
136
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
137 return result;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
138 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
139
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
140 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
141 static MArray2<double>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
142 dmsolve_extract (const MArray2<double> &m, const octave_idx_type *,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
143 const octave_idx_type *, octave_idx_type r1,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
144 octave_idx_type r2, octave_idx_type c1,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
145 octave_idx_type c2)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
146
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
147 static MArray2<Complex>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
148 dmsolve_extract (const MArray2<Complex> &m, const octave_idx_type *,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
149 const octave_idx_type *, octave_idx_type r1,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
150 octave_idx_type r2, octave_idx_type c1,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
151 octave_idx_type c2)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
152 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
153
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
154 template <class T>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
155 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
156 dmsolve_insert (MArray2<T> &a, const MArray2<T> &b, const octave_idx_type *Q,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
157 octave_idx_type r, octave_idx_type c)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
158 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
159 T *ax = a.fortran_vec();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
160 const T *bx = b.fortran_vec();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
161 octave_idx_type anr = a.rows();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
162 octave_idx_type nr = b.rows();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
163 octave_idx_type nc = b.cols();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
164 for (octave_idx_type j = 0; j < nc; j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
165 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
166 octave_idx_type aoff = (c + j) * anr;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
167 octave_idx_type boff = j * nr;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
168 for (octave_idx_type i = 0; i < nr; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
169 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
170 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
171 ax [Q [r + i] + aoff] = bx [i + boff];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
172 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
173 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
174 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
175
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
176 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
177 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
178 dmsolve_insert (MArray2<double> &a, const MArray2<double> &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
179 const octave_idx_type *Q, octave_idx_type r, octave_idx_type c);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
180
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
181 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
182 dmsolve_insert (MArray2<Complex> &a, const MArray2<Complex> &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
183 const octave_idx_type *Q, octave_idx_type r, octave_idx_type c);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
184 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
185
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
186 template <class T>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
187 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
188 dmsolve_insert (MSparse<T> &a, const MSparse<T> &b, const octave_idx_type *Q,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
189 octave_idx_type r, octave_idx_type c)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
190 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
191 octave_idx_type b_rows = b.rows ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
192 octave_idx_type b_cols = b.cols ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
193 octave_idx_type nr = a.rows ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
194 octave_idx_type nc = a.cols ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
195
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
196 OCTAVE_LOCAL_BUFFER (octave_idx_type, Qinv, nr);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
197 for (octave_idx_type i = 0; i < nr; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
198 Qinv [Q [i]] = i;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
199
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
200 // First count the number of elements in the final array
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
201 octave_idx_type nel = a.xcidx(c) + b.nnz ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
202
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
203 if (c + b_cols < nc)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
204 nel += a.xcidx(nc) - a.xcidx(c + b_cols);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
205
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
206 for (octave_idx_type i = c; i < c + b_cols; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
207 for (octave_idx_type j = a.xcidx(i); j < a.xcidx(i+1); j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
208 if (Qinv [a.xridx(j)] < r || Qinv [a.xridx(j)] >= r + b_rows)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
209 nel++;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
210
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
211 OCTAVE_LOCAL_BUFFER (T, X, nr);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
212 octave_sort<octave_idx_type> sort;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
213 MSparse<T> tmp (a);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
214 a = MSparse<T> (nr, nc, nel);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
215 octave_idx_type *ri = a.xridx();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
216
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
217 for (octave_idx_type i = 0; i < tmp.cidx(c); i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
218 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
219 a.xdata(i) = tmp.xdata(i);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
220 a.xridx(i) = tmp.xridx(i);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
221 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
222 for (octave_idx_type i = 0; i < c + 1; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
223 a.xcidx(i) = tmp.xcidx(i);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
224
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
225 octave_idx_type ii = a.xcidx(c);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
226
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
227 for (octave_idx_type i = c; i < c + b_cols; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
228 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
229 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
230
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
231 for (octave_idx_type j = tmp.xcidx(i); j < tmp.xcidx(i+1); j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
232 if (Qinv [tmp.xridx(j)] < r || Qinv [tmp.xridx(j)] >= r + b_rows)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
233 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
234 X [tmp.xridx(j)] = tmp.xdata(j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
235 a.xridx(ii++) = tmp.xridx(j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
236 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
237
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
238 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
239
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
240 for (octave_idx_type j = b.cidx(i-c); j < b.cidx(i-c+1); j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
241 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
242 X [Q [r + b.ridx(j)]] = b.data(j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
243 a.xridx(ii++) = Q [r + b.ridx(j)];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
244 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
245
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
246 sort.sort (ri + a.xcidx (i), ii - a.xcidx (i));
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
247 for (octave_idx_type p = a.xcidx (i); p < ii; p++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
248 a.xdata (p) = X [a.xridx (p)];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
249 a.xcidx(i+1) = ii;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
250 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
251
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
252 for (octave_idx_type i = c + b_cols; i < nc; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
253 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
254 for (octave_idx_type j = tmp.xcidx(i); j < tmp.cidx(i+1); j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
255 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
256 a.xdata(ii) = tmp.xdata(j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
257 a.xridx(ii++) = tmp.xridx(j);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
258 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
259 a.xcidx(i+1) = ii;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
260 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
261 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
262
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
263 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
264 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
265 dmsolve_insert (MSparse<double> &a, const SparseMatrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
266 const octave_idx_type *Q, octave_idx_type r, octave_idx_type c);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
267
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
268 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
269 dmsolve_insert (MSparse<Complex> &a, const MSparse<Complex> &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
270 const octave_idx_type *Q, octave_idx_type r, octave_idx_type c);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
271 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
272
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
273 template <class T, class RT>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
274 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
275 dmsolve_permute (MArray2<RT> &a, const MArray2<T>& b, const octave_idx_type *p)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
276 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
277 octave_idx_type b_nr = b.rows ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
278 octave_idx_type b_nc = b.cols ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
279 const T *Bx = b.fortran_vec();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
280 a.resize(b_nr, b_nc);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
281 RT *Btx = a.fortran_vec();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
282 for (octave_idx_type j = 0; j < b_nc; j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
283 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
284 octave_idx_type off = j * b_nr;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
285 for (octave_idx_type i = 0; i < b_nr; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
286 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
287 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
288 Btx [p [i] + off] = Bx [ i + off];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
289 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
290 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
291 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
292
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
293 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
294 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
295 dmsolve_permute (MArray2<double> &a, const MArray2<double>& b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
296 const octave_idx_type *p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
297
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
298 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
299 dmsolve_permute (MArray2<Complex> &a, const MArray2<double>& b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
300 const octave_idx_type *p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
301
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
302 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
303 dmsolve_permute (MArray2<Complex> &a, const MArray2<Complex>& b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
304 const octave_idx_type *p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
305 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
306
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
307 template <class T, class RT>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
308 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
309 dmsolve_permute (MSparse<RT> &a, const MSparse<T>& b, const octave_idx_type *p)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
310 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
311 octave_idx_type b_nr = b.rows ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
312 octave_idx_type b_nc = b.cols ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
313 octave_idx_type b_nz = b.nnz ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
314 octave_idx_type nz = 0;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
315 a = MSparse<RT> (b_nr, b_nc, b_nz);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
316 octave_sort<octave_idx_type> sort;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
317 octave_idx_type *ri = a.xridx();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
318 OCTAVE_LOCAL_BUFFER (RT, X, b_nr);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
319 a.xcidx(0) = 0;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
320 for (octave_idx_type j = 0; j < b_nc; j++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
321 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
322 for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
323 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
324 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
325 octave_idx_type r = p [b.ridx (i)];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
326 X [r] = b.data (i);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
327 a.xridx(nz++) = p [b.ridx (i)];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
328 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
329 sort.sort (ri + a.xcidx (j), nz - a.xcidx (j));
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
330 for (octave_idx_type i = a.cidx (j); i < nz; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
331 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
332 OCTAVE_QUIT;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
333 a.xdata (i) = X [a.xridx (i)];
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
334 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
335 a.xcidx(j+1) = nz;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
336 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
337 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
338
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
339 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
340 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
341 dmsolve_permute (MSparse<double> &a, const MSparse<double>& b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
342 const octave_idx_type *p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
343
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
344 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
345 dmsolve_permute (MSparse<Complex> &a, const MSparse<double>& b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
346 const octave_idx_type *p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
347
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
348 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
349 dmsolve_permute (MSparse<Complex> &a, const MSparse<Complex>& b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
350 const octave_idx_type *p);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
351 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
352
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
353 static void
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
354 solve_singularity_warning (double)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
355 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
356 // Dummy singularity handler so that LU solver doesn't flag
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
357 // an error for numerically rank defficient matrices
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
358 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
359
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
360 template <class RT, class ST, class T>
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
361 RT
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
362 dmsolve (const ST &a, const T &b, octave_idx_type &info)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
363 {
5684
f39adfd0913d [project @ 2006-03-16 18:12:01 by dbateman]
dbateman
parents: 5683
diff changeset
364 #ifdef HAVE_CXSPARSE
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
365 octave_idx_type nr = a.rows ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
366 octave_idx_type nc = a.cols ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
367 octave_idx_type b_nr = b.rows ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
368 octave_idx_type b_nc = b.cols ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
369 RT retval;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
370
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
371 if (nr < 1 || nc < 1 || nr != b_nr)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
372 (*current_liboctave_error_handler)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
373 ("matrix dimension mismatch in solution of minimum norm problem");
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
374 else
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
375 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
376 octave_idx_type nnz_remaining = a.nnz ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
377 CXSPARSE_DNAME () csm;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
378 csm.m = nr;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
379 csm.n = nc;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
380 csm.x = NULL;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
381 csm.nz = -1;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
382 csm.nzmax = a.nnz ();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
383 // Cast away const on A, with full knowledge that CSparse won't touch it.
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
384 // Prevents the methods below making a copy of the data.
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
385 csm.p = const_cast<octave_idx_type *>(a.cidx ());
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
386 csm.i = const_cast<octave_idx_type *>(a.ridx ());
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
387
5792
eb90c83b4f91 [project @ 2006-05-04 20:14:49 by dbateman]
dbateman
parents: 5785
diff changeset
388 #if defined(CS_VER) && (CS_VER >= 2)
eb90c83b4f91 [project @ 2006-05-04 20:14:49 by dbateman]
dbateman
parents: 5785
diff changeset
389 CXSPARSE_DNAME (d) *dm = CXSPARSE_DNAME(_dmperm) (&csm, 0);
eb90c83b4f91 [project @ 2006-05-04 20:14:49 by dbateman]
dbateman
parents: 5785
diff changeset
390 octave_idx_type *p = dm->p;
eb90c83b4f91 [project @ 2006-05-04 20:14:49 by dbateman]
dbateman
parents: 5785
diff changeset
391 octave_idx_type *q = dm->q;
eb90c83b4f91 [project @ 2006-05-04 20:14:49 by dbateman]
dbateman
parents: 5785
diff changeset
392 #else
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
393 CXSPARSE_DNAME (d) *dm = CXSPARSE_DNAME(_dmperm) (&csm);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
394 octave_idx_type *p = dm->P;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
395 octave_idx_type *q = dm->Q;
5792
eb90c83b4f91 [project @ 2006-05-04 20:14:49 by dbateman]
dbateman
parents: 5785
diff changeset
396 #endif
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
397 OCTAVE_LOCAL_BUFFER (octave_idx_type, pinv, nr);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
398 for (octave_idx_type i = 0; i < nr; i++)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
399 pinv [p [i]] = i;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
400 RT btmp;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
401 dmsolve_permute (btmp, b, pinv);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
402 info = 0;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
403 retval.resize (nc, b_nc);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
404
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
405 // Leading over-determined block
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
406 if (dm->rr [2] < nr && dm->cc [3] < nc)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
407 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
408 ST m = dmsolve_extract (a, pinv, q, dm->rr [2], nr, dm->cc [3], nc,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
409 nnz_remaining, true);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
410 nnz_remaining -= m.nnz();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
411 RT mtmp =
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
412 qrsolve (m, dmsolve_extract (btmp, NULL, NULL, dm->rr[2], b_nr, 0,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
413 b_nc), info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
414 dmsolve_insert (retval, mtmp, q, dm->cc [3], 0);
5797
11fcab4c461d [project @ 2006-05-09 06:15:17 by dbateman]
dbateman
parents: 5794
diff changeset
415 if (dm->rr [2] > 0 && !info)
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
416 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
417 m = dmsolve_extract (a, pinv, q, 0, dm->rr [2],
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
418 dm->cc [3], nc, nnz_remaining, true);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
419 nnz_remaining -= m.nnz();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
420 RT ctmp = dmsolve_extract (btmp, NULL, NULL, 0,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
421 dm->rr[2], 0, b_nc);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
422 btmp.insert (ctmp - m * mtmp, 0, 0);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
423 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
424 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
425
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
426 // Structurally non-singular blocks
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5697
diff changeset
427 // FIXME Should use fine Dulmange-Mendelsohn decomposition here.
5797
11fcab4c461d [project @ 2006-05-09 06:15:17 by dbateman]
dbateman
parents: 5794
diff changeset
428 if (dm->rr [1] < dm->rr [2] && dm->cc [2] < dm->cc [3] && !info)
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
429 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
430 ST m = dmsolve_extract (a, pinv, q, dm->rr [1], dm->rr [2],
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
431 dm->cc [2], dm->cc [3], nnz_remaining, false);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
432 nnz_remaining -= m.nnz();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
433 RT btmp2 = dmsolve_extract (btmp, NULL, NULL, dm->rr [1], dm->rr [2],
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
434 0, b_nc);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
435 double rcond = 0.0;
5785
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman]
dbateman
parents: 5775
diff changeset
436 MatrixType mtyp (MatrixType::Full);
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
437 RT mtmp = m.solve (mtyp, btmp2, info, rcond,
5697
2fe20065a545 [project @ 2006-03-21 16:01:46 by dbateman]
dbateman
parents: 5684
diff changeset
438 solve_singularity_warning, false);
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
439 if (info != 0)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
440 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
441 info = 0;
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
442 mtmp = qrsolve (m, btmp2, info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
443 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
444
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
445 dmsolve_insert (retval, mtmp, q, dm->cc [2], 0);
5797
11fcab4c461d [project @ 2006-05-09 06:15:17 by dbateman]
dbateman
parents: 5794
diff changeset
446 if (dm->rr [1] > 0 && !info)
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
447 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
448 m = dmsolve_extract (a, pinv, q, 0, dm->rr [1], dm->cc [2],
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
449 dm->cc [3], nnz_remaining, true);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
450 nnz_remaining -= m.nnz();
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
451 RT ctmp = dmsolve_extract (btmp, NULL, NULL, 0,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
452 dm->rr[1], 0, b_nc);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
453 btmp.insert (ctmp - m * mtmp, 0, 0);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
454 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
455 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
456
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
457 // Trailing under-determined block
5797
11fcab4c461d [project @ 2006-05-09 06:15:17 by dbateman]
dbateman
parents: 5794
diff changeset
458 if (dm->rr [1] > 0 && dm->cc [2] > 0 && !info)
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
459 {
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
460 ST m = dmsolve_extract (a, pinv, q, 0, dm->rr [1], 0,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
461 dm->cc [2], nnz_remaining, true);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
462 RT mtmp =
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
463 qrsolve (m, dmsolve_extract(btmp, NULL, NULL, 0, dm->rr [1] , 0,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
464 b_nc), info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
465 dmsolve_insert (retval, mtmp, q, 0, 0);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
466 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
467
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
468 CXSPARSE_DNAME (_dfree) (dm);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
469 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
470 return retval;
5684
f39adfd0913d [project @ 2006-03-16 18:12:01 by dbateman]
dbateman
parents: 5683
diff changeset
471 #else
f39adfd0913d [project @ 2006-03-16 18:12:01 by dbateman]
dbateman
parents: 5683
diff changeset
472 return RT ();
f39adfd0913d [project @ 2006-03-16 18:12:01 by dbateman]
dbateman
parents: 5683
diff changeset
473 #endif
5683
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
474 }
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
475
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
476 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
477 extern Matrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
478 dmsolve (const SparseMatrix &a, const Matrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
479 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
480
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
481 extern ComplexMatrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
482 dmsolve (const SparseMatrix &a, const ComplexMatrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
483 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
484
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
485 extern ComplexMatrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
486 dmsolve (const SparseComplexMatrix &a, const Matrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
487 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
488
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
489 extern ComplexMatrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
490 dmsolve (const SparseComplexMatrix &a, const ComplexMatrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
491 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
492
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
493 extern SparseMatrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
494 dmsolve (const SparseMatrix &a, const SparseMatrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
495 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
496
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
497 extern SparseComplexMatrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
498 dmsolve (const SparseMatrix &a, const SparseComplexMatrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
499 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
500
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
501 extern SparseComplexMatrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
502 dmsolve (const SparseComplexMatrix &a, const SparseMatrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
503 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
504
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
505 extern SparseComplexMatrix
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
506 dmsolve (const SparseComplexMatrix &a, const SparseComplexMatrix &b,
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
507 octave_idx_type &info);
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
508 #endif
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
509
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
510 /*
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
511 ;;; Local Variables: ***
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
512 ;;; mode: C++ ***
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
513 ;;; End: ***
a6bfe12c4c72 [project @ 2006-03-16 18:02:27 by dbateman]
dbateman
parents:
diff changeset
514 */