Mercurial > octave

changeset 30044:1f34286a2637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use "m_" prefix for member variables of classes associated with EIG. * __eigs__.cc: Rename member variables of struct eigs_callback. * EIG.h, EIG.cc: Rename member variables of class EIG. * fEIG.h, fEIG.cc: Rename member variables of class FloatEIG.
author Rik <rik@octave.org>
date Wed, 25 Aug 2021 12:30:01 -0700
parents b8ffd22ee32c
children 849bd0f1129c
files libinterp/corefcn/__eigs__.cc liboctave/numeric/EIG.cc liboctave/numeric/EIG.h liboctave/numeric/fEIG.cc liboctave/numeric/fEIG.h
diffstat 5 files changed, 138 insertions(+), 138 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/__eigs__.cc	Wed Aug 25 11:58:57 2021 -0700
+++ b/libinterp/corefcn/__eigs__.cc	Wed Aug 25 12:30:01 2021 -0700
@@ -51,10 +51,10 @@
 
 struct eigs_callback {
   // Pointer for user defined function.
-  octave_value eigs_fcn;
+  octave_value m_eigs_fcn;
 
   // Have we warned about imaginary values returned from user function?
-  bool warned_imaginary = false;
+  bool m_warned_imaginary = false;
 
   ColumnVector
   eigs_func (const ColumnVector& x, int& eigs_error);
@@ -73,13 +73,13 @@
   octave_value_list args;
   args(0) = x;
 
-  if (eigs_fcn.is_defined ())
+  if (m_eigs_fcn.is_defined ())
     {
       octave_value_list tmp;
 
       try
         {
-          tmp = octave::feval (eigs_fcn, args, 1);
+          tmp = octave::feval (m_eigs_fcn, args, 1);
         }
       catch (octave::execution_exception& ee)
         {
@@ -88,10 +88,10 @@
 
       if (tmp.length () && tmp(0).is_defined ())
         {
-          if (! warned_imaginary && tmp(0).iscomplex ())
+          if (! m_warned_imaginary && tmp(0).iscomplex ())
             {
               warning ("eigs: ignoring imaginary part returned from user-supplied function");
-              warned_imaginary = true;
+              m_warned_imaginary = true;
             }
 
           retval = tmp(0).xvector_value ("eigs: evaluation of user-supplied function failed");
@@ -114,13 +114,13 @@
   octave_value_list args;
   args(0) = x;
 
-  if (eigs_fcn.is_defined ())
+  if (m_eigs_fcn.is_defined ())
     {
       octave_value_list tmp;
 
       try
         {
-          tmp = octave::feval (eigs_fcn, args, 1);
+          tmp = octave::feval (m_eigs_fcn, args, 1);
         }
       catch (octave::execution_exception& ee)
         {
@@ -219,9 +219,9 @@
   if (args(0).is_function_handle () || args(0).is_inline_function ()
       || args(0).is_string ())
     {
-      callback.eigs_fcn = get_function_handle (interp, args(0), "x");
+      callback.m_eigs_fcn = get_function_handle (interp, args(0), "x");
 
-      if (callback.eigs_fcn.is_undefined ())
+      if (callback.m_eigs_fcn.is_undefined ())
         error ("eigs: unknown function");
 
       if (nargin < 2)
--- a/liboctave/numeric/EIG.cc	Wed Aug 25 11:58:57 2021 -0700
+++ b/liboctave/numeric/EIG.cc	Wed Aug 25 12:30:01 2021 -0700
@@ -127,45 +127,45 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("dgeevx failed to converge");
 
-  lambda.resize (n);
+  m_lambda.resize (n);
   F77_INT nvr = (calc_rev ? n : 0);
-  v.resize (nvr, nvr);
+  m_v.resize (nvr, nvr);
   F77_INT nvl = (calc_lev ? n : 0);
-  w.resize (nvl, nvl);
+  m_w.resize (nvl, nvl);
 
   for (F77_INT j = 0; j < n; j++)
     {
       if (wi.elem (j) == 0.0)
         {
-          lambda.elem (j) = Complex (wr.elem (j));
+          m_lambda.elem (j) = Complex (wr.elem (j));
           for (F77_INT i = 0; i < nvr; i++)
-            v.elem (i, j) = vr.elem (i, j);
+            m_v.elem (i, j) = vr.elem (i, j);
 
           for (F77_INT i = 0; i < nvl; i++)
-            w.elem (i, j) = vl.elem (i, j);
+            m_w.elem (i, j) = vl.elem (i, j);
         }
       else
         {
           if (j+1 >= n)
             (*current_liboctave_error_handler) ("EIG: internal error");
 
-          lambda.elem (j) = Complex (wr.elem (j), wi.elem (j));
-          lambda.elem (j+1) = Complex (wr.elem (j+1), wi.elem (j+1));
+          m_lambda.elem (j) = Complex (wr.elem (j), wi.elem (j));
+          m_lambda.elem (j+1) = Complex (wr.elem (j+1), wi.elem (j+1));
 
           for (F77_INT i = 0; i < nvr; i++)
             {
               double real_part = vr.elem (i, j);
               double imag_part = vr.elem (i, j+1);
-              v.elem (i, j) = Complex (real_part, imag_part);
-              v.elem (i, j+1) = Complex (real_part, -imag_part);
+              m_v.elem (i, j) = Complex (real_part, imag_part);
+              m_v.elem (i, j+1) = Complex (real_part, -imag_part);
             }
 
           for (F77_INT i = 0; i < nvl; i++)
             {
               double real_part = vl.elem (i, j);
               double imag_part = vl.elem (i, j+1);
-              w.elem (i, j) = Complex (real_part, imag_part);
-              w.elem (i, j+1) = Complex (real_part, -imag_part);
+              m_w.elem (i, j) = Complex (real_part, imag_part);
+              m_w.elem (i, j+1) = Complex (real_part, -imag_part);
             }
           j++;
         }
@@ -219,9 +219,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("dsyev failed to converge");
 
-  lambda = ComplexColumnVector (wr);
-  v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
-  w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_lambda = ComplexColumnVector (wr);
+  m_v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
 
   return info;
 }
@@ -321,9 +321,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("zgeevx failed to converge");
 
-  lambda = wr;
-  v = vrtmp;
-  w = vltmp;
+  m_lambda = wr;
+  m_v = vrtmp;
+  m_w = vltmp;
 
   return info;
 }
@@ -380,9 +380,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("zheev failed to converge");
 
-  lambda = ComplexColumnVector (wr);
-  v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
-  w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_lambda = ComplexColumnVector (wr);
+  m_v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
 
   return info;
 }
@@ -480,46 +480,46 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("dggev failed to converge");
 
-  lambda.resize (n);
+  m_lambda.resize (n);
   F77_INT nvr = (calc_rev ? n : 0);
-  v.resize (nvr, nvr);
+  m_v.resize (nvr, nvr);
 
   F77_INT nvl = (calc_lev ? n : 0);
-  w.resize (nvl, nvl);
+  m_w.resize (nvl, nvl);
 
   for (F77_INT j = 0; j < n; j++)
     {
       if (ai.elem (j) == 0.0)
         {
-          lambda.elem (j) = Complex (ar.elem (j) / beta.elem (j));
+          m_lambda.elem (j) = Complex (ar.elem (j) / beta.elem (j));
           for (F77_INT i = 0; i < nvr; i++)
-            v.elem (i, j) = vr.elem (i, j);
+            m_v.elem (i, j) = vr.elem (i, j);
           for (F77_INT i = 0; i < nvl; i++)
-            w.elem (i, j) = vl.elem (i, j);
+            m_w.elem (i, j) = vl.elem (i, j);
         }
       else
         {
           if (j+1 >= n)
             (*current_liboctave_error_handler) ("EIG: internal error");
 
-          lambda.elem (j) = Complex (ar.elem (j) / beta.elem (j),
-                                     ai.elem (j) / beta.elem (j));
-          lambda.elem (j+1) = Complex (ar.elem (j+1) / beta.elem (j+1),
-                                       ai.elem (j+1) / beta.elem (j+1));
+          m_lambda.elem (j) = Complex (ar.elem (j) / beta.elem (j),
+                                       ai.elem (j) / beta.elem (j));
+          m_lambda.elem (j+1) = Complex (ar.elem (j+1) / beta.elem (j+1),
+                                         ai.elem (j+1) / beta.elem (j+1));
 
           for (F77_INT i = 0; i < nvr; i++)
             {
               double real_part = vr.elem (i, j);
               double imag_part = vr.elem (i, j+1);
-              v.elem (i, j) = Complex (real_part, imag_part);
-              v.elem (i, j+1) = Complex (real_part, -imag_part);
+              m_v.elem (i, j) = Complex (real_part, imag_part);
+              m_v.elem (i, j+1) = Complex (real_part, -imag_part);
             }
           for (F77_INT i = 0; i < nvl; i++)
             {
               double real_part = vl.elem (i, j);
               double imag_part = vl.elem (i, j+1);
-              w.elem (i, j) = Complex (real_part, imag_part);
-              w.elem (i, j+1) = Complex (real_part, -imag_part);
+              m_w.elem (i, j) = Complex (real_part, imag_part);
+              m_w.elem (i, j+1) = Complex (real_part, -imag_part);
             }
           j++;
         }
@@ -587,9 +587,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("dsygv failed to converge");
 
-  lambda = ComplexColumnVector (wr);
-  v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
-  w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_lambda = ComplexColumnVector (wr);
+  m_v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
 
   return info;
 }
@@ -695,13 +695,13 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("zggev failed to converge");
 
-  lambda.resize (n);
+  m_lambda.resize (n);
 
   for (F77_INT j = 0; j < n; j++)
-    lambda.elem (j) = alpha.elem (j) / beta.elem (j);
+    m_lambda.elem (j) = alpha.elem (j) / beta.elem (j);
 
-  v = vrtmp;
-  w = vltmp;
+  m_v = vrtmp;
+  m_w = vltmp;
 
   return info;
 }
@@ -770,9 +770,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("zhegv failed to converge");
 
-  lambda = ComplexColumnVector (wr);
-  v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
-  w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_lambda = ComplexColumnVector (wr);
+  m_v = (calc_rev ? ComplexMatrix (atmp) : ComplexMatrix ());
+  m_w = (calc_lev ? ComplexMatrix (atmp) : ComplexMatrix ());
 
   return info;
 }
--- a/liboctave/numeric/EIG.h	Wed Aug 25 11:58:57 2021 -0700
+++ b/liboctave/numeric/EIG.h	Wed Aug 25 12:30:01 2021 -0700
@@ -44,53 +44,53 @@
 
 public:
 
-  EIG (void) : lambda (), v (), w () { }
+  EIG (void) : m_lambda (), m_v (), m_w () { }
 
   EIG (const Matrix& a, bool calc_rev = true,
        bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, calc_rev, calc_lev, balance);
   }
 
   EIG (const Matrix& a, octave_idx_type& info,
        bool calc_rev = true, bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, calc_rev, calc_lev, balance);
   }
 
   EIG (const Matrix& a, const Matrix& b,
        bool calc_rev = true, bool calc_lev = true, bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, b, calc_rev, calc_lev, force_qz);
   }
 
   EIG (const Matrix& a, const Matrix& b, octave_idx_type& info,
        bool calc_rev = true, bool calc_lev = true, bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, b, calc_rev, calc_lev, force_qz);
   }
 
   EIG (const ComplexMatrix& a, bool calc_rev = true,
        bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, calc_rev, calc_lev, balance);
   }
 
   EIG (const ComplexMatrix& a, octave_idx_type& info,
        bool calc_rev = true, bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, calc_rev, calc_lev, balance);
   }
 
   EIG (const ComplexMatrix& a, const ComplexMatrix& b,
        bool calc_rev = true, bool calc_lev = true, bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, b, calc_rev, calc_lev, force_qz);
   }
