Mercurial > octave

changeset 29981:0c3d248a3b44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Code cleanup in Sparse::sort routines. * Sparse.cc: Define new variable sort_by_column for code readability. Use std::swap for code readability. Cuddle parenthesis when indexing.
author Rik <rik@octave.org>
date Tue, 17 Aug 2021 10:50:49 -0700
parents e3e0193963ea
children 605275522c37
files liboctave/array/Sparse.cc
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/Sparse.cc	Tue Aug 17 09:46:52 2021 -0700
+++ b/liboctave/array/Sparse.cc	Tue Aug 17 10:50:49 2021 -0700
@@ -2281,7 +2281,7 @@
 }
 
 // Can't use versions of these in Array.cc due to duplication of the
-// instantiations for Array<double and Sparse<double>, etc
+// instantiations for Array<double and Sparse<double>, etc.
 template <typename T>
 OCTAVE_API
 bool
@@ -2313,11 +2313,11 @@
   if (m.numel () < 1 || dim > 1)
     return m;
 
-  if (dim > 0)
+  bool sort_by_column = (dim > 0);
+  if (sort_by_column)
     {
       m = m.transpose ();
-      nr = m.rows ();
-      nc = m.columns ();
+      std::swap (nr, nc);
     }
 
   octave_sort<T> lsort;
@@ -2361,7 +2361,7 @@
       mridx += ns;
     }
 
-  if (dim > 0)
+  if (sort_by_column)
     m = m.transpose ();
 
   return m;
@@ -2384,11 +2384,11 @@
       return m;
     }
 
-  if (dim > 0)
+  bool sort_by_column = (dim > 0);
+  if (sort_by_column)
     {
       m = m.transpose ();
-      nr = m.rows ();
-      nc = m.columns ();
+      std::swap (nr, nc);
     }
 
   octave_sort<T> indexed_sort;
@@ -2416,7 +2416,7 @@
       if (ns == 0)
         {
           for (octave_idx_type k = 0; k < nr; k++)
-            sidx (offset + k) = k;
+            sidx(offset + k) = k;
         }
       else
         {
@@ -2446,18 +2446,18 @@
               if (ii < ns && mridx[ii] == k)
                 ii++;
               else
-                sidx (offset + jj++) = k;
+                sidx(offset + jj++) = k;
             }
 
           for (octave_idx_type k = 0; k < i; k++)
             {
-              sidx (k + offset) = vi[k];
+              sidx(k + offset) = vi[k];
               mridx[k] = k;
             }
 
           for (octave_idx_type k = i; k < ns; k++)
             {
-              sidx (k - ns + nr + offset) = vi[k];
+              sidx(k - ns + nr + offset) = vi[k];
               mridx[k] = k - ns + nr;
             }
 
@@ -2466,7 +2466,7 @@
         }
     }
 
-  if (dim > 0)
+  if (sort_by_column)
     {
       m = m.transpose ();
       sidx = sidx.transpose ();