[Commit-gnuradio] gnuradio-core/src/lib/filter gr_goertzel_fc.h g...

[Johnathan Corgan]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Johnathan Corgan <jcorgan>      06/06/25 19:36:58

Modified files:
        src/lib/filter : gr_goertzel_fc.h gr_goertzel_fc.i 
                         gri_goertzel.cc gri_goertzel.h 

Log message:
        Miscellaneous cleanup.  Basic testing okay; no automated QA testing yet.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/filter/gr_goertzel_fc.h?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/filter/gr_goertzel_fc.i?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/filter/gri_goertzel.cc?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/filter/gri_goertzel.h?cvsroot=gnuradio&r1=1.1&r2=1.2

Patches:
Index: gr_goertzel_fc.h
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_goertzel_fc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gr_goertzel_fc.h    23 Jun 2006 21:11:33 -0000      1.1
+++ gr_goertzel_fc.h    25 Jun 2006 19:36:58 -0000      1.2
@@ -38,14 +38,14 @@
  */
 class gr_goertzel_fc : public gr_sync_decimator
 {
- private:
+private:
   friend gr_goertzel_fc_sptr gr_make_goertzel_fc (int rate, int points, float 
freq);
 
   gr_goertzel_fc(int rate, int points, float freq);
   gri_goertzel d_goertzel;
   int          d_points;
 
- public:
+public:
   ~gr_goertzel_fc();
 
   int work(int noutput_items,

Index: gr_goertzel_fc.i
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_goertzel_fc.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gr_goertzel_fc.i    23 Jun 2006 21:11:33 -0000      1.1
+++ gr_goertzel_fc.i    25 Jun 2006 19:36:58 -0000      1.2
@@ -27,6 +27,6 @@
 class gr_goertzel_fc : public gr_sync_decimator
 {
 private:
-  gr_goertzel_fc ();
+  gr_goertzel_fc();
 };
 

Index: gri_goertzel.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gri_goertzel.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gri_goertzel.cc     23 Jun 2006 21:11:33 -0000      1.1
+++ gri_goertzel.cc     25 Jun 2006 19:36:58 -0000      1.2
@@ -35,8 +35,6 @@
   d_wi = std::sin(w);
 
   d_n = points;
-
-  printf("wr: %f wi: %f n: %i\n", d_wr, d_wi, d_n);
 }
 
 gr_complex gri_goertzel::dft(float *input)
@@ -52,7 +50,3 @@
 
   return gr_complex((0.5*d_wr*d_d1-d_d2)/d_n, (d_wi*d_d1)/d_n);
 }
-
-gri_goertzel::~gri_goertzel()
-{
-}

Index: gri_goertzel.h
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gri_goertzel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gri_goertzel.h      23 Jun 2006 21:11:33 -0000      1.1
+++ gri_goertzel.h      25 Jun 2006 19:36:58 -0000      1.2
@@ -33,7 +33,6 @@
 {
 public:
   gri_goertzel(int rate, int points, float freq);
- ~gri_goertzel();
 
   gr_complex dft(float *input);
 
@@ -46,4 +45,3 @@
 };
 
 #endif /* INCLUDED_GRI_GOERTZEL_H */
-