@@ -98,37 +98,37 @@
   EIG (const ComplexMatrix& a, const ComplexMatrix& b,
        octave_idx_type& info, bool calc_rev = true, bool calc_lev = true,
        bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, b, calc_rev, calc_lev, force_qz);
   }
 
-  EIG (const EIG& a) : lambda (a.lambda), v (a.v), w (a.w) { }
+  EIG (const EIG& a) : m_lambda (a.m_lambda), m_v (a.m_v), m_w (a.m_w) { }
 
   EIG& operator = (const EIG& a)
   {
     if (this != &a)
       {
-        lambda = a.lambda;
-        v = a.v;
-        w = a.w;
+        m_lambda = a.m_lambda;
+        m_v = a.m_v;
+        m_w = a.m_w;
       }
     return *this;
   }
 
   ~EIG (void) = default;
 
-  ComplexColumnVector eigenvalues (void) const { return lambda; }
-  ComplexMatrix right_eigenvectors (void) const { return v; }
-  ComplexMatrix left_eigenvectors (void) const { return w; }
+  ComplexColumnVector eigenvalues (void) const { return m_lambda; }
+  ComplexMatrix right_eigenvectors (void) const { return m_v; }
+  ComplexMatrix left_eigenvectors (void) const { return m_w; }
 
   friend std::ostream&  operator << (std::ostream& os, const EIG& a);
 
 private:
 
