diff liboctave/numeric/Quad.h @ 17769:49a5a4be04a1

maint: Use GNU style coding conventions for code in liboctave/ * liboctave/array/Array-C.cc, liboctave/array/Array-b.cc, liboctave/array/Array-ch.cc, liboctave/array/Array-d.cc, liboctave/array/Array-f.cc, liboctave/array/Array-fC.cc, liboctave/array/Array-util.cc, liboctave/array/Array-util.h, liboctave/array/Array.cc, liboctave/array/Array.h, liboctave/array/Array3.h, liboctave/array/CColVector.cc, liboctave/array/CColVector.h, liboctave/array/CDiagMatrix.cc, liboctave/array/CDiagMatrix.h, liboctave/array/CMatrix.cc, liboctave/array/CMatrix.h, liboctave/array/CNDArray.cc, liboctave/array/CNDArray.h, liboctave/array/CRowVector.cc, liboctave/array/CRowVector.h, liboctave/array/CSparse.cc, liboctave/array/CSparse.h, liboctave/array/DiagArray2.h, liboctave/array/MArray.cc, liboctave/array/MArray.h, liboctave/array/MDiagArray2.cc, liboctave/array/MDiagArray2.h, liboctave/array/MSparse.cc, liboctave/array/MSparse.h, liboctave/array/MatrixType.cc, liboctave/array/MatrixType.h, liboctave/array/PermMatrix.h, liboctave/array/Range.cc, liboctave/array/Range.h, liboctave/array/Sparse.cc, liboctave/array/Sparse.h, liboctave/array/boolMatrix.cc, liboctave/array/boolMatrix.h, liboctave/array/boolNDArray.cc, liboctave/array/boolNDArray.h, liboctave/array/boolSparse.cc, liboctave/array/boolSparse.h, liboctave/array/chMatrix.cc, liboctave/array/chMatrix.h, liboctave/array/chNDArray.cc, liboctave/array/chNDArray.h, liboctave/array/dColVector.h, liboctave/array/dDiagMatrix.cc, liboctave/array/dDiagMatrix.h, liboctave/array/dMatrix.cc, liboctave/array/dMatrix.h, liboctave/array/dNDArray.cc, liboctave/array/dNDArray.h, liboctave/array/dRowVector.h, liboctave/array/dSparse.cc, liboctave/array/dSparse.h, liboctave/array/dim-vector.cc, liboctave/array/dim-vector.h, liboctave/array/fCColVector.cc, liboctave/array/fCColVector.h, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCDiagMatrix.h, liboctave/array/fCMatrix.cc, liboctave/array/fCMatrix.h, liboctave/array/fCNDArray.cc, liboctave/array/fCNDArray.h, liboctave/array/fCRowVector.cc, liboctave/array/fCRowVector.h, liboctave/array/fColVector.h, liboctave/array/fDiagMatrix.cc, liboctave/array/fDiagMatrix.h, liboctave/array/fMatrix.cc, liboctave/array/fMatrix.h, liboctave/array/fNDArray.cc, liboctave/array/fNDArray.h, liboctave/array/fRowVector.h, liboctave/array/idx-vector.cc, liboctave/array/idx-vector.h, liboctave/array/intNDArray.cc, liboctave/array/intNDArray.h, liboctave/cruft/misc/blaswrap.c, liboctave/cruft/misc/quit.cc, liboctave/numeric/CmplxCHOL.cc, liboctave/numeric/CmplxCHOL.h, liboctave/numeric/CmplxGEPBAL.cc, liboctave/numeric/CmplxGEPBAL.h, liboctave/numeric/CmplxHESS.h, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxLU.h, liboctave/numeric/CmplxQR.cc, liboctave/numeric/CmplxQRP.cc, liboctave/numeric/CmplxQRP.h, liboctave/numeric/CmplxSCHUR.h, liboctave/numeric/CmplxSVD.cc, liboctave/numeric/CmplxSVD.h, liboctave/numeric/CollocWt.h, liboctave/numeric/DAE.h, liboctave/numeric/DAEFunc.h, liboctave/numeric/DAERT.h, liboctave/numeric/DAERTFunc.h, liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc, liboctave/numeric/DASRT.h, liboctave/numeric/DASSL.cc, liboctave/numeric/DET.h, liboctave/numeric/EIG.cc, liboctave/numeric/EIG.h, liboctave/numeric/LSODE.cc, liboctave/numeric/ODE.h, liboctave/numeric/ODEFunc.h, liboctave/numeric/ODES.h, liboctave/numeric/ODESFunc.h, liboctave/numeric/Quad.cc, liboctave/numeric/Quad.h, liboctave/numeric/SparseCmplxCHOL.h, liboctave/numeric/SparseCmplxLU.cc, liboctave/numeric/SparseCmplxLU.h, liboctave/numeric/SparseCmplxQR.cc, liboctave/numeric/SparseCmplxQR.h, liboctave/numeric/SparseQR.cc, liboctave/numeric/SparseQR.h, liboctave/numeric/SparsedbleCHOL.h, liboctave/numeric/SparsedbleLU.cc, liboctave/numeric/SparsedbleLU.h, liboctave/numeric/base-aepbal.h, liboctave/numeric/base-dae.h, liboctave/numeric/base-de.h, liboctave/numeric/base-lu.cc, liboctave/numeric/base-lu.h, liboctave/numeric/base-min.h, liboctave/numeric/base-qr.h, liboctave/numeric/bsxfun.h, liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleCHOL.h, liboctave/numeric/dbleGEPBAL.h, liboctave/numeric/dbleHESS.h, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleLU.h, liboctave/numeric/dbleQR.cc, liboctave/numeric/dbleQRP.cc, liboctave/numeric/dbleQRP.h, liboctave/numeric/dbleSCHUR.cc, liboctave/numeric/dbleSCHUR.h, liboctave/numeric/dbleSVD.cc, liboctave/numeric/dbleSVD.h, liboctave/numeric/eigs-base.cc, liboctave/numeric/fCmplxAEPBAL.cc, liboctave/numeric/fCmplxAEPBAL.h, liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxCHOL.h, liboctave/numeric/fCmplxGEPBAL.cc, liboctave/numeric/fCmplxGEPBAL.h, liboctave/numeric/fCmplxHESS.h, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxLU.h, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/fCmplxQR.h, liboctave/numeric/fCmplxQRP.cc, liboctave/numeric/fCmplxQRP.h, liboctave/numeric/fCmplxSCHUR.cc, liboctave/numeric/fCmplxSCHUR.h, liboctave/numeric/fCmplxSVD.h, liboctave/numeric/fEIG.cc, liboctave/numeric/fEIG.h, liboctave/numeric/floatCHOL.cc, liboctave/numeric/floatCHOL.h, liboctave/numeric/floatGEPBAL.cc, liboctave/numeric/floatGEPBAL.h, liboctave/numeric/floatHESS.h, liboctave/numeric/floatLU.cc, liboctave/numeric/floatLU.h, liboctave/numeric/floatQR.cc, liboctave/numeric/floatQRP.cc, liboctave/numeric/floatQRP.h, liboctave/numeric/floatSCHUR.cc, liboctave/numeric/floatSCHUR.h, liboctave/numeric/floatSVD.cc, liboctave/numeric/floatSVD.h, liboctave/numeric/lo-mappers.cc, liboctave/numeric/lo-mappers.h, liboctave/numeric/lo-specfun.cc, liboctave/numeric/lo-specfun.h, liboctave/numeric/oct-convn.cc, liboctave/numeric/oct-fftw.cc, liboctave/numeric/oct-fftw.h, liboctave/numeric/oct-norm.cc, liboctave/numeric/oct-rand.cc, liboctave/numeric/oct-rand.h, liboctave/numeric/randgamma.c, liboctave/numeric/randgamma.h, liboctave/numeric/randmtzig.c, liboctave/numeric/randpoisson.c, liboctave/numeric/randpoisson.h, liboctave/numeric/sparse-base-chol.h, liboctave/numeric/sparse-base-lu.h, liboctave/numeric/sparse-dmsolve.cc, liboctave/operators/Sparse-diag-op-defs.h, liboctave/operators/Sparse-op-defs.h, liboctave/operators/mx-inlines.cc, liboctave/system/dir-ops.h, liboctave/system/file-ops.cc, liboctave/system/file-stat.cc, liboctave/system/file-stat.h, liboctave/system/lo-sysdep.cc, liboctave/system/lo-sysdep.h, liboctave/system/mach-info.cc, liboctave/system/mach-info.h, liboctave/system/oct-env.cc, liboctave/system/oct-group.cc, liboctave/system/oct-syscalls.cc, liboctave/system/oct-syscalls.h, liboctave/system/oct-time.h, liboctave/system/tempname.c, liboctave/util/action-container.h, liboctave/util/base-list.h, liboctave/util/cmd-edit.cc, liboctave/util/cmd-edit.h, liboctave/util/cmd-hist.cc, liboctave/util/cmd-hist.h, liboctave/util/data-conv.cc, liboctave/util/data-conv.h, liboctave/util/kpse.cc, liboctave/util/lo-array-gripes.cc, liboctave/util/lo-cieee.c, liboctave/util/lo-regexp.cc, liboctave/util/lo-utils.cc, liboctave/util/oct-alloc.cc, liboctave/util/oct-base64.cc, liboctave/util/oct-binmap.h, liboctave/util/oct-cmplx.h, liboctave/util/oct-glob.cc, liboctave/util/oct-inttypes.cc, liboctave/util/oct-inttypes.h, liboctave/util/oct-locbuf.cc, liboctave/util/oct-locbuf.h, liboctave/util/oct-mem.h, liboctave/util/oct-mutex.cc, liboctave/util/oct-refcount.h, liboctave/util/oct-shlib.cc, liboctave/util/oct-shlib.h, liboctave/util/oct-sort.cc, liboctave/util/oct-sort.h, liboctave/util/pathsearch.cc, liboctave/util/pathsearch.h, liboctave/util/sparse-util.cc, liboctave/util/str-vec.cc, liboctave/util/str-vec.h, liboctave/util/unwind-prot.h, liboctave/util/url-transfer.cc, liboctave/util/url-transfer.h: Use GNU style coding conventions.
author Rik <rik@octave.org>
date Sat, 26 Oct 2013 18:57:05 -0700
parents d63878346099
children ebb3ef964372
line wrap: on
line diff
--- a/liboctave/numeric/Quad.h
+++ b/liboctave/numeric/Quad.h
@@ -37,8 +37,7 @@
 
 #endif
 
