Mercurial > octave

changeset 29606:270ffe1e7647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tril.cc: Use standard functions for min and max operations. * libinterp/corefcn/tril.cc (do_trilu): Use standard functions for min and max operations.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 05 May 2021 10:50:22 +0200
parents 7460baab17ad
children 0169ffb3fe5d
files libinterp/corefcn/tril.cc
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/tril.cc	Tue May 04 14:03:19 2021 -0700
+++ b/libinterp/corefcn/tril.cc	Wed May 05 10:50:22 2021 +0200
@@ -293,13 +293,15 @@
         tmp = tmp.subsasgn ("(", idx_tmp, arg.index_op (ov_idx));
         tmp = tmp.resize (dims);
 
+        octave_idx_type one = 1;
+
         if (lower)
           {
-            octave_idx_type st = (nc < nr + k ? nc : nr + k);
+            octave_idx_type st = std::min (nc, nr + k);
 
             for (octave_idx_type j = 1; j <= st; j++)
               {
-                octave_idx_type nr_limit = (1 > j - k ? 1 : j - k);
+                octave_idx_type nr_limit = std::max (one, j - k);
                 ov_idx(1) = static_cast<double> (j);
                 ov_idx(0) = octave::range<double> (nr_limit, nr);
                 std::list<octave_value_list> idx;
@@ -310,11 +312,11 @@
           }
         else
           {
-            octave_idx_type st = (k + 1 > 1 ? k + 1 : 1);
+            octave_idx_type st = std::max (k + 1, one);
 
             for (octave_idx_type j = st; j <= nc; j++)
               {
-                octave_idx_type nr_limit = (nr < j - k ? nr : j - k);
+                octave_idx_type nr_limit = std::min (nr, j - k);
                 ov_idx(1) = static_cast<double> (j);
                 ov_idx(0) = octave::range<double> (1, nr_limit);
                 std::list<octave_value_list> idx;