Mercurial > octave-nkf

changeset 20265:e914b5399c67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use in-place operators in C++ code where possible. * libgui/src/dialog.cc, libgui/src/m-editor/file-editor-tab.cc, libgui/src/main-window.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/mgorth.cc, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/pr-output.cc, liboctave/array/Array-util.cc, liboctave/array/dim-vector.h, liboctave/numeric/CollocWt.cc, liboctave/numeric/eigs-base.cc, liboctave/numeric/lo-specfun.cc: Use in-place operators in C++ code where possible.
author Rik <rik@octave.org>
date Mon, 25 May 2015 22:02:15 -0700
parents 5dfaaaae784f
children 83792dd9bcc1
files libgui/src/dialog.cc libgui/src/m-editor/file-editor-tab.cc libgui/src/main-window.cc libinterp/corefcn/bsxfun.cc libinterp/corefcn/filter.cc libinterp/corefcn/mgorth.cc libinterp/corefcn/oct-stream.cc libinterp/corefcn/pr-output.cc liboctave/array/Array-util.cc liboctave/array/dim-vector.h liboctave/numeric/CollocWt.cc liboctave/numeric/eigs-base.cc liboctave/numeric/lo-specfun.cc
diffstat 13 files changed, 52 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/dialog.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libgui/src/dialog.cc	Mon May 25 22:02:15 2015 -0700
@@ -519,7 +519,7 @@
 
   // if not showing only dirs, add end slash for the path component
   if (testOption (QFileDialog::ShowDirsOnly)  == false)
-    path = path + "/";
+    path += "/";
 
   // convert to native slashes
   path = QDir::toNativeSeparators (path);
--- a/libgui/src/m-editor/file-editor-tab.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libgui/src/m-editor/file-editor-tab.cc	Mon May 25 22:02:15 2015 -0700
@@ -482,12 +482,12 @@
           _prep_apis_file = prep_apis_path + lexer->lexer () + "_k";
 
           if (octave_builtins)
-            _prep_apis_file = _prep_apis_file + "b";  // use builtins, too
+            _prep_apis_file += "b";  // use builtins, too
 
           if (octave_functions)
-            _prep_apis_file = _prep_apis_file + "f";  // use keywords, too
+            _prep_apis_file += "f";  // use keywords, too
 
-          _prep_apis_file = _prep_apis_file + ".pap"; // final name of apis file
+          _prep_apis_file += ".pap"; // final name of apis file
 
           // check whether the APIs info needs to be prepared and saved
           QFileInfo apis_file = QFileInfo (_prep_apis_file);
--- a/libgui/src/main-window.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libgui/src/main-window.cc	Mon May 25 22:02:15 2015 -0700
@@ -747,7 +747,7 @@
         { // if children has a name
           icon = widget_icon_data[icon_set_found].path; // prefix or octave-logo
           if (widget_icon_data[icon_set_found].name != "NONE")
-            icon = icon + name + ".png"; // add widget name and ext.
+            icon += name + ".png"; // add widget name and ext.
           widget->setWindowIcon (QIcon (icon));
         }
     }
--- a/libinterp/corefcn/bsxfun.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libinterp/corefcn/bsxfun.cc	Mon May 25 22:02:15 2015 -0700
@@ -242,7 +242,7 @@
           else
             idx(j) = octave_value ((i % dvc(j)) + 1);
 
-          i = i / dvc(j);
+          i /= dvc(j);
         }
 
       Ac = A;
@@ -262,8 +262,8 @@
               is_changed = true;
             }
 
-          k = k / dvc(j);
-          k1 = k1 / dvc(j);
+          k /= dvc(j);
+          k1 /= dvc(j);
         }
 
       if (is_changed)
@@ -295,7 +295,7 @@
       for (octave_idx_type j = 1; j < nd; j++)
         {
           idx (j) = octave_value (i % dv(j) + 1);
-          i = i / dv(j);
+          i /= dv(j);
         }
     }
 }
@@ -310,7 +310,7 @@
   for (octave_idx_type j = 1; j < nd; j++)
     {
       idx(j) = i % dv(j);
-      i = i / dv(j);
+      i /= dv(j);
     }
 }
 
--- a/libinterp/corefcn/filter.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libinterp/corefcn/filter.cc	Mon May 25 22:02:15 2015 -0700
@@ -127,8 +127,8 @@
 
   if (norm != static_cast<T> (1.0))
     {
-      a = a / norm;
-      b = b / norm;
+      a /= norm;
+      b /= norm;
     }
 
   if (a_len <= 1 && si_len <= 0)
