diff options
50 files changed, 206 insertions, 206 deletions
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index 5646a6b579..d7c317b755 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -100,7 +100,7 @@ CPACK_COMPONENT("trellis_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/trellis) +add_subdirectory(include/gnuradio/trellis) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-trellis/include/trellis/CMakeLists.txt b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt index b7ceea179e..b7ceea179e 100644 --- a/gr-trellis/include/trellis/CMakeLists.txt +++ b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt diff --git a/gr-trellis/include/trellis/api.h b/gr-trellis/include/gnuradio/trellis/api.h index bdf5842864..bdf5842864 100644 --- a/gr-trellis/include/trellis/api.h +++ b/gr-trellis/include/gnuradio/trellis/api.h diff --git a/gr-trellis/include/trellis/base.h b/gr-trellis/include/gnuradio/trellis/base.h index c69500d0df..c69500d0df 100644 --- a/gr-trellis/include/trellis/base.h +++ b/gr-trellis/include/gnuradio/trellis/base.h diff --git a/gr-trellis/include/trellis/calc_metric.h b/gr-trellis/include/gnuradio/trellis/calc_metric.h index c85fcbff69..c85fcbff69 100644 --- a/gr-trellis/include/trellis/calc_metric.h +++ b/gr-trellis/include/gnuradio/trellis/calc_metric.h diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h index 576378dd62..01bfab0140 100644 --- a/gr-trellis/include/trellis/constellation_metrics_cf.h +++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <gnuradio/block.h> #include <gnuradio/digital/constellation.h> #include <gnuradio/digital/metric_type.h> diff --git a/gr-trellis/include/trellis/core_algorithms.h b/gr-trellis/include/gnuradio/trellis/core_algorithms.h index 03d3efa56a..aedff120d8 100644 --- a/gr-trellis/include/trellis/core_algorithms.h +++ b/gr-trellis/include/gnuradio/trellis/core_algorithms.h @@ -26,8 +26,8 @@ #include <cmath> #include <vector> #include <gnuradio/digital/metric_type.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> namespace gr { namespace trellis { diff --git a/gr-trellis/include/trellis/encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t index 3901797204..7ece5d3f21 100644 --- a/gr-trellis/include/trellis/encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-trellis/include/trellis/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h index d88732b29b..cc8893f1e3 100644 --- a/gr-trellis/include/trellis/fsm.h +++ b/gr-trellis/include/gnuradio/trellis/fsm.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_FSM_H #define INCLUDED_TRELLIS_FSM_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> #include <iosfwd> diff --git a/gr-trellis/include/trellis/interleaver.h b/gr-trellis/include/gnuradio/trellis/interleaver.h index 35fff0ac88..2147db6600 100644 --- a/gr-trellis/include/trellis/interleaver.h +++ b/gr-trellis/include/gnuradio/trellis/interleaver.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_INTERLEAVER_H #define INCLUDED_TRELLIS_INTERLEAVER_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> namespace gr { diff --git a/gr-trellis/include/trellis/metrics_X.h.t b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t index d0b8806b62..3f650faf0e 100644 --- a/gr-trellis/include/trellis/metrics_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/calc_metric.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/calc_metric.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/pccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t index 7f87250bec..affce07042 100644 --- a/gr-trellis/include/trellis/pccc_decoder_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t index be9db5a146..719b0aa1e5 100644 --- a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t @@ -25,11 +25,11 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/calc_metric.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/pccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t index c5d4a2f253..5308fe275d 100644 --- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> #include <gnuradio/sync_block.h> #include <vector> diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/gnuradio/trellis/permutation.h index 7bac7340d9..80b9fef641 100644 --- a/gr-trellis/include/trellis/permutation.h +++ b/gr-trellis/include/gnuradio/trellis/permutation.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_PERMUTATION_H #define INCLUDED_TRELLIS_PERMUTATION_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> #include <gnuradio/sync_block.h> diff --git a/gr-trellis/include/trellis/quicksort_index.h b/gr-trellis/include/gnuradio/trellis/quicksort_index.h index 402962172a..402962172a 100644 --- a/gr-trellis/include/trellis/quicksort_index.h +++ b/gr-trellis/include/gnuradio/trellis/quicksort_index.h diff --git a/gr-trellis/include/trellis/sccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t index 1e19bbe950..cc1d86b709 100644 --- a/gr-trellis/include/trellis/sccc_decoder_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t index a7c7c4c723..699de12fd8 100644 --- a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t @@ -25,11 +25,11 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/calc_metric.h> -#include <trellis/siso_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/siso_type.h> #include <gnuradio/block.h> #include <vector> diff --git a/gr-trellis/include/trellis/sccc_encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t index 3c1d334d08..85fad02eeb 100644 --- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> #include <gnuradio/sync_block.h> #include <vector> diff --git a/gr-trellis/include/trellis/siso_combined_f.h b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h index 0997b3fdfa..47c34ea81e 100644 --- a/gr-trellis/include/trellis/siso_combined_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_H #define INCLUDED_TRELLIS_SISO_COMBINED_F_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/calc_metric.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h index 7b5351a838..60c3349e11 100644 --- a/gr-trellis/include/trellis/siso_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_f.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_TRELLIS_SISO_F_H #define INCLUDED_TRELLIS_SISO_F_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/siso_type.h b/gr-trellis/include/gnuradio/trellis/siso_type.h index 9167381164..9167381164 100644 --- a/gr-trellis/include/trellis/siso_type.h +++ b/gr-trellis/include/gnuradio/trellis/siso_type.h diff --git a/gr-trellis/include/trellis/viterbi_X.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t index 574888ec12..2d72cb5e09 100644 --- a/gr-trellis/include/trellis/viterbi_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/include/trellis/viterbi_combined_XX.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t index 465b5f518f..2becf8bf18 100644 --- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/calc_metric.h> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-trellis/lib/base.cc b/gr-trellis/lib/base.cc index e9d0141e70..c5022dac83 100644 --- a/gr-trellis/lib/base.cc +++ b/gr-trellis/lib/base.cc @@ -23,7 +23,7 @@ #include <cstdio> #include <stdexcept> #include <cmath> -#include <trellis/base.h> +#include <gnuradio/trellis/base.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/calc_metric.cc b/gr-trellis/lib/calc_metric.cc index 3c474e30fe..b95899940a 100644 --- a/gr-trellis/lib/calc_metric.cc +++ b/gr-trellis/lib/calc_metric.cc @@ -22,7 +22,7 @@ #include <float.h> #include <stdexcept> -#include <trellis/calc_metric.h> +#include <gnuradio/trellis/calc_metric.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.h b/gr-trellis/lib/constellation_metrics_cf_impl.h index 52018c4baa..a2f165857b 100644 --- a/gr-trellis/lib/constellation_metrics_cf_impl.h +++ b/gr-trellis/lib/constellation_metrics_cf_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_IMPL_H #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_IMPL_H -#include <trellis/api.h> -#include <trellis/constellation_metrics_cf.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/constellation_metrics_cf.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/core_algorithms.cc b/gr-trellis/lib/core_algorithms.cc index a704e5f9a6..a8a0174551 100644 --- a/gr-trellis/lib/core_algorithms.cc +++ b/gr-trellis/lib/core_algorithms.cc @@ -23,8 +23,8 @@ #include <cstring> #include <stdexcept> #include <iostream> -#include <trellis/core_algorithms.h> -#include <trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.h> +#include <gnuradio/trellis/calc_metric.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/encoder_XX_impl.h.t b/gr-trellis/lib/encoder_XX_impl.h.t index 949f1182de..ec2f82611e 100644 --- a/gr-trellis/lib/encoder_XX_impl.h.t +++ b/gr-trellis/lib/encoder_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/fsm.cc b/gr-trellis/lib/fsm.cc index 16efcd10f2..20eeed5c25 100644 --- a/gr-trellis/lib/fsm.cc +++ b/gr-trellis/lib/fsm.cc @@ -27,8 +27,8 @@ #include <stdexcept> #include <cmath> #include <stdlib.h> -#include <trellis/base.h> -#include <trellis/fsm.h> +#include <gnuradio/trellis/base.h> +#include <gnuradio/trellis/fsm.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/interleaver.cc b/gr-trellis/lib/interleaver.cc index 27248a6d43..f24d625582 100644 --- a/gr-trellis/lib/interleaver.cc +++ b/gr-trellis/lib/interleaver.cc @@ -27,8 +27,8 @@ #include <fstream> #include <stdexcept> #include <cmath> -#include <trellis/quicksort_index.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/quicksort_index.h> +#include <gnuradio/trellis/interleaver.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/metrics_X_impl.h.t b/gr-trellis/lib/metrics_X_impl.h.t index 0f52a8bc40..0cd7f0ba5b 100644 --- a/gr-trellis/lib/metrics_X_impl.h.t +++ b/gr-trellis/lib/metrics_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/pccc_decoder_X_impl.cc.t b/gr-trellis/lib/pccc_decoder_X_impl.cc.t index 1d5e14ca25..aa19884712 100644 --- a/gr-trellis/lib/pccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_X_impl.cc.t @@ -29,7 +29,7 @@ #include "@NAME@.h" #include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/pccc_decoder_X_impl.h.t b/gr-trellis/lib/pccc_decoder_X_impl.h.t index 9b61e34fde..43a7257fc5 100644 --- a/gr-trellis/lib/pccc_decoder_X_impl.h.t +++ b/gr-trellis/lib/pccc_decoder_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t index f5f5a9311c..15ea3ceecb 100644 --- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t @@ -29,7 +29,7 @@ #include "@NAME@.h" #include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/pccc_decoder_combined_XX_impl.h.t b/gr-trellis/lib/pccc_decoder_combined_XX_impl.h.t index 4c3655f40d..7606017547 100644 --- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.h.t +++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/pccc_encoder_XX_impl.h.t b/gr-trellis/lib/pccc_encoder_XX_impl.h.t index 1eed3702be..f7d6967584 100644 --- a/gr-trellis/lib/pccc_encoder_XX_impl.h.t +++ b/gr-trellis/lib/pccc_encoder_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/permutation_impl.h b/gr-trellis/lib/permutation_impl.h index 6e3ca2b2d7..2c7b28d62f 100644 --- a/gr-trellis/lib/permutation_impl.h +++ b/gr-trellis/lib/permutation_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_TRELLIS_PERMUTATION_IMPL_H #define INCLUDED_TRELLIS_PERMUTATION_IMPL_H -#include <trellis/api.h> -#include <trellis/permutation.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/permutation.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/quicksort_index.cc b/gr-trellis/lib/quicksort_index.cc index 02cd8a9134..2e7c21907a 100644 --- a/gr-trellis/lib/quicksort_index.cc +++ b/gr-trellis/lib/quicksort_index.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <trellis/quicksort_index.h> +#include <gnuradio/trellis/quicksort_index.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/sccc_decoder_X_impl.cc.t b/gr-trellis/lib/sccc_decoder_X_impl.cc.t index c45f14bfdb..d217bbccfb 100644 --- a/gr-trellis/lib/sccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_X_impl.cc.t @@ -29,7 +29,7 @@ #include "@NAME@.h" #include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/sccc_decoder_X_impl.h.t b/gr-trellis/lib/sccc_decoder_X_impl.h.t index 31f4edc4b8..c79e6ebbab 100644 --- a/gr-trellis/lib/sccc_decoder_X_impl.h.t +++ b/gr-trellis/lib/sccc_decoder_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t index 6d3ecf6aea..4acc560175 100644 --- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t @@ -29,7 +29,7 @@ #include "@NAME@.h" #include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/sccc_decoder_combined_XX_impl.h.t b/gr-trellis/lib/sccc_decoder_combined_XX_impl.h.t index f3dbd1b4bb..6a38f0114f 100644 --- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.h.t +++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/sccc_encoder_XX_impl.h.t b/gr-trellis/lib/sccc_encoder_XX_impl.h.t index a3e582b5a0..fc64f2ade8 100644 --- a/gr-trellis/lib/sccc_encoder_XX_impl.h.t +++ b/gr-trellis/lib/sccc_encoder_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/siso_combined_f_impl.h b/gr-trellis/lib/siso_combined_f_impl.h index 27cef5e334..5035a0a83d 100644 --- a/gr-trellis/lib/siso_combined_f_impl.h +++ b/gr-trellis/lib/siso_combined_f_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_IMPL_H #define INCLUDED_TRELLIS_SISO_COMBINED_F_IMPL_H -#include <trellis/siso_combined_f.h> +#include <gnuradio/trellis/siso_combined_f.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/siso_f_impl.h b/gr-trellis/lib/siso_f_impl.h index 40766b97fa..ca8f623aaf 100644 --- a/gr-trellis/lib/siso_f_impl.h +++ b/gr-trellis/lib/siso_f_impl.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_TRELLIS_SISO_F_IMPL_H #define INCLUDED_TRELLIS_SISO_F_IMPL_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/core_algorithms.h> -#include <trellis/siso_f.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/core_algorithms.h> +#include <gnuradio/trellis/siso_f.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/viterbi_X_impl.h.t b/gr-trellis/lib/viterbi_X_impl.h.t index accaacc158..b9554e8c39 100644 --- a/gr-trellis/lib/viterbi_X_impl.h.t +++ b/gr-trellis/lib/viterbi_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/viterbi_combined_XX_impl.h.t b/gr-trellis/lib/viterbi_combined_XX_impl.h.t index df62001110..199e8c8e88 100644 --- a/gr-trellis/lib/viterbi_combined_XX_impl.h.t +++ b/gr-trellis/lib/viterbi_combined_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt index c11bf02e84..d021445fb8 100644 --- a/gr-trellis/swig/CMakeLists.txt +++ b/gr-trellis/swig/CMakeLists.txt @@ -40,7 +40,7 @@ endif(ENABLE_GR_CTRLPORT) # Setup swig docs to depend on includes and pull in from build directory set(GR_SWIG_TARGET_DEPS trellis_generated_includes) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/trellis) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/trellis) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) GR_SWIG_MAKE(trellis_swig trellis_swig.i) diff --git a/gr-trellis/swig/trellis_swig.i b/gr-trellis/swig/trellis_swig.i index 2a938ab08a..2848b31d62 100644 --- a/gr-trellis/swig/trellis_swig.i +++ b/gr-trellis/swig/trellis_swig.i @@ -29,131 +29,131 @@ %include "gnuradio/digital/metric_type.h" %include "gnuradio/digital/constellation.h" -%include "trellis/siso_type.h" -%include "trellis/fsm.h" -%include "trellis/interleaver.h" +%include "gnuradio/trellis/siso_type.h" +%include "gnuradio/trellis/fsm.h" +%include "gnuradio/trellis/interleaver.h" %{ -#include "trellis/constellation_metrics_cf.h" -#include "trellis/permutation.h" -#include "trellis/siso_combined_f.h" -#include "trellis/siso_f.h" -#include "trellis/encoder_bb.h" -#include "trellis/encoder_bs.h" -#include "trellis/encoder_bi.h" -#include "trellis/encoder_ss.h" -#include "trellis/encoder_si.h" -#include "trellis/encoder_ii.h" -#include "trellis/sccc_encoder_bb.h" -#include "trellis/sccc_encoder_bs.h" -#include "trellis/sccc_encoder_bi.h" -#include "trellis/sccc_encoder_ss.h" -#include "trellis/sccc_encoder_si.h" -#include "trellis/sccc_encoder_ii.h" -#include "trellis/pccc_encoder_bb.h" -#include "trellis/pccc_encoder_bs.h" -#include "trellis/pccc_encoder_bi.h" -#include "trellis/pccc_encoder_ss.h" -#include "trellis/pccc_encoder_si.h" -#include "trellis/pccc_encoder_ii.h" -#include "trellis/metrics_s.h" -#include "trellis/metrics_i.h" -#include "trellis/metrics_f.h" -#include "trellis/metrics_c.h" -#include "trellis/pccc_decoder_b.h" -#include "trellis/pccc_decoder_s.h" -#include "trellis/pccc_decoder_i.h" -#include "trellis/pccc_decoder_combined_fb.h" -#include "trellis/pccc_decoder_combined_fs.h" -#include "trellis/pccc_decoder_combined_fi.h" -#include "trellis/pccc_decoder_combined_cb.h" -#include "trellis/pccc_decoder_combined_cs.h" -#include "trellis/pccc_decoder_combined_ci.h" -#include "trellis/viterbi_b.h" -#include "trellis/viterbi_s.h" -#include "trellis/viterbi_i.h" -#include "trellis/viterbi_combined_sb.h" -#include "trellis/viterbi_combined_ss.h" -#include "trellis/viterbi_combined_si.h" -#include "trellis/viterbi_combined_ib.h" -#include "trellis/viterbi_combined_is.h" -#include "trellis/viterbi_combined_ii.h" -#include "trellis/viterbi_combined_fb.h" -#include "trellis/viterbi_combined_fs.h" -#include "trellis/viterbi_combined_fi.h" -#include "trellis/viterbi_combined_cb.h" -#include "trellis/viterbi_combined_cs.h" -#include "trellis/viterbi_combined_ci.h" -#include "trellis/sccc_decoder_b.h" -#include "trellis/sccc_decoder_s.h" -#include "trellis/sccc_decoder_i.h" -#include "trellis/sccc_decoder_combined_fb.h" -#include "trellis/sccc_decoder_combined_fs.h" -#include "trellis/sccc_decoder_combined_fi.h" -#include "trellis/sccc_decoder_combined_cb.h" -#include "trellis/sccc_decoder_combined_cs.h" -#include "trellis/sccc_decoder_combined_ci.h" +#include "gnuradio/trellis/constellation_metrics_cf.h" +#include "gnuradio/trellis/permutation.h" +#include "gnuradio/trellis/siso_combined_f.h" +#include "gnuradio/trellis/siso_f.h" +#include "gnuradio/trellis/encoder_bb.h" +#include "gnuradio/trellis/encoder_bs.h" +#include "gnuradio/trellis/encoder_bi.h" +#include "gnuradio/trellis/encoder_ss.h" +#include "gnuradio/trellis/encoder_si.h" +#include "gnuradio/trellis/encoder_ii.h" +#include "gnuradio/trellis/sccc_encoder_bb.h" +#include "gnuradio/trellis/sccc_encoder_bs.h" +#include "gnuradio/trellis/sccc_encoder_bi.h" +#include "gnuradio/trellis/sccc_encoder_ss.h" +#include "gnuradio/trellis/sccc_encoder_si.h" +#include "gnuradio/trellis/sccc_encoder_ii.h" +#include "gnuradio/trellis/pccc_encoder_bb.h" +#include "gnuradio/trellis/pccc_encoder_bs.h" +#include "gnuradio/trellis/pccc_encoder_bi.h" +#include "gnuradio/trellis/pccc_encoder_ss.h" +#include "gnuradio/trellis/pccc_encoder_si.h" +#include "gnuradio/trellis/pccc_encoder_ii.h" +#include "gnuradio/trellis/metrics_s.h" +#include "gnuradio/trellis/metrics_i.h" +#include "gnuradio/trellis/metrics_f.h" +#include "gnuradio/trellis/metrics_c.h" +#include "gnuradio/trellis/pccc_decoder_b.h" +#include "gnuradio/trellis/pccc_decoder_s.h" +#include "gnuradio/trellis/pccc_decoder_i.h" +#include "gnuradio/trellis/pccc_decoder_combined_fb.h" +#include "gnuradio/trellis/pccc_decoder_combined_fs.h" +#include "gnuradio/trellis/pccc_decoder_combined_fi.h" +#include "gnuradio/trellis/pccc_decoder_combined_cb.h" +#include "gnuradio/trellis/pccc_decoder_combined_cs.h" +#include "gnuradio/trellis/pccc_decoder_combined_ci.h" +#include "gnuradio/trellis/viterbi_b.h" +#include "gnuradio/trellis/viterbi_s.h" +#include "gnuradio/trellis/viterbi_i.h" +#include "gnuradio/trellis/viterbi_combined_sb.h" +#include "gnuradio/trellis/viterbi_combined_ss.h" +#include "gnuradio/trellis/viterbi_combined_si.h" +#include "gnuradio/trellis/viterbi_combined_ib.h" +#include "gnuradio/trellis/viterbi_combined_is.h" +#include "gnuradio/trellis/viterbi_combined_ii.h" +#include "gnuradio/trellis/viterbi_combined_fb.h" +#include "gnuradio/trellis/viterbi_combined_fs.h" +#include "gnuradio/trellis/viterbi_combined_fi.h" +#include "gnuradio/trellis/viterbi_combined_cb.h" +#include "gnuradio/trellis/viterbi_combined_cs.h" +#include "gnuradio/trellis/viterbi_combined_ci.h" +#include "gnuradio/trellis/sccc_decoder_b.h" +#include "gnuradio/trellis/sccc_decoder_s.h" +#include "gnuradio/trellis/sccc_decoder_i.h" +#include "gnuradio/trellis/sccc_decoder_combined_fb.h" +#include "gnuradio/trellis/sccc_decoder_combined_fs.h" +#include "gnuradio/trellis/sccc_decoder_combined_fi.h" +#include "gnuradio/trellis/sccc_decoder_combined_cb.h" +#include "gnuradio/trellis/sccc_decoder_combined_cs.h" +#include "gnuradio/trellis/sccc_decoder_combined_ci.h" %} -%include "trellis/constellation_metrics_cf.h" -%include "trellis/permutation.h" -%include "trellis/siso_combined_f.h" -%include "trellis/siso_f.h" -%include "trellis/encoder_bb.h" -%include "trellis/encoder_bs.h" -%include "trellis/encoder_bi.h" -%include "trellis/encoder_ss.h" -%include "trellis/encoder_si.h" -%include "trellis/encoder_ii.h" -%include "trellis/sccc_encoder_bb.h" -%include "trellis/sccc_encoder_bs.h" -%include "trellis/sccc_encoder_bi.h" -%include "trellis/sccc_encoder_ss.h" -%include "trellis/sccc_encoder_si.h" -%include "trellis/sccc_encoder_ii.h" -%include "trellis/pccc_encoder_bb.h" -%include "trellis/pccc_encoder_bs.h" -%include "trellis/pccc_encoder_bi.h" -%include "trellis/pccc_encoder_ss.h" -%include "trellis/pccc_encoder_si.h" -%include "trellis/pccc_encoder_ii.h" -%include "trellis/metrics_s.h" -%include "trellis/metrics_i.h" -%include "trellis/metrics_f.h" -%include "trellis/metrics_c.h" -%include "trellis/pccc_decoder_b.h" -%include "trellis/pccc_decoder_s.h" -%include "trellis/pccc_decoder_i.h" -%include "trellis/pccc_decoder_combined_fb.h" -%include "trellis/pccc_decoder_combined_fs.h" -%include "trellis/pccc_decoder_combined_fi.h" -%include "trellis/pccc_decoder_combined_cb.h" -%include "trellis/pccc_decoder_combined_cs.h" -%include "trellis/pccc_decoder_combined_ci.h" -%include "trellis/viterbi_b.h" -%include "trellis/viterbi_s.h" -%include "trellis/viterbi_i.h" -%include "trellis/viterbi_combined_sb.h" -%include "trellis/viterbi_combined_ss.h" -%include "trellis/viterbi_combined_si.h" -%include "trellis/viterbi_combined_ib.h" -%include "trellis/viterbi_combined_is.h" -%include "trellis/viterbi_combined_ii.h" -%include "trellis/viterbi_combined_fb.h" -%include "trellis/viterbi_combined_fs.h" -%include "trellis/viterbi_combined_fi.h" -%include "trellis/viterbi_combined_cb.h" -%include "trellis/viterbi_combined_cs.h" -%include "trellis/viterbi_combined_ci.h" -%include "trellis/sccc_decoder_b.h" -%include "trellis/sccc_decoder_s.h" -%include "trellis/sccc_decoder_i.h" -%include "trellis/sccc_decoder_combined_fb.h" -%include "trellis/sccc_decoder_combined_fs.h" -%include "trellis/sccc_decoder_combined_fi.h" -%include "trellis/sccc_decoder_combined_cb.h" -%include "trellis/sccc_decoder_combined_cs.h" -%include "trellis/sccc_decoder_combined_ci.h" +%include "gnuradio/trellis/constellation_metrics_cf.h" +%include "gnuradio/trellis/permutation.h" +%include "gnuradio/trellis/siso_combined_f.h" +%include "gnuradio/trellis/siso_f.h" +%include "gnuradio/trellis/encoder_bb.h" +%include "gnuradio/trellis/encoder_bs.h" +%include "gnuradio/trellis/encoder_bi.h" +%include "gnuradio/trellis/encoder_ss.h" +%include "gnuradio/trellis/encoder_si.h" +%include "gnuradio/trellis/encoder_ii.h" +%include "gnuradio/trellis/sccc_encoder_bb.h" +%include "gnuradio/trellis/sccc_encoder_bs.h" +%include "gnuradio/trellis/sccc_encoder_bi.h" +%include "gnuradio/trellis/sccc_encoder_ss.h" +%include "gnuradio/trellis/sccc_encoder_si.h" +%include "gnuradio/trellis/sccc_encoder_ii.h" +%include "gnuradio/trellis/pccc_encoder_bb.h" +%include "gnuradio/trellis/pccc_encoder_bs.h" +%include "gnuradio/trellis/pccc_encoder_bi.h" +%include "gnuradio/trellis/pccc_encoder_ss.h" +%include "gnuradio/trellis/pccc_encoder_si.h" +%include "gnuradio/trellis/pccc_encoder_ii.h" +%include "gnuradio/trellis/metrics_s.h" +%include "gnuradio/trellis/metrics_i.h" +%include "gnuradio/trellis/metrics_f.h" +%include "gnuradio/trellis/metrics_c.h" +%include "gnuradio/trellis/pccc_decoder_b.h" +%include "gnuradio/trellis/pccc_decoder_s.h" +%include "gnuradio/trellis/pccc_decoder_i.h" +%include "gnuradio/trellis/pccc_decoder_combined_fb.h" +%include "gnuradio/trellis/pccc_decoder_combined_fs.h" +%include "gnuradio/trellis/pccc_decoder_combined_fi.h" +%include "gnuradio/trellis/pccc_decoder_combined_cb.h" +%include "gnuradio/trellis/pccc_decoder_combined_cs.h" +%include "gnuradio/trellis/pccc_decoder_combined_ci.h" +%include "gnuradio/trellis/viterbi_b.h" +%include "gnuradio/trellis/viterbi_s.h" +%include "gnuradio/trellis/viterbi_i.h" +%include "gnuradio/trellis/viterbi_combined_sb.h" +%include "gnuradio/trellis/viterbi_combined_ss.h" +%include "gnuradio/trellis/viterbi_combined_si.h" +%include "gnuradio/trellis/viterbi_combined_ib.h" +%include "gnuradio/trellis/viterbi_combined_is.h" +%include "gnuradio/trellis/viterbi_combined_ii.h" +%include "gnuradio/trellis/viterbi_combined_fb.h" +%include "gnuradio/trellis/viterbi_combined_fs.h" +%include "gnuradio/trellis/viterbi_combined_fi.h" +%include "gnuradio/trellis/viterbi_combined_cb.h" +%include "gnuradio/trellis/viterbi_combined_cs.h" +%include "gnuradio/trellis/viterbi_combined_ci.h" +%include "gnuradio/trellis/sccc_decoder_b.h" +%include "gnuradio/trellis/sccc_decoder_s.h" +%include "gnuradio/trellis/sccc_decoder_i.h" +%include "gnuradio/trellis/sccc_decoder_combined_fb.h" +%include "gnuradio/trellis/sccc_decoder_combined_fs.h" +%include "gnuradio/trellis/sccc_decoder_combined_fi.h" +%include "gnuradio/trellis/sccc_decoder_combined_cb.h" +%include "gnuradio/trellis/sccc_decoder_combined_cs.h" +%include "gnuradio/trellis/sccc_decoder_combined_ci.h" GR_SWIG_BLOCK_MAGIC2(trellis, constellation_metrics_cf); GR_SWIG_BLOCK_MAGIC2(trellis, permutation); |