Mercurial > octave-nkf

diff liboctave/numeric/oct-norm.cc @ 19895:19755f4fc851

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Cleanup C++ code to follow Octave coding conventions. Try to wrap long lines to < 80 characters. Use GNU style and don't indent first brace of function definition. "case" statement is aligned flush left with brace of switch stmt. Remove trailing '\' line continuation from the end of #define macros. Use 2 spaces for indent. * files-dock-widget.cc, history-dock-widget.cc, main-window.cc, octave-cmd.cc, octave-dock-widget.cc, octave-gui.cc, resource-manager.cc, settings-dialog.cc, shortcut-manager.cc, welcome-wizard.cc, workspace-view.cc, cellfun.cc, data.cc, debug.cc, debug.h, dirfns.cc, error.h, file-io.cc, gl-render.cc, gl-render.h, gl2ps-renderer.h, graphics.cc, graphics.in.h, help.cc, input.cc, load-path.cc, load-path.h, lookup.cc, lu.cc, oct-stream.cc, octave-default-image.h, ordschur.cc, pr-output.cc, qz.cc, strfns.cc, symtab.cc, symtab.h, sysdep.cc, variables.cc, zfstream.h, __fltk_uigetfile__.cc, __init_fltk__.cc, __magick_read__.cc, __osmesa_print__.cc, audiodevinfo.cc, ov-classdef.cc, ov-classdef.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-java.cc, ov-range.cc, ov-re-mat.cc, ov-usr-fcn.h, ov.cc, op-int.h, options-usage.h, pt-eval.cc, Array-C.cc, Array-fC.cc, Array.cc, Array.h, PermMatrix.cc, Sparse.cc, chMatrix.h, dSparse.cc, dim-vector.h, bsxfun-decl.h, bsxfun-defs.cc, oct-norm.cc, Sparse-op-defs.h, oct-inttypes.cc, oct-inttypes.h, main.in.cc, mkoctfile.in.cc: Cleanup C++ code to follow Octave coding conventions.
author Rik <rik@octave.org>
date Wed, 25 Feb 2015 11:55:49 -0800
parents 4197fc428c7d
children 277b12eed117
line wrap: on
line diff
--- a/liboctave/numeric/oct-norm.cc	Wed Feb 25 16:23:45 2015 +0100
+++ b/liboctave/numeric/oct-norm.cc	Wed Feb 25 11:55:49 2015 -0800
@@ -77,20 +77,20 @@
 
   template<class U>
   void accum (U val)
-    {
-      octave_quit ();
-      R t = std::abs (val);
-      if (scl == t) // we need this to handle Infs properly
+  {
+    octave_quit ();
+    R t = std::abs (val);
+    if (scl == t) // we need this to handle Infs properly
+      sum += 1;
+    else if (scl < t)
+      {
+        sum *= std::pow (scl/t, p);
         sum += 1;
-      else if (scl < t)
-        {
-          sum *= std::pow (scl/t, p);
-          sum += 1;
-          scl = t;
-        }
-      else if (t != 0)
-        sum += std::pow (t/scl, p);
-    }
+        scl = t;
+      }
+    else if (t != 0)
+      sum += std::pow (t/scl, p);
+  }
   operator R () { return scl * std::pow (sum, 1/p); }
 };
 
@@ -105,20 +105,20 @@
 
   template<class U>
   void accum (U val)
-    {
-      octave_quit ();
-      R t = 1 / std::abs (val);
-      if (scl == t)
+  {
+    octave_quit ();
+    R t = 1 / std::abs (val);
+    if (scl == t)
+      sum += 1;
+    else if (scl < t)
+      {
+        sum *= std::pow (scl/t, p);
         sum += 1;
-      else if (scl < t)
-        {
-          sum *= std::pow (scl/t, p);
-          sum += 1;
-          scl = t;
-        }
-      else if (t != 0)
-        sum += std::pow (t/scl, p);
-    }
+        scl = t;
+      }
+    else if (t != 0)
+      sum += std::pow (t/scl, p);
+  }
   operator R () { return scl * std::pow (sum, -1/p); }
 };
 
@@ -132,25 +132,25 @@
   norm_accumulator_2 () : scl(0), sum(1) {}
 
   void accum (R val)
-    {
-      R t = std::abs (val);
-      if (scl == t)
+  {
+    R t = std::abs (val);
+    if (scl == t)
+      sum += 1;
+    else if (scl < t)
+      {
+        sum *= pow2 (scl/t);
         sum += 1;
-      else if (scl < t)
-        {
-          sum *= pow2 (scl/t);
-          sum += 1;
-          scl = t;
-        }
-      else if (t != 0)
-        sum += pow2 (t/scl);
-    }
+        scl = t;
+      }
+    else if (t != 0)
+      sum += pow2 (t/scl);
+  }
 
   void accum (std::complex<R> val)
-    {
-      accum (val.real ());
-      accum (val.imag ());
-    }
+  {
+    accum (val.real ());
+    accum (val.imag ());
+  }
 
   operator R () { return scl * std::sqrt (sum); }
 };
@@ -164,9 +164,9 @@
   norm_accumulator_1 () : sum (0) {}
   template<class U>
   void accum (U val)
-    {
-      sum += std::abs (val);
-    }
+  {
+    sum += std::abs (val);
+  }
   operator R () { return sum; }
 };
 
@@ -179,9 +179,9 @@
   norm_accumulator_inf () : max (0) {}
   template<class U>
   void accum (U val)
-    {
-      max = std::max (max, std::abs (val));
-    }
+  {
+    max = std::max (max, std::abs (val));
+  }
   operator R () { return max; }
 };
 
@@ -194,9 +194,9 @@
   norm_accumulator_minf () : min (octave_Inf) {}
   template<class U>
   void accum (U val)
-    {
-      min = std::min (min, std::abs (val));
-    }
+  {
+    min = std::min (min, std::abs (val));
+  }
   operator R () { return min; }
 };
 
@@ -209,9 +209,9 @@
   norm_accumulator_0 () : num (0) {}
   template<class U>
   void accum (U val)
-    {
-      if (val != static_cast<U> (0)) ++num;
-    }
+  {
+    if (val != static_cast<U> (0)) ++num;
+  }
   operator R () { return num; }
 };