--- a/libinterp/corefcn/mgorth.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libinterp/corefcn/mgorth.cc	Mon May 25 22:02:15 2015 -0700
@@ -45,7 +45,7 @@
 
   h(Vc) = xnorm (x);
   if (real (h(Vc)) > 0)
-    x = x / h(Vc);
+    x /= h(Vc);
 }
 
 DEFUN (mgorth, args, nargout,
--- a/libinterp/corefcn/oct-stream.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libinterp/corefcn/oct-stream.cc	Mon May 25 22:02:15 2015 -0700
@@ -342,13 +342,13 @@
           else
             {
               char c = s[i++];
-              width = width * 10 + c - '0';
+              width = 10 * width + c - '0';
               have_width = true;
               *buf << c;
               while (i < n && isdigit (s[i]))
                 {
                   c = s[i++];
-                  width = width * 10 + c - '0';
+                  width = 10 * width + c - '0';
                   *buf << c;
                 }
             }
--- a/libinterp/corefcn/pr-output.cc	Sun May 24 04:47:20 2015 +0100
+++ b/libinterp/corefcn/pr-output.cc	Mon May 25 22:02:15 2015 -0700
@@ -393,8 +393,8 @@
             }
 
           frac = flip - step;
-          n = n * step + lastn;
-          d = d * step + lastd;
+          n = step * n + lastn;
+          d = step * d + lastd;
           lastn = nextn;
           lastd = nextd;
 
--- a/liboctave/array/Array-util.cc	Sun May 24 04:47:20 2015 +0100
+++ b/liboctave/array/Array-util.cc	Mon May 25 22:02:15 2015 -0700
@@ -560,7 +560,7 @@
           // All scalars case - the result is a scalar.
           octave_idx_type idx = idxa(len-1)(0);
           for (octave_idx_type i = len - 2; i >= 0; i--)
-            idx = idx * dvx(i) + idxa(i)(0);
+            idx = dvx(i) * idx + idxa(i)(0);
           retval = idx_vector (idx);
         }
       else if (all_ranges && clen != 0)
@@ -572,8 +572,8 @@
             {
               octave_idx_type xstart = idxa(i)(0);
               octave_idx_type xstep = idxa(i)(1) - xstart;
-              start = start * dvx(i) + xstart;
-              step = step * dvx(i) + xstep;
+              start = dvx(i) * start + xstart;
+              step = dvx(i) * step + xstep;
             }
           retval = idx_vector::make_range (start, step, clen);
         }
--- a/liboctave/array/dim-vector.h	Sun May 24 04:47:20 2015 +0100
+++ b/liboctave/array/dim-vector.h	Mon May 25 22:02:15 2015 -0700
@@ -458,7 +458,7 @@
   {
     octave_idx_type k = 0;
     for (int i = length () - 1; i >= 0; i--)
-      k = k * rep[i] + idx[i];
+      k = rep[i] * k + idx[i];
 
     return k;
   }
@@ -469,7 +469,7 @@
   {
     octave_idx_type k = 0;
     for (int i = nidx - 1; i >= 0; i--)
-      k = k * rep[i] + idx[i];
+      k = rep[i] * k + idx[i];
 
     return k;
   }
--- a/liboctave/numeric/CollocWt.cc	Sun May 24 04:47:20 2015 +0100
+++ b/liboctave/numeric/CollocWt.cc	Mon May 25 22:02:15 2015 -0700
@@ -175,9 +175,9 @@
             dif2[i] = (ab + ap + z1) / z / z / (z + 1.0);
           else
             {
-              z = z * z;
+              z *= z;
               double y = z1 * (ab + z1);
-              y = y * (ap + y);
+              y *= (ap + y);
               dif2[i] = y / z / (z - 1.0);
             }
         }
@@ -218,11 +218,11 @@
           if (i != 0)
             {
               for (octave_idx_type j = 1; j <= i; j++)
-                zc = zc - z / (x - root[j-1]);
+                zc -= z / (x - root[j-1]);
             }
 
-          z = z / zc;
-          x = x - z;
+          z /= zc;
+          x -= z;
 
           // Famous last words:  100 iterations should be more than
           // enough in all cases.
@@ -235,7 +235,7 @@
         }
 
       root[i] = x;
-      x = x + sqrt (std::numeric_limits<double>::epsilon ());
+      x += sqrt (std::numeric_limits<double>::epsilon ());
     }
 
   // Add interpolation points at x = 0 and/or x = 1.
@@ -362,7 +362,7 @@
 
           vect[j] = ax / (dif1[j] * dif1[j]);
 