-  ComplexColumnVector lambda;
-  ComplexMatrix v;
-  ComplexMatrix w;
+  ComplexColumnVector m_lambda;
+  ComplexMatrix m_v;
+  ComplexMatrix m_w;
 
   octave_idx_type init (const Matrix& a, bool calc_rev, bool calc_lev,
                         bool balance);
--- a/liboctave/numeric/fEIG.cc	Wed Aug 25 11:58:57 2021 -0700
+++ b/liboctave/numeric/fEIG.cc	Wed Aug 25 12:30:01 2021 -0700
@@ -128,42 +128,42 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("sgeevx failed to converge");
 
-  lambda.resize (n);
-  v.resize (nvr, nvr);
-  w.resize (nvl, nvl);
+  m_lambda.resize (n);
+  m_v.resize (nvr, nvr);
+  m_w.resize (nvl, nvl);
 
   for (F77_INT j = 0; j < n; j++)
     {
       if (wi.elem (j) == 0.0)
         {
-          lambda.elem (j) = FloatComplex (wr.elem (j));
+          m_lambda.elem (j) = FloatComplex (wr.elem (j));
           for (octave_idx_type i = 0; i < nvr; i++)
-            v.elem (i, j) = vr.elem (i, j);
+            m_v.elem (i, j) = vr.elem (i, j);
 
           for (F77_INT i = 0; i < nvl; i++)
-            w.elem (i, j) = vl.elem (i, j);
+            m_w.elem (i, j) = vl.elem (i, j);
         }
       else
         {
           if (j+1 >= n)
             (*current_liboctave_error_handler) ("EIG: internal error");
 
-          lambda.elem (j) = FloatComplex (wr.elem (j), wi.elem (j));
-          lambda.elem (j+1) = FloatComplex (wr.elem (j+1), wi.elem (j+1));
+          m_lambda.elem (j) = FloatComplex (wr.elem (j), wi.elem (j));
+          m_lambda.elem (j+1) = FloatComplex (wr.elem (j+1), wi.elem (j+1));
 
           for (F77_INT i = 0; i < nvr; i++)
             {
               float real_part = vr.elem (i, j);
               float imag_part = vr.elem (i, j+1);
-              v.elem (i, j) = FloatComplex (real_part, imag_part);
-              v.elem (i, j+1) = FloatComplex (real_part, -imag_part);
+              m_v.elem (i, j) = FloatComplex (real_part, imag_part);
+              m_v.elem (i, j+1) = FloatComplex (real_part, -imag_part);
             }
           for (F77_INT i = 0; i < nvl; i++)
             {
               float real_part = vl.elem (i, j);
               float imag_part = vl.elem (i, j+1);
-              w.elem (i, j) = FloatComplex (real_part, imag_part);
-              w.elem (i, j+1) = FloatComplex (real_part, -imag_part);
+              m_w.elem (i, j) = FloatComplex (real_part, imag_part);
+              m_w.elem (i, j+1) = FloatComplex (real_part, -imag_part);
             }
           j++;
         }
@@ -217,9 +217,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("ssyev failed to converge");
 
-  lambda = FloatComplexColumnVector (wr);
-  v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
-  w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_lambda = FloatComplexColumnVector (wr);
+  m_v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
 
   return info;
 }
