[Commit-gnuradio] r3610 - gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general

[eb]

Author: eb
Date: 2006-09-21 23:55:41 -0600 (Thu, 21 Sep 2006)
New Revision: 3610

Modified:
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
Log:
Formatting changes.  Merged from -r3576:3609 trondeau/digital-wip


Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
      2006-09-22 05:43:55 UTC (rev 3609)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
      2006-09-22 05:55:41 UTC (rev 3610)
@@ -29,23 +29,25 @@
 #include <gri_agc_cc.h>
 
 gr_agc_cc_sptr
-gr_make_agc_cc (float rate, float reference, float gain, float max_gain)
+gr_make_agc_cc (float rate, float reference, 
+               float gain, float max_gain)
 {
   return gr_agc_cc_sptr (new gr_agc_cc (rate, reference, gain, max_gain));
 }
 
-gr_agc_cc::gr_agc_cc (float rate, float reference, float gain, float max_gain)
+gr_agc_cc::gr_agc_cc (float rate, float reference, 
+                     float gain, float max_gain)
   : gr_sync_block ("gr_agc_cc",
                   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-                  gr_make_io_signature (1, 1, sizeof (gr_complex)))
-  , gri_agc_cc (rate,  reference, gain, max_gain)
+                  gr_make_io_signature (1, 1, sizeof (gr_complex))), 
+    gri_agc_cc (rate, reference, gain, max_gain)
 {
 }
 
 int
 gr_agc_cc::work (int noutput_items,
-                        gr_vector_const_void_star &input_items,
-                        gr_vector_void_star &output_items)
+                gr_vector_const_void_star &input_items,
+                gr_vector_void_star &output_items)
 {
   const gr_complex *in = (const gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
       2006-09-22 05:43:55 UTC (rev 3609)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
       2006-09-22 05:55:41 UTC (rev 3610)
@@ -29,7 +29,8 @@
 typedef boost::shared_ptr<gr_agc_cc> gr_agc_cc_sptr;
 
 gr_agc_cc_sptr
-gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, float gain = 1.0, 
float max_gain = 0.0);
+gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, 
+               float gain = 1.0, float max_gain = 0.0);
 /*!
  * \brief high performance Automatic Gain Control class
  *
@@ -38,8 +39,10 @@
 
 class gr_agc_cc : public gr_sync_block, public gri_agc_cc
 {
-  friend gr_agc_cc_sptr gr_make_agc_cc (float rate, float reference, float 
gain, float max_gain);
-  gr_agc_cc (float rate, float reference, float gain, float max_gain);
+  friend gr_agc_cc_sptr gr_make_agc_cc (float rate, float reference, 
+                                       float gain, float max_gain);
+  gr_agc_cc (float rate, float reference, 
+            float gain, float max_gain);
 
  public:
   virtual int work (int noutput_items,

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
       2006-09-22 05:43:55 UTC (rev 3609)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
       2006-09-22 05:55:41 UTC (rev 3610)
@@ -25,9 +25,11 @@
 %include <gri_agc_cc.i>
 
 gr_agc_cc_sptr
-gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, float gain = 1.0, 
float max_gain = 0.0);
+gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, 
+               float gain = 1.0, float max_gain = 0.0);
 
 class gr_agc_cc : public gr_sync_block , public gri_agc_cc
 {
-  gr_agc_cc (float rate, float reference, float gain, float max_gain);
+  gr_agc_cc (float rate, float reference, 
+             float gain, float max_gain);
 };

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
      2006-09-22 05:43:55 UTC (rev 3609)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
      2006-09-22 05:55:41 UTC (rev 3610)
@@ -34,8 +34,10 @@
 class gri_agc_cc {
 
  public:
-  gri_agc_cc (float rate = 1e-4, float reference = 1.0, float gain = 1.0, 
float max_gain = 0.0)
-    : _rate(rate), _reference(reference), _gain(gain), _max_gain(max_gain) {};
+  gri_agc_cc (float rate = 1e-4, float reference = 1.0, 
+              float gain = 1.0, float max_gain = 0.0)
+    : _rate(rate), _reference(reference),
+      _gain(gain), _max_gain(max_gain) {};
 
   float rate () const      { return _rate; }
   float reference () const { return _reference; }
@@ -46,11 +48,12 @@
   void set_reference (float reference) { _reference = reference; }
   void set_gain (float gain) { _gain = gain; }
   void set_max_gain(float max_gain) { _max_gain = max_gain; }
-  
+
   gr_complex scale (gr_complex input){
     gr_complex output = input * _gain;
-    _gain += (_reference - 
sqrt(output.real()*output.real()+output.imag()*output.imag())) * _rate; //use 
abs or cabs to get approximation by absolute value, 
-                                                     //note that abs is 
computationally more intensive then norm for a complex number
+    
+    _gain +=  _rate * (_reference - sqrt(output.real()*output.real() + 
+                                        output.imag()*output.imag()));
     if (_max_gain > 0.0 && _gain > _max_gain)
        _gain = _max_gain;                                                   
     return output;

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
      2006-09-22 05:43:55 UTC (rev 3609)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
      2006-09-22 05:55:41 UTC (rev 3610)
@@ -32,7 +32,8 @@
 class gri_agc_cc {
 
  public:
-  gri_agc_cc (float rate = 1e-4, float reference = 1.0, float gain = 1.0, 
float max_gain = 0.0);
+  gri_agc_cc (float rate = 1e-4, float reference = 1.0, 
+              float gain = 1.0, float max_gain = 0.0);
   float rate ();
   float reference ();
   float gain ();