X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fprocsignal.cpp;h=41895ac06a37308f297e000bf8cf9b1ad5b43551;hp=8c45da42d91300ef3c04902dad49ba5255a58548;hb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;hpb=9f7d379c2b03f3c09907cfd885072433e0428042

diff --git a/libctsim/procsignal.cpp b/libctsim/procsignal.cpp
index 8c45da4..41895ac 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.12 2001/01/01 10:14:34 kevin Exp $
+**  $Id: procsignal.cpp,v 1.13 2001/01/02 05:34:57 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
@@ -189,7 +189,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
         pEZPlot->plot (pSGP);
       }
 #endif	    
-      shuffleNaturalToFourierOrder (adFrequencyFilter, m_nFilterPoints);
+      Fourier::shuffleNaturalToFourierOrder (adFrequencyFilter, m_nFilterPoints);
 #ifdef HAVE_SGP
       if (pEZPlot && m_traceLevel >= Trace::TRACE_PLOT) {
         pEZPlot->ezset ("title Filter Response: Fourier Order");
@@ -210,7 +210,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
         pEZPlot->plot (pSGP);
       }
 #endif
-      shuffleFourierToNaturalOrder (m_adFilter, m_nFilterPoints);
+      Fourier::shuffleFourierToNaturalOrder (m_adFilter, m_nFilterPoints);
 #ifdef HAVE_SGP
       if (pEZPlot && m_traceLevel >= Trace::TRACE_PLOT) {
         pEZPlot->ezset ("title Inverse Fourier Frequency: Natural Order");
@@ -304,7 +304,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
         pEZPlot->plot (pSGP);
       }
 #endif
-      shuffleNaturalToFourierOrder (m_adFilter, m_nFilterPoints);
+      Fourier::shuffleNaturalToFourierOrder (m_adFilter, m_nFilterPoints);
 #ifdef HAVE_SGP
       if (pEZPlot && m_traceLevel >= Trace::TRACE_PLOT) {
         pEZPlot->ezset ("title Filter Filter: Fourier Order");
@@ -855,200 +855,3 @@ ProcessSignal::finiteFourierTransform (const std::complex<double> input[], doubl
   }
 }
 
