X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fprocsignal.cpp;h=7bf2711f0a626190dd01fa297d478b0d5c1a1431;hp=cd44cf834d8bd0d2b776c1a0a48f958229114329;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hpb=6afa21de8aa00b405de47584efe108c71df33e1b

diff --git a/libctsim/procsignal.cpp b/libctsim/procsignal.cpp
index cd44cf8..7bf2711 100644
--- a/libctsim/procsignal.cpp
+++ b/libctsim/procsignal.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: procsignal.cpp,v 1.9 2000/12/16 02:44:26 kevin Exp $
+**  $Id: procsignal.cpp,v 1.10 2000/12/16 06:12:47 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -256,7 +256,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	m_nFilterPoints = 1 << nextPowerOf2;
 #ifdef DEBUG
 	if (m_traceLevel >= Trace::TRACE_CONSOLE)
-	  cout << "nFilterPoints = " << m_nFilterPoints << endl;
+		std::cout << "nFilterPoints = " << m_nFilterPoints << endl;
 #endif
       }
       m_nOutputPoints = m_nFilterPoints * m_iPreinterpolationFactor;
@@ -333,7 +333,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
       m_nOutputPoints = m_nFilterPoints * m_iPreinterpolationFactor;
 #ifdef DEBUG
       if (m_traceLevel >= Trace::TRACE_CONSOLE)
-	cout << "nFilterPoints = " << m_nFilterPoints << endl;
+		  std::cout << "nFilterPoints = " << m_nFilterPoints << endl;
 #endif
       double* adSpatialFilter = new double [m_nFilterPoints];
       SignalFilter filter (m_idFilter, m_dFilterMin, m_dFilterMax, nSpatialPoints, m_dBandwidth, m_dFilterParam, SignalFilter::DOMAIN_SPATIAL);
@@ -369,11 +369,11 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	adSpatialFilter[i] = 0;
 
       m_adFilter = new double [m_nFilterPoints];
-      complex<double>* acInverseFilter = new complex<double> [m_nFilterPoints];
+      std::complex<double>* acInverseFilter = new std::complex<double> [m_nFilterPoints];
       finiteFourierTransform (adSpatialFilter, acInverseFilter, m_nFilterPoints, 1);
       	delete adSpatialFilter;
 	for (i = 0; i < m_nFilterPoints; i++)