@@ -317,9 +317,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("cgeevx failed to converge");
 
-  lambda = wr;
-  v = vrtmp;
-  w = vltmp;
+  m_lambda = wr;
+  m_v = vrtmp;
+  m_w = vltmp;
 
   return info;
 }
@@ -377,9 +377,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("cheev failed to converge");
 
-  lambda = FloatComplexColumnVector (wr);
-  v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
-  w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_lambda = FloatComplexColumnVector (wr);
+  m_v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
 
   return info;
 }
@@ -476,45 +476,45 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("sggev failed to converge");
 
-  lambda.resize (n);
-  v.resize (nvr, nvr);
-  w.resize (nvl, nvl);
+  m_lambda.resize (n);
+  m_v.resize (nvr, nvr);
+  m_w.resize (nvl, nvl);
 
 
   for (F77_INT j = 0; j < n; j++)
     {
       if (ai.elem (j) == 0.0)
         {
-          lambda.elem (j) = FloatComplex (ar.elem (j) / beta.elem (j));
+          m_lambda.elem (j) = FloatComplex (ar.elem (j) / beta.elem (j));
           for (F77_INT i = 0; i < nvr; i++)
-            v.elem (i, j) = vr.elem (i, j);
+            m_v.elem (i, j) = vr.elem (i, j);
 
           for (F77_INT i = 0; i < nvl; i++)
-            w.elem (i, j) = vl.elem (i, j);
+            m_w.elem (i, j) = vl.elem (i, j);
         }
       else
         {
           if (j+1 >= n)
             (*current_liboctave_error_handler) ("EIG: internal error");
 
-          lambda.elem (j) = FloatComplex (ar.elem (j) / beta.elem (j),
-                                          ai.elem (j) / beta.elem (j));
-          lambda.elem (j+1) = FloatComplex (ar.elem (j+1) / beta.elem (j+1),
-                                            ai.elem (j+1) / beta.elem (j+1));
+          m_lambda.elem (j) = FloatComplex (ar.elem (j) / beta.elem (j),
+                                            ai.elem (j) / beta.elem (j));
+          m_lambda.elem (j+1) = FloatComplex (ar.elem (j+1) / beta.elem (j+1),
+                                              ai.elem (j+1) / beta.elem (j+1));
 
           for (F77_INT i = 0; i < nvr; i++)
             {
               float real_part = vr.elem (i, j);
               float imag_part = vr.elem (i, j+1);
-              v.elem (i, j) = FloatComplex (real_part, imag_part);
-              v.elem (i, j+1) = FloatComplex (real_part, -imag_part);
+              m_v.elem (i, j) = FloatComplex (real_part, imag_part);
+              m_v.elem (i, j+1) = FloatComplex (real_part, -imag_part);
             }
           for (F77_INT i = 0; i < nvl; i++)
             {
               float real_part = vl.elem (i, j);
               float imag_part = vl.elem (i, j+1);
-              w.elem (i, j) = FloatComplex (real_part, imag_part);
-              w.elem (i, j+1) = FloatComplex (real_part, -imag_part);
+              m_w.elem (i, j) = FloatComplex (real_part, imag_part);
+              m_w.elem (i, j+1) = FloatComplex (real_part, -imag_part);
             }
           j++;
         }
@@ -582,9 +582,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("ssygv failed to converge");
 
-  lambda = FloatComplexColumnVector (wr);
-  v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
-  w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_lambda = FloatComplexColumnVector (wr);
+  m_v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
 
   return info;
 }
