[med-svn] [SCM] aghermann branch, master, updated. 83bfc7bafe1055d29be61afe3e8ec4482539aa1d

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 52dec1037a99ef24e43e8164234c3fc182b1976c
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Nov 17 23:29:29 2012 +0200

    housekeeping and remaining TFLoat->double work from 28d0a7150

diff --git a/src/sigproc/ext-filters.cc b/src/sigproc/ext-filters.cc
index 63ace71..30781de 100644
--- a/src/sigproc/ext-filters.cc
+++ b/src/sigproc/ext-filters.cc
@@ -1,6 +1,6 @@
 // ;-*-C++-*-
 /*
- *       File name:  libsigproc/ext-filters.cc
+ *       File name:  sigproc/ext-filters.cc
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2012-03-11
@@ -13,7 +13,7 @@
 
 #include <gsl/gsl_math.h>
 
-#include "../common/lang.hh"
+#include "common/lang.hh"
 #include "ext-filters.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
diff --git a/src/sigproc/ext-filters.hh b/src/sigproc/ext-filters.hh
index f6bda85..410d32b 100644
--- a/src/sigproc/ext-filters.hh
+++ b/src/sigproc/ext-filters.hh
@@ -1,6 +1,6 @@
 // ;-*-C++-*-
 /*
- *       File name:  libsigproc/ext-filters.hh
+ *       File name:  sigproc/ext-filters.hh
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2012-03-11
@@ -15,6 +15,7 @@
 
 #include <valarray>
 #include <stdexcept>
+#include "common/lang.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
 #  include "config.h"
@@ -25,7 +26,7 @@ using namespace std;
 namespace sigproc {
 
 class CFilter_base {
-	CFilter_base() = delete;
+	DELETE_DEFAULT_METHODS (CFilter_base);
 
     public:
 	enum TFilterDirection { forward, back };
@@ -50,10 +51,12 @@ class CFilter_base {
 };
 
 
-class CFilterIIR : public CFilter_base {
-	CFilterIIR() = delete;
+class CFilterIIR
+  : public CFilter_base {
+	DELETE_DEFAULT_METHODS (CFilterIIR);
+
     protected:
-	CFilterIIR( size_t samplerate_,
+	CFilterIIR (size_t samplerate_,
 		    TFilterDirection direction_,
 		    double gain_, double back_polate_)
 	      : CFilter_base (samplerate_, direction_),
@@ -83,10 +86,12 @@ class CFilterIIR : public CFilter_base {
 };
 
 
-class CFilterSE : public CFilterIIR {
+class CFilterSE
+  : public CFilterIIR {
+	DELETE_DEFAULT_METHODS (CFilterSE);
+
     public:
-	void calculate_iir_coefficients();
-	CFilterSE( size_t samplerate_, TFilterDirection direction_,
+	CFilterSE (size_t samplerate_, TFilterDirection direction_,
 		   double gain_, double back_polate_,
 		   double f0_, double fc_, double bandwidth_)
 	      : CFilterIIR (samplerate_, direction_, gain_, back_polate_),
@@ -98,18 +103,23 @@ class CFilterSE : public CFilterIIR {
 			poles.resize(3); filter_state_p.resize(4);    // NrPoles+1 !!!!!111адинадин
 			calculate_iir_coefficients();
 		}
+
+	void calculate_iir_coefficients();
+
     private:
 	double	f0,
 		fc,
 		bandwidth;
 };
 
-class CFilterDUE : public CFilterIIR {
+class CFilterDUE
+  : public CFilterIIR {
+	DELETE_DEFAULT_METHODS (CFilterDUE);
+
     public:
-	void calculate_iir_coefficients();
-	CFilterDUE( size_t samplerate_, TFilterDirection direction_,
-		    TFloat gain_, TFloat back_polate_,
-		    TFloat minus_3db_frequency_)
+	CFilterDUE (size_t samplerate_, TFilterDirection direction_,
+		    double gain_, double back_polate_,
+		    double minus_3db_frequency_)
 	      : CFilterIIR (samplerate_, direction_, gain_, back_polate_),
 		minus_3db_frequency (minus_3db_frequency_)
 		{
@@ -117,6 +127,9 @@ class CFilterDUE : public CFilterIIR {
 			poles.resize(1); filter_state_p.resize(2);    // NrPoles+1 !!!!!
 			calculate_iir_coefficients();
 		}
+
+	void calculate_iir_coefficients();
+
     private:
 	double	minus_3db_frequency;
 };
diff --git a/src/sigproc/sigproc.cc b/src/sigproc/sigproc.cc
index 395e598..9d01995 100644
--- a/src/sigproc/sigproc.cc
+++ b/src/sigproc/sigproc.cc
@@ -1,6 +1,6 @@
 // ;-*-C++-*-
 /*
- *       File name:  libexstrom/sigproc.cc
+ *       File name:  sigproc/sigproc.cc
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2010-12-26
@@ -32,7 +32,6 @@ template double sigproc::sig_diff( const valarray<TFloat>&, const valarray<TFloa
 template double sigproc::phase_diff( const valarray<TFloat>&, const valarray<TFloat>&, size_t, size_t, size_t, float, float, unsigned, size_t);
 
 
-
 valarray<float>
 sigproc::
 resample_f( const valarray<float>& signal,
diff --git a/src/sigproc/sigproc.hh b/src/sigproc/sigproc.hh
index d354fad..dc1a55c 100644
--- a/src/sigproc/sigproc.hh
+++ b/src/sigproc/sigproc.hh
@@ -10,8 +10,8 @@
  *         License:  GPL
  */
 
-#ifndef _SIGPROC_SIGPROC_HH
-#define _SIGPROC_SIGPROC_HH
+#ifndef _SIGPROC_SIGPROC_H
+#define _SIGPROC_SIGPROC_H
 
 #include <cmath>
 #include <vector>
diff --git a/src/sigproc/sigproc.ii b/src/sigproc/sigproc.ii
index 700d07f..29846a9 100644
--- a/src/sigproc/sigproc.ii
+++ b/src/sigproc/sigproc.ii
@@ -1,6 +1,6 @@
 // ;-*-C++-*-
 /*
- *       File name:  libexstrom/sigproc.ii
+ *       File name:  sigproc/sigproc.ii
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2012-03-11

-- 
Sleep experiment manager