Mercurial > octave

comparison liboctave/numeric/sparse-base-lu.cc @ 21139:538b57866b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
consistently use "typename" intead of "class" in template declarations * Object.h, QtHandlesUtils.cc, QtHandlesUtils.h, ToolBarButton.cc, ToolBarButton.h, Cell.h, __lin_interpn__.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, filter.cc, gcd.cc, graphics.cc, help.cc, kron.cc, lookup.cc, ls-mat5.cc, ls-oct-text.h, lu.cc, max.cc, mgorth.cc, oct-map.cc, oct-map.h, oct-stream.cc, oct-stream.h, octave-link.h, pr-output.cc, profiler.h, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sqrtm.cc, symtab.h, tril.cc, typecast.cc, variables.cc, xdiv.cc, zfstream.h, __init_fltk__.cc, __magick_read__.cc, chol.cc, qr.cc, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.h, ov-classdef.cc, ov-int-traits.h, ov-java.h, ov-usr-fcn.h, ov.cc, ov.h, op-dms-template.cc, oct-parse.in.yy, parse.h, pt-mat.cc, Array-b.cc, Array.cc, Array.h, CDiagMatrix.h, CMatrix.h, CNDArray.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.cc, MSparse.h, MatrixType.cc, Sparse.cc, Sparse.h, dDiagMatrix.h, dMatrix.h, dNDArray.h, fCDiagMatrix.h, fCMatrix.h, fCNDArray.h, fDiagMatrix.h, fMatrix.h, fNDArray.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, DET.h, base-aepbal.h, base-lu.cc, base-lu.h, base-qr.cc, base-qr.h, bsxfun-defs.cc, eigs-base.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, oct-convn.cc, oct-fftw.cc, oct-norm.cc, sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-base-lu.h, sparse-dmsolve.cc, mx-inlines.cc, action-container.h, base-list.h, lo-traits.h, lo-utils.h, oct-base64.h, oct-binmap.h, oct-cmplx.h, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.h, oct-refcount.h, oct-sort.cc, oct-sort.h: Use "typename" instead of "class" in template declarations.
author John W. Eaton <jwe@octave.org>
date Sun, 24 Jan 2016 13:50:04 -0500
parents 4197fc428c7d
children
comparison
equal deleted inserted replaced
21138:e2fca7d79169 21139:538b57866b90
27 27
28 #include "sparse-base-lu.h" 28 #include "sparse-base-lu.h"
29 29
30 #include "PermMatrix.h" 30 #include "PermMatrix.h"
31 31
32 template <class lu_type, class lu_elt_type, class p_type, class p_elt_type> 32 template <typename lu_type, typename lu_elt_type, typename p_type, typename p_elt_type>
33 lu_type 33 lu_type
34 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Y (void) const 34 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Y (void) const
35 { 35 {
36 octave_idx_type nr = Lfact.rows (); 36 octave_idx_type nr = Lfact.rows ();
37 octave_idx_type nz = Lfact.cols (); 37 octave_idx_type nz = Lfact.cols ();
62 } 62 }
63 63
64 return Yout; 64 return Yout;
65 } 65 }
66 66
67 template <class lu_type, class lu_elt_type, class p_type, class p_elt_type> 67 template <typename lu_type, typename lu_elt_type, typename p_type, typename p_elt_type>
68 p_type 68 p_type
69 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pr (void) const 69 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pr (void) const
70 { 70 {
71 71
72 octave_idx_type nr = Lfact.rows (); 72 octave_idx_type nr = Lfact.rows ();
82 Pout.cidx (nr) = nr; 82 Pout.cidx (nr) = nr;
83 83
84 return Pout; 84 return Pout;
85 } 85 }
86 86
87 template <class lu_type, class lu_elt_type, class p_type, class p_elt_type> 87 template <typename lu_type, typename lu_elt_type, typename p_type, typename p_elt_type>
88 ColumnVector 88 ColumnVector
89 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pr_vec (void) const 89 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pr_vec (void) const
90 { 90 {
91 91
92 octave_idx_type nr = Lfact.rows (); 92 octave_idx_type nr = Lfact.rows ();
97 Pout.xelem (i) = static_cast<double> (P(i) + 1); 97 Pout.xelem (i) = static_cast<double> (P(i) + 1);
98 98
99 return Pout; 99 return Pout;
100 } 100 }
101 101
102 template <class lu_type, class lu_elt_type, class p_type, class p_elt_type> 102 template <typename lu_type, typename lu_elt_type, typename p_type, typename p_elt_type>
103 PermMatrix 103 PermMatrix
104 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pr_mat (void) const 104 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pr_mat (void) const
105 { 105 {
106 return PermMatrix (P, false); 106 return PermMatrix (P, false);
107 } 107 }
108 108
109 template <class lu_type, class lu_elt_type, class p_type, class p_elt_type> 109 template <typename lu_type, typename lu_elt_type, typename p_type, typename p_elt_type>
110 p_type 110 p_type
111 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pc (void) const 111 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pc (void) const
112 { 112 {
113 octave_idx_type nc = Ufact.cols (); 113 octave_idx_type nc = Ufact.cols ();
114 114
123 Pout.cidx (nc) = nc; 123 Pout.cidx (nc) = nc;
124 124
125 return Pout; 125 return Pout;
126 } 126 }
127 127
128 template <class lu_type, class lu_elt_type, class p_type, class p_elt_type> 128 template <typename lu_type, typename lu_elt_type, typename p_type, typename p_elt_type>
129 ColumnVector 129 ColumnVector
130 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pc_vec (void) const 130 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pc_vec (void) const
131 { 131 {
132 132
133 octave_idx_type nc = Ufact.cols (); 133 octave_idx_type nc = Ufact.cols ();
138 Pout.xelem (i) = static_cast<double> (Q(i) + 1); 138 Pout.xelem (i) = static_cast<double> (Q(i) + 1);
139 139
140 return Pout; 140 return Pout;
141 } 141 }
142 142
143 template <class lu_type, class lu_elt_type, class p_type, class p_elt_type> 143 template <typename lu_type, typename lu_elt_type, typename p_type, typename p_elt_type>
144 PermMatrix 144 PermMatrix
145 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pc_mat (void) const 145 sparse_base_lu <lu_type, lu_elt_type, p_type, p_elt_type> :: Pc_mat (void) const
146 { 146 {
147 return PermMatrix (Q, true); 147 return PermMatrix (Q, true);
148 } 148 }