Mercurial > octave

comparison liboctave/numeric/sparse-qr.h @ 31607:aac27ad79be6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
comparison
equal deleted inserted replaced
31605:e88a07dec498 31607:aac27ad79be6
36 36
37 OCTAVE_BEGIN_NAMESPACE(octave) 37 OCTAVE_BEGIN_NAMESPACE(octave)
38 38
39 OCTAVE_BEGIN_NAMESPACE(math) 39 OCTAVE_BEGIN_NAMESPACE(math)
40 40
41 // If the sparse matrix classes become templated on the element type 41 // If the sparse matrix classes become templated on the element type
42 // (i.e., sparse_matrix<double>), then it might be best to make the 42 // (i.e., sparse_matrix<double>), then it might be best to make the
43 // template parameter of this class also be the element type instead 43 // template parameter of this class also be the element type instead
44 // of the matrix type. 44 // of the matrix type.
45 45
46 template <typename SPARSE_T> 46 template <typename SPARSE_T>
47 class 47 class
48 sparse_qr 48 sparse_qr
49 { 49 {
50 public: 50 public:
51 51
52 OCTAVE_API sparse_qr (void); 52 OCTAVE_API sparse_qr (void);
53 53
54 #if (defined (HAVE_SPQR) && defined (HAVE_CHOLMOD)) 54 #if (defined (HAVE_SPQR) && defined (HAVE_CHOLMOD))
55 // order = 7 selects SPQR default ordering 55 // order = 7 selects SPQR default ordering
56 OCTAVE_API sparse_qr (const SPARSE_T& a, int order = 7); 56 OCTAVE_API sparse_qr (const SPARSE_T& a, int order = 7);
57 #else 57 #else
58 OCTAVE_API sparse_qr (const SPARSE_T& a, int order = 0); 58 OCTAVE_API sparse_qr (const SPARSE_T& a, int order = 0);
59 #endif 59 #endif
60 60
61 sparse_qr (const sparse_qr& a) = default; 61 sparse_qr (const sparse_qr& a) = default;
62 62
63 ~sparse_qr (void) = default; 63 ~sparse_qr (void) = default;
64 64
65 sparse_qr& operator = (const sparse_qr& a) = default; 65 sparse_qr& operator = (const sparse_qr& a) = default;
66 66
67 OCTAVE_API bool ok (void) const; 67 OCTAVE_API bool ok (void) const;
68 68
69 OCTAVE_API ColumnVector E (void) const; 69 OCTAVE_API ColumnVector E (void) const;
70 70
71 // constructs permutation matrix from permutation vector rep -> E() 71 // constructs permutation matrix from permutation vector rep -> E()
72 OCTAVE_API SparseMatrix E_MAT () const; 72 OCTAVE_API SparseMatrix E_MAT () const;
73 73
74 OCTAVE_API SPARSE_T V (void) const; 74 OCTAVE_API SPARSE_T V (void) const;
75 75
76 OCTAVE_API ColumnVector Pinv (void) const; 76 OCTAVE_API ColumnVector Pinv (void) const;
77 77
78 OCTAVE_API ColumnVector P (void) const; 78 OCTAVE_API ColumnVector P (void) const;
79 79
80 OCTAVE_API SPARSE_T R (bool econ = false) const; 80 OCTAVE_API SPARSE_T R (bool econ = false) const;
81 81
82 OCTAVE_API typename SPARSE_T::dense_matrix_type 82 OCTAVE_API typename SPARSE_T::dense_matrix_type
83 C (const typename SPARSE_T::dense_matrix_type& b, bool econ = false) const; 83 C (const typename SPARSE_T::dense_matrix_type& b, bool econ = false) const;
84 84
85 OCTAVE_API typename SPARSE_T::dense_matrix_type 85 OCTAVE_API typename SPARSE_T::dense_matrix_type
86 Q (bool econ = false) const; 86 Q (bool econ = false) const;
87 87
88 template <typename RHS_T, typename RET_T> 88 template <typename RHS_T, typename RET_T>
89 static OCTAVE_API RET_T 89 static OCTAVE_API RET_T
90 solve (const SPARSE_T& a, const RHS_T& b, 90 solve (const SPARSE_T& a, const RHS_T& b,
91 octave_idx_type& info); 91 octave_idx_type& info);
92 92
93 private: 93 private:
94 94
95 template <typename RHS_T, typename RET_T> 95 template <typename RHS_T, typename RET_T>
96 static OCTAVE_API RET_T 96 static OCTAVE_API RET_T
97 min2norm_solve (const SPARSE_T& a, const RHS_T& b, 97 min2norm_solve (const SPARSE_T& a, const RHS_T& b,
98 octave_idx_type& info, int order); 98 octave_idx_type& info, int order);
99 99
100 template <typename RHS_T, typename RET_T> 100 template <typename RHS_T, typename RET_T>
101 OCTAVE_API RET_T 101 OCTAVE_API RET_T
102 tall_solve (const RHS_T& b, octave_idx_type& info) const; 102 tall_solve (const RHS_T& b, octave_idx_type& info) const;
103 103
104 template <typename RHS_T, typename RET_T> 104 template <typename RHS_T, typename RET_T>
105 OCTAVE_API RET_T 105 OCTAVE_API RET_T
106 wide_solve (const RHS_T& b, octave_idx_type& info) const; 106 wide_solve (const RHS_T& b, octave_idx_type& info) const;
107 107
108 //-------- 108 //--------
109 class sparse_qr_rep; 109 class sparse_qr_rep;
110 110
111 std::shared_ptr<sparse_qr_rep> m_rep; 111 std::shared_ptr<sparse_qr_rep> m_rep;
112 }; 112 };
113 113
114 // extern instantiations with set visibility/export/import attribute 114 // extern instantiations with set visibility/export/import attribute
115 115
116 extern template class OCTAVE_EXTERN_TEMPLATE_API sparse_qr<SparseMatrix>; 116 extern template class OCTAVE_EXTERN_TEMPLATE_API sparse_qr<SparseMatrix>;
117 117
118 extern template class OCTAVE_EXTERN_TEMPLATE_API sparse_qr<SparseComplexMatrix>; 118 extern template class OCTAVE_EXTERN_TEMPLATE_API sparse_qr<SparseComplexMatrix>;
119 119
120 // Provide qrsolve for backward compatibility. 120 // Provide qrsolve for backward compatibility.
121 121
122 extern OCTAVE_API Matrix 122 extern OCTAVE_API Matrix
123 qrsolve (const SparseMatrix& a, const MArray<double>& b, 123 qrsolve (const SparseMatrix& a, const MArray<double>& b,
124 octave_idx_type& info); 124 octave_idx_type& info);
125 125
126 extern OCTAVE_API SparseMatrix 126 extern OCTAVE_API SparseMatrix
127 qrsolve (const SparseMatrix& a, const SparseMatrix& b, 127 qrsolve (const SparseMatrix& a, const SparseMatrix& b,
128 octave_idx_type& info); 128 octave_idx_type& info);
129 129
130 extern OCTAVE_API ComplexMatrix 130 extern OCTAVE_API ComplexMatrix
131 qrsolve (const SparseMatrix& a, const MArray<Complex>& b, 131 qrsolve (const SparseMatrix& a, const MArray<Complex>& b,
132 octave_idx_type& info); 132 octave_idx_type& info);
133 133
134 extern OCTAVE_API SparseComplexMatrix 134 extern OCTAVE_API SparseComplexMatrix
135 qrsolve (const SparseMatrix& a, const SparseComplexMatrix& b, 135 qrsolve (const SparseMatrix& a, const SparseComplexMatrix& b,
136 octave_idx_type& info); 136 octave_idx_type& info);
137 137
138 extern OCTAVE_API ComplexMatrix 138 extern OCTAVE_API ComplexMatrix
139 qrsolve (const SparseComplexMatrix& a, const MArray<double>& b, 139 qrsolve (const SparseComplexMatrix& a, const MArray<double>& b,
140 octave_idx_type& info); 140 octave_idx_type& info);
141 141
142 extern OCTAVE_API SparseComplexMatrix 142 extern OCTAVE_API SparseComplexMatrix
143 qrsolve (const SparseComplexMatrix& a, const SparseMatrix& b, 143 qrsolve (const SparseComplexMatrix& a, const SparseMatrix& b,
144 octave_idx_type& info); 144 octave_idx_type& info);
145 145
146 extern OCTAVE_API ComplexMatrix 146 extern OCTAVE_API ComplexMatrix
147 qrsolve (const SparseComplexMatrix& a, const MArray<Complex>& b, 147 qrsolve (const SparseComplexMatrix& a, const MArray<Complex>& b,
148 octave_idx_type& info); 148 octave_idx_type& info);
149 149
150 extern OCTAVE_API SparseComplexMatrix 150 extern OCTAVE_API SparseComplexMatrix
151 qrsolve (const SparseComplexMatrix& a, const SparseComplexMatrix& b, 151 qrsolve (const SparseComplexMatrix& a, const SparseComplexMatrix& b,
152 octave_idx_type& info); 152 octave_idx_type& info);
153 153
154 typedef sparse_qr<SparseMatrix> SparseQR; 154 typedef sparse_qr<SparseMatrix> SparseQR;
155 typedef sparse_qr<SparseComplexMatrix> SparseComplexQR; 155 typedef sparse_qr<SparseComplexMatrix> SparseComplexQR;
156 156
157 OCTAVE_END_NAMESPACE(math) 157 OCTAVE_END_NAMESPACE(math)
158 OCTAVE_END_NAMESPACE(octave) 158 OCTAVE_END_NAMESPACE(octave)
159 159
160 #endif 160 #endif