Mercurial > octave

changeset 22228:4afe3705ea75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
svd: do not shadow member variables with local variables. * liboctave/numeric/svd.cc, liboctave/numeric/svd.h: there was no issue with current code because member variables never change after construction. Still, it's not good practice and the compilers will warn about it.
author Carnë Draug <carandraug@octave.org>
date Tue, 09 Aug 2016 00:21:36 +0100
parents ab139f0733b9
children 22c2bd440544
files liboctave/numeric/svd.cc liboctave/numeric/svd.h
diffstat 2 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/svd.cc	Sun Jun 12 19:38:22 2016 +1000
+++ b/liboctave/numeric/svd.cc	Tue Aug 09 00:21:36 2016 +0100
@@ -131,7 +131,7 @@
 T
 svd<T>::left_singular_matrix (void) const
 {
-  if (type == svd::Type::sigma_only)
+  if (m_type == svd::Type::sigma_only)
     (*current_liboctave_error_handler)
       ("svd: U not computed because type == svd::sigma_only");
 
@@ -142,7 +142,7 @@
 T
 svd<T>::right_singular_matrix (void) const
 {
-  if (type == svd::Type::sigma_only)
+  if (m_type == svd::Type::sigma_only)
     (*current_liboctave_error_handler)
       ("svd: V not computed because type == svd::sigma_only");
 
@@ -369,7 +369,7 @@
 template<typename T>
 svd<T>::svd (const T& a, svd::Type type,
              svd::Driver driver)
-  : type (type), driver (driver), left_sm (), sigma (), right_sm ()
+  : m_type (type), m_driver (driver), left_sm (), sigma (), right_sm ()
 {
   octave_idx_type info;
 
@@ -378,7 +378,7 @@
 
   if (m == 0 || n == 0)
     {
-      switch (type)
+      switch (m_type)
         {
         case svd::Type::std:
           left_sm = T (m, m, 0);
@@ -417,7 +417,7 @@
   octave_idx_type nrow_s = m;
   octave_idx_type ncol_s = n;
 
-  switch (type)
+  switch (m_type)
     {
     case svd::Type::economy:
       jobu = jobv = 'S';
@@ -464,10 +464,10 @@
   octave_idx_type m1 = std::max (m, 1);
   octave_idx_type nrow_vt1 = std::max (nrow_vt, 1);
 
-  if (driver == svd::Driver::GESVD)
+  if (m_driver == svd::Driver::GESVD)
     gesvd (jobu, jobv, m, n, tmp_data, m1, s_vec, u, vt, nrow_vt1,
            work, lwork, info);
-  else if (driver == svd::Driver::GESDD)
+  else if (m_driver == svd::Driver::GESDD)
     {
       assert (jobu == jobv);
       char jobz = jobu;
--- a/liboctave/numeric/svd.h	Sun Jun 12 19:38:22 2016 +1000
+++ b/liboctave/numeric/svd.h	Tue Aug 09 00:21:36 2016 +0100
@@ -50,26 +50,26 @@
   };
 
   svd (void)
-    : type (), driver (), left_sm (), sigma (), right_sm ()
+    : m_type (), m_driver (), left_sm (), sigma (), right_sm ()
   { }
 
   svd (const T& a, svd::Type type = svd::Type::std,
        svd::Driver driver = svd::Driver::GESVD);
 
   svd (const svd& a)
-    : type (a.type), driver (a.driver), left_sm (a.left_sm), sigma (a.sigma),
-      right_sm (a.right_sm)
+    : m_type (a.m_type), m_driver (a.m_driver), left_sm (a.left_sm),
+      sigma (a.sigma), right_sm (a.right_sm)
   { }
 
   svd& operator = (const svd& a)
   {
     if (this != &a)
       {
-        type = a.type;
+        m_type = a.m_type;
         left_sm = a.left_sm;
         sigma = a.sigma;
         right_sm = a.right_sm;
-        driver = a.driver;
+        m_driver = a.m_driver;
       }
 
     return *this;
@@ -88,8 +88,8 @@
   typedef typename T::element_type P;
   typedef typename DM_T::element_type DM_P;
 
-  svd::Type type;
-  svd::Driver driver;
+  svd::Type m_type;
+  svd::Driver m_driver;
 
   T left_sm;
   DM_T sigma;