-// FIXME -- would be nice to not have to have this global
-// variable.
+// FIXME: would be nice to not have to have this global variable.
 // Nonzero means an error occurred in the calculation of the integrand
 // function, and the user wants us to quit.
 extern OCTAVE_API int quad_integration_error;
@@ -49,7 +48,7 @@
 OCTAVE_API
 Quad : public Quad_options
 {
- public:
+public:
 
   Quad (integrand_fcn fcn)
     : Quad_options (), f (fcn), ff () { }
@@ -60,60 +59,64 @@
   virtual ~Quad (void) { }
 
   virtual double integrate (void)
-    {
-      octave_idx_type ier, neval;
-      double abserr;
-      return do_integrate (ier, neval, abserr);
-    }
+  {
+    octave_idx_type ier, neval;
+    double abserr;
+    return do_integrate (ier, neval, abserr);
+  }
 
   virtual float float_integrate (void)
-    {
-      octave_idx_type ier, neval;
-      float abserr;
-      return do_integrate (ier, neval, abserr);
-    }
+  {
+    octave_idx_type ier, neval;
+    float abserr;
+    return do_integrate (ier, neval, abserr);
+  }
 
   virtual double integrate (octave_idx_type& ier)
-    {
-      octave_idx_type neval;
-      double abserr;
-      return do_integrate (ier, neval, abserr);
-    }
+  {
+    octave_idx_type neval;
+    double abserr;
+    return do_integrate (ier, neval, abserr);
+  }
 
   virtual float float_integrate (octave_idx_type& ier)
-    {
-      octave_idx_type neval;
-      float abserr;
-      return do_integrate (ier, neval, abserr);
-    }
+  {
+    octave_idx_type neval;
+    float abserr;
+    return do_integrate (ier, neval, abserr);
+  }
 
   virtual double integrate (octave_idx_type& ier, octave_idx_type& neval)
-    {
-      double abserr;
-      return do_integrate (ier, neval, abserr);
-    }
+  {
+    double abserr;
+    return do_integrate (ier, neval, abserr);
+  }
 
   virtual float float_integrate (octave_idx_type& ier, octave_idx_type& neval)
-    {
-      float abserr;
-      return do_integrate (ier, neval, abserr);
-    }
+  {
+    float abserr;
+    return do_integrate (ier, neval, abserr);
+  }
 
-  virtual double integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr)
-    {
-      return do_integrate (ier, neval, abserr);
-    }
+  virtual double integrate (octave_idx_type& ier, octave_idx_type& neval,
+                            double& abserr)
+  {
+    return do_integrate (ier, neval, abserr);
+  }
 
