Changeset 3700

Show
Ignore:
Timestamp:
10/03/06 15:30:01
Author:
jcorgan
Message:

Applied changeset r3699 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.cc

    r3534 r3700  
    3535} 
    3636 
    37 gr_feval_ff::~gr_feval_ff(){} 
    38  
    39 float  
    40 gr_feval_ff::eval(float x) 
    41 { 
    42   return 0; 
    43 } 
    44  
    4537gr_feval_cc::~gr_feval_cc(){} 
    4638 
    …… 
    6860} 
    6961 
    70 float 
    71 gr_feval_ff_example(gr_feval_ff *f, float x) 
    72 { 
    73   return f->eval(x); 
    74 } 
    75  
    7662gr_complex 
    7763gr_feval_cc_example(gr_feval_cc *f, gr_complex x) 

  • gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.h

    r3534 r3700  
    4646 
    4747/*! 
    48  * \brief base class for evaluating a function: float -> float 
    49  * 
    50  * This class is designed to be subclassed in Python or C++ 
    51  * and is callable from both places.  It uses SWIG's 
    52  * "director" feature to implement the magic. 
    53  * It's slow. Don't use it in a performance critical path. 
    54  */ 
    55 class gr_feval_ff 
    56 { 
    57 public: 
    58   gr_feval_ff() {} 
    59   virtual ~gr_feval_ff(); 
    60  
    61   /*! 
    62    * \brief override this to define the function 
    63    */ 
    64   virtual float eval(float x); 
    65 }; 
    66  
    67 /*! 
    6848 * \brief base class for evaluating a function: complex -> complex 
    6949 * 
    …… 
    10989 */ 
    11090double     gr_feval_dd_example(gr_feval_dd *f, double x); 
    111 float      gr_feval_ff_example(gr_feval_ff *f, float x); 
    11291gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x); 
    11392long       gr_feval_ll_example(gr_feval_ll *f, long x);