-// Odd Number of Points
-//   Natural Frequency Order: -(n-1)/2...-1,0,1...(n-1)/2
-//   Fourier Frequency Order: 0, 1..(n-1)/2,-(n-1)/2...-1
-// Even Number of Points
-//   Natural Frequency Order: -n/2...-1,0,1...((n/2)-1)
-//   Fourier Frequency Order: 0,1...((n/2)-1),-n/2...-1
-
-void
-ProcessSignal::shuffleNaturalToFourierOrder (double* pdVector, const int n)
-{
-  double* pdTemp = new double [n];
-  int i;
-  if (n % 2) { // Odd
-    int iHalfN = (n - 1) / 2;
-    
-    pdTemp[0] = pdVector[iHalfN];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1] = pdVector[i + 1 + iHalfN];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i];
-  } else {     // Even
-    int iHalfN = n / 2;
-    pdTemp[0] = pdVector[iHalfN];
-#if USE_BROKEN_SHUFFLE
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1] = pdVector[i + iHalfN];
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i];
-#else
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + 1] = pdVector[i + iHalfN + 1];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + iHalfN] = pdVector[i];
-#endif
-  }
-  
-  for (i = 0; i < n; i++)
-    pdVector[i] = pdTemp[i];
-  delete pdTemp;
-}
-
-void
-ProcessSignal::shuffleNaturalToFourierOrder (std::complex<double>* pdVector, const int n)
-{
-  std::complex<double>* pdTemp = new std::complex<double> [n];
-  int i;
-  if (n % 2) { // Odd
-    int iHalfN = (n - 1) / 2;
-    
-    pdTemp[0] = pdVector[iHalfN];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1] = pdVector[i + 1 + iHalfN];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i];
-  } else {     // Even
-    int iHalfN = n / 2;
-    pdTemp[0] = pdVector[iHalfN];
-#if USE_BROKEN_SHUFFLE
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1] = pdVector[i + iHalfN];
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i];
-#else
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + 1] = pdVector[i + iHalfN + 1];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + iHalfN] = pdVector[i];
-#endif
-  }
-  
-  for (i = 0; i < n; i++)
-    pdVector[i] = pdTemp[i];
-  delete [] pdTemp;
-}
-
-
-void
-ProcessSignal::shuffleNaturalToFourierOrder (float* pdVector, const int n)
-{
-  float* pdTemp = new float [n];
-  int i;
-  if (n % 2) { // Odd
-    int iHalfN = (n - 1) / 2;
-    
-    pdTemp[0] = pdVector[iHalfN];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1] = pdVector[i + 1 + iHalfN];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i];
-  } else {     // Even
-    int iHalfN = n / 2;
-    pdTemp[0] = pdVector[iHalfN];
-#if USE_BROKEN_SHUFFLE
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1] = pdVector[i + iHalfN];
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i];
-#else
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + 1] = pdVector[i + iHalfN + 1];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + iHalfN] = pdVector[i];
-#endif
-  }
-  
-  for (i = 0; i < n; i++)
-    pdVector[i] = pdTemp[i];
-  delete pdTemp;
-}
-
-
-
-void
-ProcessSignal::shuffleFourierToNaturalOrder (double* pdVector, const int n)
-{
-  double* pdTemp = new double [n];
-  int i;
-  if (n % 2) { // Odd
-    int iHalfN = (n - 1) / 2;
-    
-    pdTemp[iHalfN] = pdVector[0];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1 + iHalfN] = pdVector[i + 1];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i] = pdVector[i + iHalfN + 1];
-  } else {     // Even
-    int iHalfN = n / 2;
-    pdTemp[iHalfN] = pdVector[0];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i] = pdVector[i + iHalfN];
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i+1];
-  }
-  
-  for (i = 0; i < n; i++)
-    pdVector[i] = pdTemp[i];
-  delete pdTemp;
-}
-
-
-void
-ProcessSignal::shuffleFourierToNaturalOrder (std::complex<double>* pdVector, const int n)
-{
-  std::complex<double>* pdTemp = new std::complex<double> [n];
-  int i;
-  if (n % 2) { // Odd
-    int iHalfN = (n - 1) / 2;
-    
-    pdTemp[iHalfN] = pdVector[0];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i + 1 + iHalfN] = pdVector[i + 1];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i] = pdVector[i + iHalfN + 1];
-  } else {     // Even
-    int iHalfN = n / 2;
-    pdTemp[iHalfN] = pdVector[0];
-    for (i = 0; i < iHalfN; i++)
-      pdTemp[i] = pdVector[i + iHalfN];
-    for (i = 0; i < iHalfN - 1; i++)
-      pdTemp[i + iHalfN + 1] = pdVector[i+1];
-  }
-  
-  for (i = 0; i < n; i++)
-    pdVector[i] = pdTemp[i];
-  delete [] pdTemp;
-}
-
-
-
-
-void
-ProcessSignal::shuffleFourierToNaturalOrder (float* pVector, const int n)
-{
-  float* pTemp = new float [n];
-  int i;
-  if (n % 2) { // Odd
-    int iHalfN = (n - 1) / 2;
-    
-    pTemp[iHalfN] = pVector[0];
-    for (i = 0; i < iHalfN; i++)
-      pTemp[i + 1 + iHalfN] = pVector[i + 1];
-    for (i = 0; i < iHalfN; i++)
-      pTemp[i] = pVector[i + iHalfN + 1];
-  } else {     // Even
-    int iHalfN = n / 2;
-    pTemp[iHalfN] = pVector[0];
-    for (i = 0; i < iHalfN; i++)
-      pTemp[i] = pVector[i + iHalfN];
-    for (i = 0; i < iHalfN - 1; i++)
-      pTemp[i + iHalfN + 1] = pVector[i+1];
-  }
-  
-  for (i = 0; i < n; i++)
-    pVector[i] = pTemp[i];
-  delete [] pTemp;
-}
-