[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3232 - gnuradio/trunk/gr-trellis/src/lib
|
From: |
anastas |
|
Subject: |
[Commit-gnuradio] r3232 - gnuradio/trunk/gr-trellis/src/lib |
|
Date: |
Fri, 11 Aug 2006 01:03:03 -0600 (MDT) |
Author: anastas
Date: 2006-08-11 01:03:03 -0600 (Fri, 11 Aug 2006)
New Revision: 3232
Added:
gnuradio/trunk/gr-trellis/src/lib/interleaver.cc
gnuradio/trunk/gr-trellis/src/lib/interleaver.h
gnuradio/trunk/gr-trellis/src/lib/interleaver.i
gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.h
gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.i
Modified:
gnuradio/trunk/gr-trellis/src/lib/Makefile.am
gnuradio/trunk/gr-trellis/src/lib/trellis.i
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc
gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc
Log:
1) Minor correction in Viterbi. 2) Checked in interleaver structure
Modified: gnuradio/trunk/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2006-08-09 20:18:25 UTC
(rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2006-08-11 07:03:03 UTC
(rev 3232)
@@ -64,7 +64,9 @@
_trellis_la_SOURCES = \
trellis.cc \
fsm.cc \
+ interleaver.cc \
trellis_calc_metric.cc \
+ trellis_permutation.cc \
$(GENERATED_CC)
# magic flags
@@ -83,8 +85,10 @@
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
fsm.h \
+ interleaver.h \
trellis_metric_type.h \
trellis_calc_metric.h \
+ trellis_permutation.h \
$(GENERATED_H)
Added: gnuradio/trunk/gr-trellis/src/lib/interleaver.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/interleaver.cc
(rev 0)
+++ gnuradio/trunk/gr-trellis/src/lib/interleaver.cc 2006-08-11 07:03:03 UTC
(rev 3232)
@@ -0,0 +1,80 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <cstdio>
+#include <stdexcept>
+#include <cmath>
+#include "interleaver.h"
+
+interleaver::interleaver()
+{
+ d_K=0;
+ d_INTER.resize(0);
+ d_DEINTER.resize(0);
+}
+
+interleaver::interleaver(const interleaver &INTERLEAVER)
+{
+ d_K=INTERLEAVER.K();
+ d_INTER=INTERLEAVER.INTER();
+ d_DEINTER=INTERLEAVER.DEINTER();
+}
+
+interleaver::interleaver(const int K, const std::vector<int> &INTER)
+{
+ d_K=K;
+ d_INTER=INTER;
+ d_DEINTER.resize(d_K);
+
+ // generate DEINTER table
+ for(int i=0;i<d_K;i++) {
+ d_DEINTER[d_INTER[i]]=i;
+ }
+}
+
+//######################################################################
+//# Read an INTERLEAVER specification from a file.
+//# Format (hopefully will become more flexible in the future...):
+//# K
+//# blank line
+//# list of space separated K integers from 0 to K-1 in appropriate order
+//# optional comments
+//######################################################################
+interleaver::interleaver(const char *name)
+{
+ FILE *interleaverfile;
+
+ if((interleaverfile=fopen(name,"r"))==NULL)
+ throw std::runtime_error ("file open error in interleaver()");
+ //printf("file open error in interleaver()\n");
+
+ fscanf(interleaverfile,"%d\n",&d_K);
+ d_INTER.resize(d_K);
+ d_DEINTER.resize(d_K);
+
+ for(int i=0;i<d_K;i++) fscanf(interleaverfile,"%d",&(d_INTER[i]));
+
+ // generate DEINTER table
+ for(int i=0;i<d_K;i++) {
+ d_DEINTER[d_INTER[i]]=i;
+ }
+}
Added: gnuradio/trunk/gr-trellis/src/lib/interleaver.h
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/interleaver.h
(rev 0)
+++ gnuradio/trunk/gr-trellis/src/lib/interleaver.h 2006-08-11 07:03:03 UTC
(rev 3232)
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef INCLUDED_TRELLIS_INTERLEAVER_H
+#define INCLUDED_TRELLIS_INTERLEAVER_H
+
+#include <vector>
+
+/*!
+ * \brief INTERLEAVER class
+ */
+class interleaver {
+private:
+ int d_K;
+ std::vector<int> d_INTER;
+ std::vector<int> d_DEINTER;
+public:
+ interleaver();
+ interleaver(const interleaver & INTERLEAVER);
+ interleaver(const int K, const std::vector<int> & INTER);
+ interleaver(const char *name);
+ int K () const { return d_K; }
+ const std::vector<int> & INTER () const { return d_INTER; }
+ const std::vector<int> & DEINTER () const { return d_DEINTER; }
+};
+
+#endif
Added: gnuradio/trunk/gr-trellis/src/lib/interleaver.i
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/interleaver.i
(rev 0)
+++ gnuradio/trunk/gr-trellis/src/lib/interleaver.i 2006-08-11 07:03:03 UTC
(rev 3232)
@@ -0,0 +1,36 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+class interleaver {
+private:
+ int d_K;
+ std::vector<int> d_INTER;
+ std::vector<int> d_DEINTER;
+public:
+ interleaver();
+ interleaver(const interleaver & INTERLEAVER);
+ interleaver(const int K, const std::vector<int> & INTER);
+ interleaver(const char *name);
+ int K () const { return d_K; }
+ const std::vector<int> & INTER () const { return d_INTER; }
+ const std::vector<int> & DEINTER () const { return d_DEINTER; }
+};
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis.i
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis.i 2006-08-09 20:18:25 UTC (rev
3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis.i 2006-08-11 07:03:03 UTC (rev
3232)
@@ -8,12 +8,16 @@
%{
#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
#include "fsm.h"
+#include "interleaver.h"
+#include "trellis_permutation.h"
#include <stdexcept>
%}
// ----------------------------------------------------------------
%include "fsm.i"
+%include "interleaver.i"
+%include "trellis_permutation.i"
%include "trellis_metric_type.h"
Added: gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.cc
(rev 0)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.cc 2006-08-11
07:03:03 UTC (rev 3232)
@@ -0,0 +1,73 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <trellis_permutation.h>
+#include <gr_io_signature.h>
+#include <iostream>
+
+trellis_permutation_sptr
+trellis_make_permutation (const int K, const std::vector<int> &TABLE, const
size_t NBYTES)
+{
+ return trellis_permutation_sptr (new trellis_permutation (K,TABLE,NBYTES));
+}
+
+trellis_permutation::trellis_permutation (const int K, const std::vector<int>
&TABLE, const size_t NBYTES)
+ : gr_sync_block ("permutation",
+ gr_make_io_signature (1, -1, NBYTES),
+ gr_make_io_signature (1, -1, NBYTES)),
+ d_K (K),
+ d_TABLE (TABLE),
+ d_NBYTES (NBYTES)
+{
+ set_output_multiple (d_K);
+ //std::cout << d_K << "\n";
+}
+
+
+
+int
+trellis_permutation::work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+{
+ int nstreams = input_items.size();
+ assert (input_items.size() == output_items.size());
+ assert (noutput_items % d_K ==0);
+ //std::cout << noutput_items << "\n";
+
+ for (int m=0;m<nstreams;m++) {
+ const char *in = (const char *) input_items[m];
+ char *out = (char *) output_items[m];
+
+ // per stream processing
+ for (unsigned int i = 0; i < noutput_items; i++){
+ //std::cout << i << " " << i*d_NBYTES << " " <<
(d_K*(i/d_K)+d_TABLE[i%d_K])*d_NBYTES << "\n";
+ memcpy(&(out[i*d_NBYTES]), &(in[(d_K*(i/d_K)+d_TABLE[i%d_K])*d_NBYTES]),
d_NBYTES);
+ }
+ // end per stream processing
+ }
+ return noutput_items;
+}
Added: gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.h
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.h
(rev 0)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.h 2006-08-11
07:03:03 UTC (rev 3232)
@@ -0,0 +1,60 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef INCLUDED_TRELLIS_PERMUTATION_H
+#define INCLUDED_TRELLIS_PERMUTATION_H
+
+#include <vector>
+#include <gr_sync_block.h>
+
+class trellis_permutation;
+typedef boost::shared_ptr<trellis_permutation> trellis_permutation_sptr;
+
+trellis_permutation_sptr trellis_make_permutation (const int K, const
std::vector<int> &TABLE, const size_t NBYTES);
+
+/*!
+ * \brief Permutation.
+ * \ingroup block
+ *
+ *
+ */
+class trellis_permutation : public gr_sync_block
+{
+private:
+ friend trellis_permutation_sptr trellis_make_permutation (const int K, const
std::vector<int> &TABLE, const size_t NBYTES);
+ int d_K;
+ std::vector<int> d_TABLE;
+ size_t d_NBYTES;
+ trellis_permutation (const int K, const std::vector<int> &TABLE, const
size_t NBYTES);
+
+public:
+ int K () const { return d_K; }
+ const std::vector<int> & TABLE () const { return d_TABLE; }
+ size_t NBYTES () const { return d_NBYTES; }
+
+ int work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+};
+
+#endif
Added: gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.i
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.i
(rev 0)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.i 2006-08-11
07:03:03 UTC (rev 3232)
@@ -0,0 +1,39 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+GR_SWIG_BLOCK_MAGIC(trellis,permutation);
+
+trellis_permutation_sptr trellis_make_permutation (const int K, const
std::vector<int> &TABLE, const size_t NBYTES);
+
+class trellis_permutation : public gr_sync_block
+{
+private:
+ int d_K;
+ std::vector<int> d_TABLE;
+ size_t d_NBYTES;
+ trellis_permutation (const int K, const std::vector<int> &TABLE, const
size_t NBYTES);
+
+public:
+ int K () const { return d_K; }
+ const std::vector<int> & TABLE () const { return d_TABLE; }
+ size_t NBYTES () const { return d_NBYTES; }
+};
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t 2006-08-09
20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t 2006-08-11
07:03:03 UTC (rev 3232)
@@ -123,7 +123,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc 2006-08-09
20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_b.cc 2006-08-11
07:03:03 UTC (rev 3232)
@@ -123,7 +123,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
2006-08-09 20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
2006-08-11 07:03:03 UTC (rev 3232)
@@ -136,7 +136,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
2006-08-09 20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
2006-08-11 07:03:03 UTC (rev 3232)
@@ -136,7 +136,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
2006-08-09 20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
2006-08-11 07:03:03 UTC (rev 3232)
@@ -136,7 +136,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
2006-08-09 20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
2006-08-11 07:03:03 UTC (rev 3232)
@@ -136,7 +136,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc 2006-08-09
20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_i.cc 2006-08-11
07:03:03 UTC (rev 3232)
@@ -123,7 +123,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc 2006-08-09
20:18:25 UTC (rev 3231)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_s.cc 2006-08-11
07:03:03 UTC (rev 3232)
@@ -123,7 +123,7 @@
minm=INF;
minmi=0;
for(int i=0;i<S;i++)
- if((mm=trace[(K-1)*S+i])<minm) minm=mm,minmi=i;
+ if((mm=alpha[alphai*S+i])<minm) minm=mm,minmi=i;
st=minmi;
}
else {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3232 - gnuradio/trunk/gr-trellis/src/lib,
anastas <=