blocks: removing gr_transcendental from gnuradio-core.

author: Tom Rondeau <trondeau@vt.edu> 2013-02-26 10:43:33 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2013-02-26 10:43:33 -0500
commit: f7170fa2eea2cd1e43d5e3dc895052dc2cf11e01 (patch)
tree: 6b4c400495d7f55203d9052730ddc42a50e2735a /gnuradio-core/src/lib
parent: b6d44e1927feb571191b4dc8226b1b3e7b59dbba (diff)
5 files changed, 0 insertions, 238 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index d4287685d9..d38d478e7d 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -168,7 +168,6 @@ set(gr_core_general_triple_threats
     gr_remez
     gr_skiphead
     gr_test
-    gr_transcendental
     gr_vco_f
     gr_vector_map
     gr_unpack_k_bits_bb
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index 36ae0de6f3..1769c1e832 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -40,7 +40,6 @@
 #include <gr_firdes.h>
 #include <gr_random_pdu.h>
 #include <gr_fake_channel_coder_pp.h>
-#include <gr_transcendental.h>
 #include <gr_vco_f.h>
 #include <gr_pa_2x2_phase_combiner.h>
 #include <gr_kludge_copy.h>
@@ -81,7 +80,6 @@
 %include "gr_firdes.i"
 %include "gr_random_pdu.i"
 %include "gr_fake_channel_coder_pp.i"
-%include "gr_transcendental.i"
 %include "gr_vco_f.i"
 %include "gr_pa_2x2_phase_combiner.i"
 %include "gr_kludge_copy.i"
diff --git a/gnuradio-core/src/lib/general/gr_transcendental.cc b/gnuradio-core/src/lib/general/gr_transcendental.cc
deleted file mode 100644
index c1482491ba..0000000000
--- a/gnuradio-core/src/lib/general/gr_transcendental.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gr_transcendental.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-#include <complex> //complex math
-#include <cmath> //real math
-#include <map>
-
-/***********************************************************************
- * work function creation and registration
- **********************************************************************/
-typedef int(*work_fcn_type)(int, gr_vector_const_void_star &, gr_vector_void_star &);
-struct map_val_type{
-    work_fcn_type work_fcn;
-    size_t io_size;
-};
-typedef std::map<std::string, map_val_type> map_type;
-
-//construct map on first use idiom
-static map_type &get_map(void){
-    static map_type map;
-    return map;
-}
-
-//static initialization of this object registers a function
-struct gr_transcendental_registrant{
-    gr_transcendental_registrant(
-        const std::string &key,
-        const work_fcn_type &work_fcn,
-        const size_t io_size
-    ){
-        map_val_type val;
-        val.work_fcn = work_fcn;
-        val.io_size = io_size;
-        get_map()[key] = val;
-    }
-};
-
-//macro to create a work function and register it
-#define REGISTER_FUNCTION(__fcn__, __type__, __key__)                   \
-    static int __key__ ## _work(                                        \
-        int noutput_items,                                              \
-        gr_vector_const_void_star &input_items,                         \
-        gr_vector_void_star &output_items                               \
-    ){                                                                  \
-        const __type__ *in = (const __type__ *) input_items[0];         \
-        __type__ *out = (__type__ *) output_items[0];                   \
-        for (size_t i = 0; i < size_t(noutput_items); i++){             \
-            out[i] = std::__fcn__(in[i]);                               \
-        }                                                               \
-        return noutput_items;                                           \
-    }                                                                   \
-    gr_transcendental_registrant __key__ ## _registrant(#__key__, &__key__ ## _work, sizeof(__type__));
-
-//register work functions for real types
-#define REGISTER_REAL_FUNCTIONS(__fcn__) \
-    REGISTER_FUNCTION(__fcn__, float, __fcn__ ## _float) \
-    REGISTER_FUNCTION(__fcn__, double, __fcn__ ## _double)
-
-//register work functions for complex types
-#define REGISTER_COMPLEX_FUNCTIONS(__fcn__) \
-    REGISTER_FUNCTION(__fcn__, std::complex<float>, __fcn__ ## _complex_float) \
-    REGISTER_FUNCTION(__fcn__, std::complex<double>, __fcn__ ## _complex_double)
-
-//register both complex and real
-#define REGISTER_FUNCTIONS(__fcn__) \
-    REGISTER_REAL_FUNCTIONS(__fcn__) \
-    REGISTER_COMPLEX_FUNCTIONS(__fcn__)
-
-//create and register transcendental work functions
-REGISTER_FUNCTIONS(cos)
-REGISTER_FUNCTIONS(sin)
-REGISTER_FUNCTIONS(tan)
-REGISTER_REAL_FUNCTIONS(acos)
-REGISTER_REAL_FUNCTIONS(asin)
-REGISTER_REAL_FUNCTIONS(atan)
-REGISTER_FUNCTIONS(cosh)
-REGISTER_FUNCTIONS(sinh)
-REGISTER_FUNCTIONS(tanh)
-REGISTER_FUNCTIONS(exp)
-REGISTER_FUNCTIONS(log)
-REGISTER_FUNCTIONS(log10)
-REGISTER_FUNCTIONS(sqrt)
-
-/***********************************************************************
- * implementation block simply calls into the function pointer
- **********************************************************************/
-class gr_transcendental_impl : public gr_transcendental{
-public:
-    gr_transcendental_impl(
-        const work_fcn_type &work_fcn, const size_t io_size
-    ):
-        gr_sync_block(
-            "transcendental",
-            gr_make_io_signature(1, 1, io_size),
-            gr_make_io_signature(1, 1, io_size)
-        ),
-        _work_fcn(work_fcn)
-    {
-        // NOP
-    }
-
-    int work(
-        int noutput_items,
-        gr_vector_const_void_star &input_items,
-        gr_vector_void_star &output_items
-    ){
-        return _work_fcn(noutput_items, input_items, output_items);
-    }
-
-private:
-    const work_fcn_type &_work_fcn;
-};
-
-/***********************************************************************
- * factory function to make transcendental block
- **********************************************************************/
-gr_transcendental::sptr gr_make_transcendental(
-    const std::string &name,
-    const std::string &type
-){
-    //search for an entry in the map
-    const std::string key = name + "_" + type;
-    const bool has_key = get_map().count(key) != 0;
-    if (!has_key) throw std::runtime_error(
-        "could not find transcendental function for " + key
-    );
-
-    //make a new block with found work function
-    return gr_transcendental::sptr(new gr_transcendental_impl(
-        get_map()[key].work_fcn, get_map()[key].io_size
-    ));
-}
diff --git a/gnuradio-core/src/lib/general/gr_transcendental.h b/gnuradio-core/src/lib/general/gr_transcendental.h
deleted file mode 100644
index 9841a53e95..0000000000
--- a/gnuradio-core/src/lib/general/gr_transcendental.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_TRANSCENDENTAL_H
-#define INCLUDED_GR_TRANSCENDENTAL_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <string>
-
-/*!
- * \brief A block that performs various transcendental math operations.
- *
- * Possible function names can be found in the cmath library.
- * IO may be either complex or real, double or single precision.
- *
- * Possible type strings: float, double, complex_float, complex_double
- *
- * output[i] = trans_fcn(input[i])
- */
-class GR_CORE_API gr_transcendental : virtual public gr_sync_block{
-public:
-    typedef boost::shared_ptr<gr_transcendental> sptr;
-};
-
-GR_CORE_API gr_transcendental::sptr gr_make_transcendental(
-    const std::string &name,
-    const std::string &type = "float"
-);
-
-#endif /* INCLUDED_GR_TRANSCENDENTAL_H */
diff --git a/gnuradio-core/src/lib/general/gr_transcendental.i b/gnuradio-core/src/lib/general/gr_transcendental.i
deleted file mode 100644
index 6acdb10b7e..0000000000
--- a/gnuradio-core/src/lib/general/gr_transcendental.i
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-////////////////////////////////////////////////////////////////////////
-// block headers
-////////////////////////////////////////////////////////////////////////
-%{
-#include <gr_transcendental.h>
-%}
-
-////////////////////////////////////////////////////////////////////////
-// block magic
-////////////////////////////////////////////////////////////////////////
-GR_SWIG_BLOCK_MAGIC(gr,transcendental)
-%include <gr_transcendental.h>
author	Tom Rondeau <trondeau@vt.edu>	2013-02-26 10:43:33 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2013-02-26 10:43:33 -0500
commit	f7170fa2eea2cd1e43d5e3dc895052dc2cf11e01 (patch)
tree	6b4c400495d7f55203d9052730ddc42a50e2735a /gnuradio-core/src/lib
parent	b6d44e1927feb571191b4dc8226b1b3e7b59dbba (diff)