gr-digital, gr-trellis: Fixing gr-trellis to work with constellation now that it is in gr-digital.

author: Ben Reynwar <ben@reynwar.net> 2011-06-21 15:51:40 -0700
committer: Ben Reynwar <ben@reynwar.net> 2011-06-21 15:51:40 -0700
commit: 233621d6bbc3c68109998d0e68ffc7df7de69eb4 (patch)
tree: 9ddefc3f2eff9ab3e7de394e1304b6dd83715b83
parent: 192f4a6614fb347c6bf5acb9cac0d190bb33089d (diff)
13 files changed, 14 insertions, 44 deletions
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index de1e50f0e4..c157d4528a 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -262,7 +262,6 @@ grinclude_HEADERS = 			\
 	gr_log2_const.h			\
 	gr_map_bb.h			\
 	gr_math.h			\
-	gr_metric_type.h		\
 	gr_misc.h			\
 	gr_nco.h			\
 	gr_nlog10_ff.h			\
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
index 25a2b6f7fa..5d7fdecbfb 100644
--- a/gr-digital/lib/Makefile.am
+++ b/gr-digital/lib/Makefile.am
@@ -29,7 +29,8 @@ grinclude_HEADERS = 			\
 	digital_costas_loop_cc.h	\
 	digital_cma_equalizer_cc.h	\
 	digital_lms_dd_equalizer_cc.h	\
-	digital_kurtotic_equalizer_cc.h
+	digital_kurtotic_equalizer_cc.h \
+	digital_metric_type.h
 
 lib_LTLIBRARIES = libgnuradio-digital.la
 
diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc
index edf0bda22f..2263bba0bc 100644
--- a/gr-digital/lib/digital_constellation.cc
+++ b/gr-digital/lib/digital_constellation.cc
@@ -22,7 +22,7 @@
 
 #include <gr_io_signature.h>
 #include <digital_constellation.h>
-#include <gr_metric_type.h>
+#include <digital_metric_type.h>
 #include <gr_math.h>
 #include <gr_complex.h>
 #include <math.h>
diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h
index 9da87a4de2..4119b58031 100644
--- a/gr-digital/lib/digital_constellation.h
+++ b/gr-digital/lib/digital_constellation.h
@@ -27,7 +27,7 @@
 #include <math.h>
 #include <gr_complex.h>
 #include <boost/enable_shared_from_this.hpp>
-#include <gr_metric_type.h>
+#include <digital_metric_type.h>
 
 /************************************************************/
 /* digital_constellation                                    */
diff --git a/gnuradio-core/src/lib/general/gr_metric_type.h b/gr-digital/lib/digital_metric_type.h
index 74c93b55e4..83de166f09 100644
--- a/gnuradio-core/src/lib/general/gr_metric_type.h
+++ b/gr-digital/lib/digital_metric_type.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_METRIC_TYPE_H
-#define INCLUDED_GR_METRIC_TYPE_H
+#ifndef INCLUDED_DIGITAL_METRIC_TYPE_H
+#define INCLUDED_DIGITAL_METRIC_TYPE_H
 
 typedef enum {
   TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index 1e5c1de6d6..69adf25688 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -63,6 +63,9 @@ digital_swig_swiginclude_headers =	\
 	digital_lms_dd_equalizer_cc.i	\
 	digital_kurtotic_equalizer_cc.i
 
+digital_swig_swig_args = \
+	-I$(abs_top_builddir)/gr-digital/lib
+
 if GUILE
 TESTS += run_guile_tests
 endif
 \ No newline at end of file
diff --git a/gr-digital/swig/digital_constellation.i b/gr-digital/swig/digital_constellation.i
index 7296ca114b..40dd28a2b0 100644
--- a/gr-digital/swig/digital_constellation.i
+++ b/gr-digital/swig/digital_constellation.i
@@ -24,7 +24,7 @@
 %template(unsigned_int_vector) std::vector<unsigned int>;
 
 // Make sure metric types get SWIGed.
-%include gr_metric_type.h
+%include digital_metric_type.h
 
 class digital_constellation;
 typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 2f249f62fa..e81490089e 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -82,7 +82,6 @@ grinclude_HEADERS =			\
         quicksort_index.h		\
         base.h				\
         interleaver.h			\
-        metric_type.h		\
         calc_metric.h		\
         core_algorithms.h		\
         trellis_permutation.h		\
diff --git a/gr-trellis/src/lib/calc_metric.h b/gr-trellis/src/lib/calc_metric.h
index d628f44e00..fd20f8d36f 100644
--- a/gr-trellis/src/lib/calc_metric.h
+++ b/gr-trellis/src/lib/calc_metric.h
@@ -25,7 +25,7 @@
 
 #include <vector>
 #include <gr_complex.h>
-#include <metric_type.h>
+#include <digital_metric_type.h>
 
 
 template <class T> 
diff --git a/gr-trellis/src/lib/core_algorithms.h b/gr-trellis/src/lib/core_algorithms.h
index fdb5f398ec..fd45844c09 100644
--- a/gr-trellis/src/lib/core_algorithms.h
+++ b/gr-trellis/src/lib/core_algorithms.h
@@ -26,7 +26,7 @@
 #include <cmath>
 #include <vector>
 //#include <gr_complex.h>
-#include "metric_type.h"
+#include "digital_metric_type.h"
 #include "fsm.h"
 #include "interleaver.h"
 
diff --git a/gr-trellis/src/lib/metric_type.h b/gr-trellis/src/lib/metric_type.h
deleted file mode 100644
index a1040f108e..0000000000
--- a/gr-trellis/src/lib/metric_type.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- 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 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_TRELLIS_METRIC_TYPE_H
-#define INCLUDED_TRELLIS_METRIC_TYPE_H
-
-typedef enum {
-  TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
-} trellis_metric_type_t;
-
-#endif
-
diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index 84b77a2862..a030ab906e 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -41,14 +41,13 @@
 %include "trellis_siso_f.i"
 %include "trellis_siso_combined_f.i"
 
-%include "metric_type.h"
 %include "siso_type.h"
 
 %include "trellis_constellation_metrics_cf.i"
 
 %include "trellis_generated.i"
 
-%import "gr_metric_type.h"
+%import "digital_metric_type.h"
 %import "digital_constellation.i"
 
 %pythoncode %{
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
index 1a0eb72eea..a34c335ec0 100644
--- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
@@ -25,7 +25,7 @@
 
 #include <gr_block.h>
 #include <digital_constellation.h>
-#include <gr_metric_type.h>
+#include <digital_metric_type.h>
 
 class trellis_constellation_metrics_cf;
 typedef boost::shared_ptr<trellis_constellation_metrics_cf> trellis_constellation_metrics_cf_sptr;
author	Ben Reynwar <ben@reynwar.net>	2011-06-21 15:51:40 -0700
committer	Ben Reynwar <ben@reynwar.net>	2011-06-21 15:51:40 -0700
commit	233621d6bbc3c68109998d0e68ffc7df7de69eb4 (patch)
tree	9ddefc3f2eff9ab3e7de394e1304b6dd83715b83
parent	192f4a6614fb347c6bf5acb9cac0d190bb33089d (diff)