From ff81c844713b5234622ceb906af219a569d0914f Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Wed, 28 Nov 2012 14:52:36 -0800
Subject: adding patterned interleaver block

---
 gr-blocks/lib/CMakeLists.txt                |  1 +
 gr-blocks/lib/patterned_interleaver_impl.cc | 87 +++++++++++++++++++++++++++++
 gr-blocks/lib/patterned_interleaver_impl.h  | 61 ++++++++++++++++++++
 3 files changed, 149 insertions(+)
 create mode 100644 gr-blocks/lib/patterned_interleaver_impl.cc
 create mode 100644 gr-blocks/lib/patterned_interleaver_impl.h

(limited to 'gr-blocks/lib')

diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 0b6c89298..3a8ffac75 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -160,6 +160,7 @@ list(APPEND gr_blocks_sources
     multiply_const_cc_impl.cc
     multiply_const_ff_impl.cc
     nlog10_ff_impl.cc
+    patterned_interleaver_impl.cc
     repeat_impl.cc
     short_to_char_impl.cc
     short_to_float_impl.cc
diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc
new file mode 100644
index 000000000..c53ba03d7
--- /dev/null
+++ b/gr-blocks/lib/patterned_interleaver_impl.cc
@@ -0,0 +1,87 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "patterned_interleaver_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    patterned_interleaver::sptr patterned_interleaver::make(size_t itemsize, std::vector<int> pattern)
+    {
+      return gnuradio::get_initial_sptr(new patterned_interleaver_impl(itemsize, pattern));
+    }
+
+    patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, std::vector<int> pattern)
+      : gr_block ("patterned_interleaver",
+			      gr_make_io_signature (pattern_max(pattern)+1, pattern_max(pattern)+1, itemsize),
+			      gr_make_io_signature (1, 1, itemsize)),
+        d_pattern(pattern), d_counts( pattern_max(pattern)+1, 0), d_itemsize(itemsize)
+    {
+        BOOST_FOREACH( int i, d_pattern)
+        { d_counts[i]++; }
+        set_output_multiple(d_pattern.size());
+    }
+
+    int
+    patterned_interleaver_impl::general_work(int noutput_items,
+                gr_vector_int &ninput_items,
+				gr_vector_const_void_star &input_items,
+				gr_vector_void_star &output_items)
+    {
+      size_t nblks = noutput_items/d_pattern.size();
+      
+      std::vector<const char*> ii;
+      for(size_t i=0; i<input_items.size(); i++){
+        ii.push_back((const char*)input_items[i]);
+        }
+
+      char *oo = (char *) output_items[0];
+      
+      for(size_t i=0; i<nblks; i++){
+        for(size_t j=0; j<d_pattern.size(); j++){
+          memcpy(oo, ii[j], d_itemsize);
+          oo += d_itemsize;
+          ii[j] += d_itemsize;
+          }
+        }
+            
+      for(size_t i=0; i<d_pattern.size(); i++){
+        consume(i, d_pattern[i]*nblks );
+      }
+      return nblks*d_pattern.size();
+    }
+
+    void patterned_interleaver_impl::forecast (int noutput_items,
+        gr_vector_int &ninput_items_required){
+            int nblks = noutput_items / d_pattern.size();
+            for(size_t i=0; i<ninput_items_required.size(); i++){
+                ninput_items_required[i] = d_counts[i] * nblks;
+            }
+        }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h
new file mode 100644
index 000000000..4266c9636
--- /dev/null
+++ b/gr-blocks/lib/patterned_interleaver_impl.h
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 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_PATTERNED_INTERLEAVER_IMPL_H
+#define INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
+
+#include <blocks/patterned_interleaver.h>
+#include <boost/foreach.hpp>
+
+namespace gr {
+  namespace blocks {
+
+    class BLOCKS_API patterned_interleaver_impl : public patterned_interleaver
+    {
+    public:
+      patterned_interleaver_impl(size_t itemsize, std::vector<int> pattern);
+
+      int general_work(int noutput_items,
+	       gr_vector_int &ninput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+
+      int pattern_max(std::vector<int> pattern){
+        int mval(0);
+        BOOST_FOREACH( int i, pattern)
+            { mval = std::max(mval, i); }
+        return mval;
+        }
+
+      void forecast (int noutput_items,
+             gr_vector_int &ninput_items_required);
+
+      std::vector<int> d_pattern;
+      std::vector<int> d_counts;
+      size_t d_itemsize;
+
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif 
-- 
cgit 


From 680c889aec7db3b18a8c81c5405ed141f1b078c7 Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Wed, 28 Nov 2012 19:57:59 -0800
Subject: patterned qa added, bugs fixed

---
 gr-blocks/lib/patterned_interleaver_impl.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gr-blocks/lib')

diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc
index c53ba03d7..437c733a1 100644
--- a/gr-blocks/lib/patterned_interleaver_impl.cc
+++ b/gr-blocks/lib/patterned_interleaver_impl.cc
@@ -63,14 +63,14 @@ namespace gr {
       
       for(size_t i=0; i<nblks; i++){
         for(size_t j=0; j<d_pattern.size(); j++){
-          memcpy(oo, ii[j], d_itemsize);
+          memcpy(oo, ii[d_pattern[j]], d_itemsize);
           oo += d_itemsize;
-          ii[j] += d_itemsize;
+          ii[d_pattern[j]] += d_itemsize;
           }
         }
             
-      for(size_t i=0; i<d_pattern.size(); i++){
-        consume(i, d_pattern[i]*nblks );
+      for(size_t i=0; i<d_counts.size(); i++){
+        consume(i, d_counts[i]*nblks );
       }
       return nblks*d_pattern.size();
     }
-- 
cgit