-  virtual float float_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr)
-    {
-      return do_integrate (ier, neval, abserr);
-    }
+  virtual float float_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                                 float& abserr)
+  {
+    return do_integrate (ier, neval, abserr);
+  }
 
-  virtual double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr) = 0;
+  virtual double do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                               double& abserr) = 0;
 
-  virtual float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr) = 0;
+  virtual float do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                              float& abserr) = 0;
 
- protected:
+protected:
 
   integrand_fcn f;
   float_integrand_fcn ff;
@@ -123,7 +126,7 @@
 OCTAVE_API
 DefQuad : public Quad
 {
- public:
+public:
 
   DefQuad (integrand_fcn fcn)
     : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities () { }
@@ -142,11 +145,13 @@
 
   ~DefQuad (void) { }
 
-  double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr);
+  double do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                       double& abserr);
 
-  float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr);
+  float do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                      float& abserr);
 
- private:
+private:
 
   double lower_limit;
   double upper_limit;
@@ -158,7 +163,7 @@
 OCTAVE_API
 IndefQuad : public Quad
 {
- public:
+public:
 
   enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite };
 
@@ -170,11 +175,13 @@
 
   ~IndefQuad (void) { }
 
-  double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr);
+  double do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                       double& abserr);
 
-  float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr);
+  float do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                      float& abserr);
 