-          y = y + vect[j];
+          y += vect[j];
         }
 
       for (octave_idx_type j = 0; j < nt; j++)
--- a/liboctave/numeric/eigs-base.cc	Sun May 24 04:47:20 2015 +0100
+++ b/liboctave/numeric/eigs-base.cc	Mon May 25 22:02:15 2015 -0700
@@ -457,15 +457,14 @@
                 }
               tmp.xcidx (n) = n;
 
-              AminusSigmaB = AminusSigmaB - sigma * tmp *
-                             b.transpose () * b * tmp.transpose ();
+              AminusSigmaB -= sigma * tmp *
+                              b.transpose () * b * tmp.transpose ();
             }
           else
-            AminusSigmaB = AminusSigmaB - sigma *
-                           b.transpose () * b;
+            AminusSigmaB -= sigma * b.transpose () * b;
         }
       else
-        AminusSigmaB = AminusSigmaB - sigma * b;
+        AminusSigmaB -= sigma * b;
     }
   else
     {
@@ -480,7 +479,7 @@
           sigmat.xcidx (i+1) = i + 1;
         }
 
-      AminusSigmaB = AminusSigmaB - sigmat;
+      AminusSigmaB -= sigmat;
     }
 
   SparseLU fact (AminusSigmaB);
@@ -552,10 +551,10 @@
                                      static_cast<octave_idx_type>(pB[j]));
             }
           else
-            AminusSigmaB = AminusSigmaB - tmp;
+            AminusSigmaB -= tmp;
         }
       else
-        AminusSigmaB = AminusSigmaB - sigma * b;
+        AminusSigmaB -= sigma * b;
     }
   else
     {
@@ -622,14 +621,14 @@
                 }
               tmp.xcidx (n) = n;
 
-              AminusSigmaB = AminusSigmaB - tmp * b.hermitian () * b *
-                             tmp.transpose () * sigma;
+              AminusSigmaB -= tmp * b.hermitian () * b *
+                              tmp.transpose () * sigma;
             }
           else
-            AminusSigmaB = AminusSigmaB - sigma * b.hermitian () * b;
+            AminusSigmaB -= sigma * b.hermitian () * b;
         }
       else
-        AminusSigmaB = AminusSigmaB - sigma * b;
+        AminusSigmaB -= sigma * b;
     }
   else
     {
@@ -644,7 +643,7 @@
           sigmat.xcidx (i+1) = i + 1;
         }
 
-      AminusSigmaB = AminusSigmaB - sigmat;
+      AminusSigmaB -= sigmat;
     }
 
   SparseComplexLU fact (AminusSigmaB);
@@ -716,10 +715,10 @@
                                      static_cast<octave_idx_type>(pB[j]));
             }
           else
-            AminusSigmaB = AminusSigmaB - tmp;
+            AminusSigmaB -= tmp;
         }
       else
-        AminusSigmaB = AminusSigmaB - sigma * b;
+        AminusSigmaB -= sigma * b;
     }
   else
     {
--- a/liboctave/numeric/lo-specfun.cc	Sun May 24 04:47:20 2015 +0100
+++ b/liboctave/numeric/lo-specfun.cc	Mon May 25 22:02:15 2015 -0700
@@ -3250,14 +3250,14 @@
 
   for ( ; ; )
     {
-      term = term * temp * rx / (pp + ai);
-      value = value + term;
+      term *= temp * rx / (pp + ai);
+      value += term;
       temp = fabs (term);
 
       if (temp <= acu && temp <= acu * value)
         {
-          value = value * exp (pp * gnulib::log (xx)
-                               + (qq - 1.0) * gnulib::log (cx) - beta) / pp;
+          value *= exp (pp * gnulib::log (xx)
+                        + (qq - 1.0) * gnulib::log (cx) - beta) / pp;
 
           if (indx)
             {
@@ -3266,8 +3266,8 @@
           break;
         }
 
-      ai = ai + 1.0;
-      ns = ns - 1;
+      ai += 1.0;
+      ns -= 1;
 
       if (0 <= ns)
         {
@@ -3280,7 +3280,7 @@
       else
         {
           temp = psq;
-          psq = psq + 1.0;
+          psq += 1.0;
         }
     }
 
@@ -3452,7 +3452,7 @@
                       break;
                     }
                 }
-              g = g / 3.0;
+              g /= 3.0;
             }
 
           if (prev <= acu)
@@ -3478,7 +3478,7 @@
               break;
             }
 
-          g = g / 3.0;
+          g /= 3.0;
         }
 
       if (tx == value)