- 	  m_adFilter[i] = abs(acInverseFilter[i]) * m_dSignalInc;
+		m_adFilter[i] = std::abs(acInverseFilter[i]) * m_dSignalInc;
 	delete acInverseFilter;
 #ifdef HAVE_SGP
       if (pEZPlot && m_traceLevel >= Trace::TRACE_PLOT) {
@@ -552,7 +552,7 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
       inputSignal[i] = input[i];
     for (i = m_nSignalPoints; i < m_nFilterPoints; i++)
       inputSignal[i] = 0;  // zeropad
-    complex<double>* fftSignal = new complex<double> [m_nFilterPoints];
+    std::complex<double>* fftSignal = new std::complex<double> [m_nFilterPoints];
     finiteFourierTransform (inputSignal, fftSignal, m_nFilterPoints, -1);
 	delete inputSignal;
     for (i = 0; i < m_nFilterPoints; i++)
@@ -569,7 +569,7 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
       inputSignal[i] = input[i];
     for (i = m_nSignalPoints; i < m_nFilterPoints; i++)
       inputSignal[i] = 0;  // zeropad
-    complex<double>* fftSignal = new complex<double> [m_nFilterPoints];
+    std::complex<double>* fftSignal = new std::complex<double> [m_nFilterPoints];
     finiteFourierTransform (inputSignal, fftSignal, -1);
 	delete inputSignal;
     for (i = 0; i < m_nFilterPoints; i++)
@@ -686,7 +686,7 @@ for (int i = 0; i < np; i++)
 void
 ProcessSignal::finiteFourierTransform (const double input[], double output[], const int n, int direction)
 {
-    complex<double>* complexOutput = new complex<double> [n];
+    std::complex<double>* complexOutput = new std::complex<double> [n];
 
     finiteFourierTransform (input, complexOutput, n, direction);
     for (int i = 0; i < n; i++)
@@ -695,7 +695,7 @@ ProcessSignal::finiteFourierTransform (const double input[], double output[], co
 }
 
 void
-ProcessSignal::finiteFourierTransform (const double input[], complex<double> output[], const int n, int direction)
+ProcessSignal::finiteFourierTransform (const double input[], std::complex<double> output[], const int n, int direction)
 {
   if (direction < 0)
     direction = -1;
@@ -715,13 +715,13 @@ ProcessSignal::finiteFourierTransform (const double input[], complex<double> out
       sumReal /= n;
       sumImag /= n;
     }
-    output[i] = complex<double> (sumReal, sumImag);
+    output[i] = std::complex<double> (sumReal, sumImag);
   }
 }
 
 
 void
-ProcessSignal::finiteFourierTransform (const complex<double> input[], complex<double> output[], const int n, int direction)
+ProcessSignal::finiteFourierTransform (const std::complex<double> input[], std::complex<double> output[], const int n, int direction)
 {
   if (direction < 0)
     direction = -1;
@@ -730,10 +730,10 @@ ProcessSignal::finiteFourierTransform (const complex<double> input[], complex<do
     
   double angleIncrement = direction * 2 * PI / n;
   for (int i = 0; i < n; i++) {
-    complex<double> sum (0,0);
+    std::complex<double> sum (0,0);
     for (int j = 0; j < n; j++) {
       double angle = i * j * angleIncrement;
-      complex<double> exponentTerm (cos(angle), sin(angle));
+      std::complex<double> exponentTerm (cos(angle), sin(angle));
       sum += input[j] * exponentTerm;
     }
     if (direction < 0) {
@@ -744,7 +744,7 @@ ProcessSignal::finiteFourierTransform (const complex<double> input[], complex<do
 }
 
 void
-ProcessSignal::finiteFourierTransform (const complex<double> input[], double output[], const int n, int direction)
+ProcessSignal::finiteFourierTransform (const std::complex<double> input[], double output[], const int n, int direction)
 {
   if (direction < 0)
     direction = -1;
@@ -768,7 +768,7 @@ ProcessSignal::finiteFourierTransform (const complex<double> input[], double out
 // Table-based routines
 
 void
-ProcessSignal::finiteFourierTransform (const double input[], complex<double> output[], int direction) const
+ProcessSignal::finiteFourierTransform (const double input[], std::complex<double> output[], int direction) const
 {
   if (direction < 0)
     direction = -1;
@@ -791,13 +791,13 @@ ProcessSignal::finiteFourierTransform (const double input[], complex<double> out
       sumReal /= m_nFilterPoints;
       sumImag /= m_nFilterPoints;
     }
-    output[i] = complex<double> (sumReal, sumImag);
+    output[i] = std::complex<double> (sumReal, sumImag);
   }
 }
 
 // (a+bi) * (c + di) = (ac - bd) + (ad + bc)i
 void
-ProcessSignal::finiteFourierTransform (const complex<double> input[], complex<double> output[], int direction) const
+ProcessSignal::finiteFourierTransform (const std::complex<double> input[], std::complex<double> output[], int direction) const
 {
   if (direction < 0)
     direction = -1;
@@ -824,12 +824,12 @@ ProcessSignal::finiteFourierTransform (const complex<double> input[], complex<do
       sumReal /= m_nFilterPoints;
       sumImag /= m_nFilterPoints;
     }
-    output[i] = complex<double> (sumReal, sumImag);
+    output[i] = std::complex<double> (sumReal, sumImag);
   }
 }
 
 void
-ProcessSignal::finiteFourierTransform (const complex<double> input[], double output[], int direction) const
+ProcessSignal::finiteFourierTransform (const std::complex<double> input[], double output[], int direction) const
 {
   if (direction < 0)
     direction = -1;