- private:
+private:
 
   double bound;
   IntegralType type;
@@ -185,7 +192,7 @@
 OCTAVE_API
 FloatDefQuad : public Quad
 {
- public:
+public:
 
   FloatDefQuad (float_integrand_fcn fcn)
     : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities () { }
@@ -194,7 +201,7 @@
     : Quad (fcn), lower_limit (ll), upper_limit (ul), singularities () { }
 
   FloatDefQuad (float_integrand_fcn fcn, float ll, float ul,
-           const FloatColumnVector& sing)
+                const FloatColumnVector& sing)
     : Quad (fcn), lower_limit (ll), upper_limit (ul),
       singularities (sing) { }
 
@@ -204,11 +211,13 @@
 
   ~FloatDefQuad (void) { }
 
-  double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr);
+  double do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                       double& abserr);
 
-  float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr);
+  float do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                      float& abserr);
 
- private:
+private:
 
   float lower_limit;
   float upper_limit;
@@ -220,7 +229,7 @@
 OCTAVE_API
 FloatIndefQuad : public Quad
 {
- public:
+public:
 
   enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite };
 
@@ -232,11 +241,13 @@
 
   ~FloatIndefQuad (void) { }
 
-  double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr);
+  double do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                       double& abserr);
 
-  float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr);
+  float do_integrate (octave_idx_type& ier, octave_idx_type& neval,
+                      float& abserr);
 
- private:
+private:
 
   float bound;
   IntegralType type;