@@ -685,13 +685,13 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("cggev failed to converge");
 
-  lambda.resize (n);
+  m_lambda.resize (n);
 
   for (F77_INT j = 0; j < n; j++)
-    lambda.elem (j) = alpha.elem (j) / beta.elem (j);
+    m_lambda.elem (j) = alpha.elem (j) / beta.elem (j);
 
-  v = vrtmp;
-  w = vltmp;
+  m_v = vrtmp;
+  m_w = vltmp;
 
   return info;
 }
@@ -761,9 +761,9 @@
   if (info > 0)
     (*current_liboctave_error_handler) ("zhegv failed to converge");
 
-  lambda = FloatComplexColumnVector (wr);
-  v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
-  w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_lambda = FloatComplexColumnVector (wr);
+  m_v = (calc_rev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
+  m_w = (calc_lev ? FloatComplexMatrix (atmp) : FloatComplexMatrix ());
 
   return info;
 }
--- a/liboctave/numeric/fEIG.h	Wed Aug 25 11:58:57 2021 -0700
+++ b/liboctave/numeric/fEIG.h	Wed Aug 25 12:30:01 2021 -0700
@@ -44,53 +44,53 @@
 
 public:
 
-  FloatEIG (void) : lambda (), v (), w () { }
+  FloatEIG (void) : m_lambda (), m_v (), m_w () { }
 
   FloatEIG (const FloatMatrix& a, bool calc_rev = true,
             bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, calc_rev, calc_lev, balance);
   }
 
   FloatEIG (const FloatMatrix& a, octave_idx_type& info,
             bool calc_rev = true, bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, calc_rev, calc_lev, balance);
   }
 
   FloatEIG (const FloatMatrix& a, const FloatMatrix& b,
             bool calc_rev = true, bool calc_lev = true, bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, b, calc_rev, calc_lev, force_qz);
   }
 
   FloatEIG (const FloatMatrix& a, const FloatMatrix& b, octave_idx_type& info,
             bool calc_rev = true, bool calc_lev = true, bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, b, calc_rev, calc_lev, force_qz);
   }
 
   FloatEIG (const FloatComplexMatrix& a, bool calc_rev = true,
             bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, calc_rev, calc_lev, balance);
   }
 
   FloatEIG (const FloatComplexMatrix& a, octave_idx_type& info,
             bool calc_rev = true, bool calc_lev = true, bool balance = true)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, calc_rev, calc_lev, balance);
   }
 
   FloatEIG (const FloatComplexMatrix& a, const FloatComplexMatrix& b,
             bool calc_rev = true, bool calc_lev = true, bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     init (a, b, calc_rev, calc_lev, force_qz);
   }
