[Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'anastas/trellisupdates'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit b0e0aa035d11a4e2bbcad62885f8cda82a6a6b88
Merge: 8ebe90f 79d55f1
Author: Johnathan Corgan <address@hidden>
Date:   Thu Oct 16 08:55:06 2014 -0700

    Merge remote-tracking branch 'anastas/trellisupdates'

 gr-trellis/doc/gr-trellis.xml                      |    8 +-
 gr-trellis/examples/grc/CMakeLists.txt             |   26 +-
 .../examples/grc/interference_cancellation.grc     | 2837 ++++++-------------
 gr-trellis/examples/grc/pccc.grc                   |  837 +++---
 gr-trellis/examples/grc/readme.txt                 |    6 +-
 gr-trellis/examples/grc/sccc.grc                   |  690 +++--
 gr-trellis/examples/grc/{pccc1.grc => tcm.grc}     |  828 +++---
 ...nce_cancellation.grc => turbo_equalization.grc} | 2874 +++++++-------------
 .../grc/{sccc1.grc => viterbi_equalization.grc}    | 1196 +++++---
 gr-trellis/examples/python/CMakeLists.txt          |   30 +-
 gr-trellis/examples/python/README                  |   10 +-
 .../examples/python/fsm_files/awgn1o1_16rsc.fsm    |   40 +
 .../examples/python/fsm_files/awgn1o1_4rsc.fsm     |   16 +
 .../examples/python/fsm_files/awgn1o2_16rsc.fsm    |   40 +
 .../examples/python/fsm_files/awgn1o2_4rsc.fsm     |   14 +
 .../python/fsm_files/awgn2o3_16ungerboeck.fsm      |   50 +
 .../python/fsm_files/awgn2o3_16ungerboecka.fsm     |   48 +
 .../python/fsm_files/awgn2o3_32ungerboeck.fsm      |   83 +
 .../python/fsm_files/awgn2o3_32ungerboecka.fsm     |   84 +
 .../examples/python/fsm_files/awgn2o3_4_msb.fsm    |    2 +-
 .../examples/python/fsm_files/awgn2o3_4_msbG.fsm   |    4 +-
 .../python/fsm_files/awgn2o3_4ungerboeck.fsm       |   26 +
 .../python/fsm_files/awgn2o3_4ungerboecka.fsm      |   23 +
 .../python/fsm_files/awgn2o3_64ungerboeck.fsm      |  150 +
 .../python/fsm_files/awgn2o3_64ungerboecka.fsm     |  154 ++
 gr-trellis/examples/python/fsm_files/awgn2o3_8.fsm |    3 +-
 .../python/fsm_files/awgn2o3_8ungerboeck.fsm       |   35 +
 .../python/fsm_files/awgn2o3_8ungerboecka.fsm      |   32 +
 gr-trellis/examples/python/fsm_files/uncoded4.fsm  |    7 +
 gr-trellis/examples/python/test_cpm.py             |    7 +-
 gr-trellis/examples/python/test_pccc_turbo1.py     |  124 -
 gr-trellis/examples/python/test_sccc_hard.py       |  106 -
 gr-trellis/examples/python/test_sccc_soft.py       |  110 -
 gr-trellis/examples/python/test_sccc_turbo.py      |  146 -
 gr-trellis/examples/python/test_sccc_turbo1.py     |  104 -
 gr-trellis/examples/python/test_sccc_turbo2.py     |  106 -
 gr-trellis/examples/python/test_tcm.py             |   76 +-
 gr-trellis/examples/python/test_tcm_bit.py         |  134 -
 gr-trellis/examples/python/test_tcm_combined.py    |  112 -
 gr-trellis/examples/python/test_tcm_parallel.py    |  118 -
 .../examples/python/test_turbo_equalization.py     |  147 -
 .../examples/python/test_turbo_equalization1.py    |  152 --
 .../examples/python/test_turbo_equalization2.py    |  152 --
 .../examples/python/test_viterbi_equalization.py   |   99 -
 .../examples/python/test_viterbi_equalization1.py  |  108 -
 gr-trellis/gnuradio-trellis.pc.in                  |    2 +-
 gr-trellis/grc/trellis_encoder_xx.xml              |   26 +-
 gr-trellis/grc/trellis_metrics_x.xml               |    3 +
 .../grc/trellis_pccc_decoder_combined_xx.xml       |    2 +-
 gr-trellis/grc/trellis_permutation.xml             |    4 +
 .../grc/trellis_sccc_decoder_combined_xx.xml       |    2 +-
 gr-trellis/grc/trellis_siso_combined_f.xml         |   16 +-
 gr-trellis/grc/trellis_siso_f.xml                  |   13 +-
 gr-trellis/grc/trellis_viterbi_combined_xx.xml     |    8 +-
 gr-trellis/grc/trellis_viterbi_x.xml               |    4 +
 gr-trellis/include/gnuradio/trellis/encoder_XX.h.t |    6 +
 gr-trellis/include/gnuradio/trellis/fsm.h          |   10 +
 gr-trellis/include/gnuradio/trellis/metrics_X.h.t  |    5 +
 gr-trellis/include/gnuradio/trellis/permutation.h  |    7 +-
 .../gnuradio/trellis/sccc_decoder_combined_XX.h.t  |    1 +
 .../include/gnuradio/trellis/siso_combined_f.h     |   11 +
 gr-trellis/include/gnuradio/trellis/siso_f.h       |    8 +
 gr-trellis/include/gnuradio/trellis/viterbi_X.h.t  |   13 +-
 .../gnuradio/trellis/viterbi_combined_XX.h.t       |    9 +-
 gr-trellis/lib/calc_metric.cc                      |   17 +-
 gr-trellis/lib/core_algorithms.cc                  |   47 +-
 gr-trellis/lib/encoder_XX_impl.cc.t                |   80 +-
 gr-trellis/lib/encoder_XX_impl.h.t                 |   14 +-
 gr-trellis/lib/fsm.cc                              |   48 +
 gr-trellis/lib/metrics_X_impl.cc.t                 |   27 +-
 gr-trellis/lib/metrics_X_impl.h.t                  |    4 +
 gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t  |    2 +
 gr-trellis/lib/pccc_encoder_XX_impl.cc.t           |    2 +-
 gr-trellis/lib/permutation_impl.cc                 |   23 +-
 gr-trellis/lib/permutation_impl.h                  |    6 +-
 gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t  |    2 +
 gr-trellis/lib/siso_combined_f_impl.cc             |  109 +-
 gr-trellis/lib/siso_combined_f_impl.h              |   12 +
 gr-trellis/lib/siso_f_impl.cc                      |   80 +-
 gr-trellis/lib/siso_f_impl.h                       |    9 +
 gr-trellis/lib/viterbi_X_impl.cc.t                 |   27 +
 gr-trellis/lib/viterbi_X_impl.h.t                  |   12 +-
 gr-trellis/lib/viterbi_combined_XX_impl.cc.t       |   45 +-
 gr-trellis/lib/viterbi_combined_XX_impl.h.t        |   17 +-
 gr-trellis/python/trellis/CMakeLists.txt           |    1 +
 gr-trellis/python/trellis/__init__.py              |    3 +
 .../python => python/trellis}/fsm_utils.py         |   61 +-
 87 files changed, 5704 insertions(+), 7048 deletions(-)