Mercurial > octave
changeset 30055:d37b0e5ce0a4
maint: use "m_" prefix for member variables in class gepbalance.
* gepbalance.cc, gepbalance.h: use "m_" prefix for member variables in class
gepbalance.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 26 Aug 2021 18:58:27 -0700 |
| parents | c75465d8e816 |
| children | 7c494a811cc3 |
| files | liboctave/numeric/gepbalance.cc liboctave/numeric/gepbalance.h |
| diffstat | 2 files changed, 60 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/numeric/gepbalance.cc Thu Aug 26 18:48:38 2021 -0700 +++ b/liboctave/numeric/gepbalance.cc Thu Aug 26 18:58:27 2021 -0700 @@ -64,10 +64,10 @@ OCTAVE_LOCAL_BUFFER (double, prscale, n); OCTAVE_LOCAL_BUFFER (double, pwork, 6 * n); - balanced_mat = a; - double *p_balanced_mat = balanced_mat.fortran_vec (); - balanced_mat2 = b; - double *p_balanced_mat2 = balanced_mat2.fortran_vec (); + m_balanced_mat = a; + double *p_balanced_mat = m_balanced_mat.fortran_vec (); + m_balanced_mat2 = b; + double *p_balanced_mat2 = m_balanced_mat2.fortran_vec (); char job = balance_job[0]; @@ -76,17 +76,17 @@ n, ilo, ihi, plscale, prscale, pwork, info F77_CHAR_ARG_LEN (1))); - balancing_mat = Matrix (n, n, 0.0); - balancing_mat2 = Matrix (n, n, 0.0); + m_balancing_mat = Matrix (n, n, 0.0); + m_balancing_mat2 = Matrix (n, n, 0.0); for (F77_INT i = 0; i < n; i++) { octave_quit (); - balancing_mat.elem (i,i) = 1.0; - balancing_mat2.elem (i,i) = 1.0; + m_balancing_mat.elem (i,i) = 1.0; + m_balancing_mat2.elem (i,i) = 1.0; } - double *p_balancing_mat = balancing_mat.fortran_vec (); - double *p_balancing_mat2 = balancing_mat2.fortran_vec (); + double *p_balancing_mat = m_balancing_mat.fortran_vec (); + double *p_balancing_mat2 = m_balancing_mat2.fortran_vec (); // first left F77_XFCN (dggbak, DGGBAK, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -130,10 +130,10 @@ OCTAVE_LOCAL_BUFFER (float, prscale, n); OCTAVE_LOCAL_BUFFER (float, pwork, 6 * n); - balanced_mat = a; - float *p_balanced_mat = balanced_mat.fortran_vec (); - balanced_mat2 = b; - float *p_balanced_mat2 = balanced_mat2.fortran_vec (); + m_balanced_mat = a; + float *p_balanced_mat = m_balanced_mat.fortran_vec (); + m_balanced_mat2 = b; + float *p_balanced_mat2 = m_balanced_mat2.fortran_vec (); char job = balance_job[0]; @@ -142,17 +142,17 @@ n, ilo, ihi, plscale, prscale, pwork, info F77_CHAR_ARG_LEN (1))); - balancing_mat = FloatMatrix (n, n, 0.0); - balancing_mat2 = FloatMatrix (n, n, 0.0); + m_balancing_mat = FloatMatrix (n, n, 0.0); + m_balancing_mat2 = FloatMatrix (n, n, 0.0); for (F77_INT i = 0; i < n; i++) { octave_quit (); - balancing_mat.elem (i,i) = 1.0; - balancing_mat2.elem (i,i) = 1.0; + m_balancing_mat.elem (i,i) = 1.0; + m_balancing_mat2.elem (i,i) = 1.0; } - float *p_balancing_mat = balancing_mat.fortran_vec (); - float *p_balancing_mat2 = balancing_mat2.fortran_vec (); + float *p_balancing_mat = m_balancing_mat.fortran_vec (); + float *p_balancing_mat2 = m_balancing_mat2.fortran_vec (); // first left F77_XFCN (sggbak, SGGBAK, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -197,10 +197,10 @@ OCTAVE_LOCAL_BUFFER (double, prscale, n); OCTAVE_LOCAL_BUFFER (double, pwork, 6 * n); - balanced_mat = a; - Complex *p_balanced_mat = balanced_mat.fortran_vec (); - balanced_mat2 = b; - Complex *p_balanced_mat2 = balanced_mat2.fortran_vec (); + m_balanced_mat = a; + Complex *p_balanced_mat = m_balanced_mat.fortran_vec (); + m_balanced_mat2 = b; + Complex *p_balanced_mat2 = m_balanced_mat2.fortran_vec (); char job = balance_job[0]; @@ -210,17 +210,17 @@ n, ilo, ihi, plscale, prscale, pwork, info F77_CHAR_ARG_LEN (1))); - balancing_mat = Matrix (n, n, 0.0); - balancing_mat2 = Matrix (n, n, 0.0); + m_balancing_mat = Matrix (n, n, 0.0); + m_balancing_mat2 = Matrix (n, n, 0.0); for (F77_INT i = 0; i < n; i++) { octave_quit (); - balancing_mat.elem (i,i) = 1.0; - balancing_mat2.elem (i,i) = 1.0; + m_balancing_mat.elem (i,i) = 1.0; + m_balancing_mat2.elem (i,i) = 1.0; } - double *p_balancing_mat = balancing_mat.fortran_vec (); - double *p_balancing_mat2 = balancing_mat2.fortran_vec (); + double *p_balancing_mat = m_balancing_mat.fortran_vec (); + double *p_balancing_mat2 = m_balancing_mat2.fortran_vec (); // first left F77_XFCN (dggbak, DGGBAK, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -268,10 +268,10 @@ OCTAVE_LOCAL_BUFFER (float, prscale, n); OCTAVE_LOCAL_BUFFER (float, pwork, 6 * n); - balanced_mat = a; - FloatComplex *p_balanced_mat = balanced_mat.fortran_vec (); - balanced_mat2 = b; - FloatComplex *p_balanced_mat2 = balanced_mat2.fortran_vec (); + m_balanced_mat = a; + FloatComplex *p_balanced_mat = m_balanced_mat.fortran_vec (); + m_balanced_mat2 = b; + FloatComplex *p_balanced_mat2 = m_balanced_mat2.fortran_vec (); char job = balance_job[0]; @@ -281,17 +281,17 @@ n, ilo, ihi, plscale, prscale, pwork, info F77_CHAR_ARG_LEN (1))); - balancing_mat = FloatMatrix (n, n, 0.0); - balancing_mat2 = FloatMatrix (n, n, 0.0); + m_balancing_mat = FloatMatrix (n, n, 0.0); + m_balancing_mat2 = FloatMatrix (n, n, 0.0); for (F77_INT i = 0; i < n; i++) { octave_quit (); - balancing_mat.elem (i,i) = 1.0; - balancing_mat2.elem (i,i) = 1.0; + m_balancing_mat.elem (i,i) = 1.0; + m_balancing_mat2.elem (i,i) = 1.0; } - float *p_balancing_mat = balancing_mat.fortran_vec (); - float *p_balancing_mat2 = balancing_mat2.fortran_vec (); + float *p_balancing_mat = m_balancing_mat.fortran_vec (); + float *p_balancing_mat2 = m_balancing_mat2.fortran_vec (); // first left F77_XFCN (sggbak, SGGBAK, (F77_CONST_CHAR_ARG2 (&job, 1),
--- a/liboctave/numeric/gepbalance.h Thu Aug 26 18:48:38 2021 -0700 +++ b/liboctave/numeric/gepbalance.h Thu Aug 26 18:58:27 2021 -0700 @@ -43,28 +43,32 @@ typedef typename T::real_matrix_type RT; gepbalance (void) - : balanced_mat (), balanced_mat2 (), balancing_mat (), balancing_mat2 () + : m_balanced_mat (), m_balanced_mat2 (), m_balancing_mat (), + m_balancing_mat2 () { } gepbalance (const T& a, const T& b, const std::string& job) - : balanced_mat (), balanced_mat2 (), balancing_mat (), balancing_mat2 () + : m_balanced_mat (), m_balanced_mat2 (), m_balancing_mat (), + m_balancing_mat2 () { init (a, b, job); } gepbalance (const gepbalance& a) - : balanced_mat (a.balanced_mat), balanced_mat2 (a.balanced_mat2), - balancing_mat (a.balancing_mat), balancing_mat2 (a.balancing_mat2) + : m_balanced_mat (a.m_balanced_mat), + m_balanced_mat2 (a.m_balanced_mat2), + m_balancing_mat (a.m_balancing_mat), + m_balancing_mat2 (a.m_balancing_mat2) { } gepbalance& operator = (const gepbalance& a) { if (this != &a) { - balanced_mat = a.balanced_mat; - balanced_mat2 = a.balanced_mat2; - balancing_mat = a.balancing_mat; - balancing_mat2 = a.balancing_mat2; + m_balanced_mat = a.m_balanced_mat; + m_balanced_mat2 = a.m_balanced_mat2; + m_balancing_mat = a.m_balancing_mat; + m_balancing_mat2 = a.m_balancing_mat2; } return *this; @@ -72,20 +76,20 @@ ~gepbalance (void) = default; - T balanced_matrix (void) const { return balanced_mat; } + T balanced_matrix (void) const { return m_balanced_mat; } - T balanced_matrix2 (void) const { return balanced_mat2; } + T balanced_matrix2 (void) const { return m_balanced_mat2; } - RT balancing_matrix (void) const { return balancing_mat; } + RT balancing_matrix (void) const { return m_balancing_mat; } - RT balancing_matrix2 (void) const { return balancing_mat2; } + RT balancing_matrix2 (void) const { return m_balancing_mat2; } private: - T balanced_mat; - T balanced_mat2; - RT balancing_mat; - RT balancing_mat2; + T m_balanced_mat; + T m_balanced_mat2; + RT m_balancing_mat; + RT m_balancing_mat2; OCTAVE_API octave_idx_type init (const T& a, const T& b, const std::string& job);