@@ -98,37 +98,37 @@
   FloatEIG (const FloatComplexMatrix& a, const FloatComplexMatrix& b,
             octave_idx_type& info, bool calc_rev = true, bool calc_lev = true,
             bool force_qz = false)
-    : lambda (), v (), w ()
+    : m_lambda (), m_v (), m_w ()
   {
     info = init (a, b, calc_rev, calc_lev, force_qz);
   }
 
-  FloatEIG (const FloatEIG& a) : lambda (a.lambda), v (a.v), w (a.w) { }
+  FloatEIG (const FloatEIG& a) : m_lambda (a.m_lambda), m_v (a.m_v), m_w (a.m_w) { }
 
   FloatEIG& operator = (const FloatEIG& a)
   {
     if (this != &a)
       {
-        lambda = a.lambda;
-        v = a.v;
-        w = a.w;
+        m_lambda = a.m_lambda;
+        m_v = a.m_v;
+        m_w = a.m_w;
       }
     return *this;
   }
 
   ~FloatEIG (void) = default;
 
-  FloatComplexColumnVector eigenvalues (void) const { return lambda; }
-  FloatComplexMatrix right_eigenvectors (void) const { return v; }
-  FloatComplexMatrix left_eigenvectors (void) const { return w; }
+  FloatComplexColumnVector eigenvalues (void) const { return m_lambda; }
+  FloatComplexMatrix right_eigenvectors (void) const { return m_v; }
+  FloatComplexMatrix left_eigenvectors (void) const { return m_w; }
 
   friend std::ostream&  operator << (std::ostream& os, const FloatEIG& a);
 
 private:
 
-  FloatComplexColumnVector lambda;
-  FloatComplexMatrix v;
-  FloatComplexMatrix w;
+  FloatComplexColumnVector m_lambda;
+  FloatComplexMatrix m_v;
+  FloatComplexMatrix m_w;
 
   octave_idx_type init (const FloatMatrix& a, bool calc_rev, bool calc_lev,
                         bool balance);