[Commit-gnuradio] [gnuradio] 09/25: polar: fixed bugs in init code

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 48e1ab019856d78f4fa7354f2edb0b8641ebc13a
Author: Johannes Demel <address@hidden>
Date:   Fri Sep 18 16:02:38 2015 +0200

    polar: fixed bugs in init code
---
 gr-fec/grc/polar_code_configurator.xml          | 17 +++++++----------
 gr-fec/python/fec/polar/__init__.py             |  3 +++
 gr-fec/python/fec/polar/channel_construction.py |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gr-fec/grc/polar_code_configurator.xml 
b/gr-fec/grc/polar_code_configurator.xml
index cfde368..dd28e49 100644
--- a/gr-fec/grc/polar_code_configurator.xml
+++ b/gr-fec/grc/polar_code_configurator.xml
@@ -3,25 +3,22 @@
   <name>POLAR code Configurator</name>
   <key>variable_polar_code_configurator</key>
   <import>from gnuradio.fec import polar</import>
-  <var_make>self.$(id) = $(id) = polar.load_frozen_bits_info(False, 
$channel.c, $block_size, $num_info_bits, $design_snr, $mu)</var_make>
-  <var_value>polar.load_frozen_bits_info(True, $channel.c, $block_size, 
$num_info_bits, $design_snr, $mu)</var_value>
+  <var_make>self.$(id) = $(id) = polar.load_frozen_bits_info(False, $channel, 
$block_size, $num_info_bits, $design_snr, $mu)</var_make>
+  <var_value>polar.load_frozen_bits_info(True, $channel, $block_size, 
$num_info_bits, $design_snr, $mu)</var_value>
   <make></make>
 
   <param>
     <name>Channel</name>
     <key>channel</key>
-    <type>enum</type>
+    <value>polar.CHANNEL_TYPE_BEC</value>
+    <type>string</type>
       <option>
         <name>BEC</name>
-        <key>bec</key>
-        <opt>c:'BEC'</opt>
-        <opt>h:True</opt>
+        <key>polar.CHANNEL_TYPE_BEC</key>
       </option>
       <option>
         <name>BSC</name>
-        <key>bsc</key>
-        <opt>c:'BSC'</opt>
-        <opt>h:False</opt>
+        <key>polar.CHANNEL_TYPE_BSC</key>
       </option>
   </param>
 
@@ -49,6 +46,6 @@
     <key>mu</key>
     <value>16</value>
     <type>int</type>
-    <hide>#if str($channel.h) == 'True' then 'all' else 'none'#</hide>
+    <hide>#if 'BEC' in $getVar('channel') then 'all' else 'none' #</hide>
   </param>
 </block>
\ No newline at end of file
diff --git a/gr-fec/python/fec/polar/__init__.py 
b/gr-fec/python/fec/polar/__init__.py
index 4a9cc75..0b9c264 100644
--- a/gr-fec/python/fec/polar/__init__.py
+++ b/gr-fec/python/fec/polar/__init__.py
@@ -26,6 +26,9 @@ from channel_construction_bec import bhattacharyya_bounds
 from helper_functions import is_power_of_two
 
 
+CHANNEL_TYPE_BSC = 'BSC'
+CHANNEL_TYPE_BEC = 'BEC'
+
 def get_z_params(is_prototype, channel, block_size, design_snr, mu):
     print('POLAR code channel construction called with parameters channel={0}, 
blocksize={1}, design SNR={2}, mu={3}'.format(channel, block_size, design_snr, 
mu))
     if not (channel == 'BSC' or channel == 'BEC'):
diff --git a/gr-fec/python/fec/polar/channel_construction.py 
b/gr-fec/python/fec/polar/channel_construction.py
index bf3ff92..a7f048c 100644
--- a/gr-fec/python/fec/polar/channel_construction.py
+++ b/gr-fec/python/fec/polar/channel_construction.py
@@ -49,7 +49,7 @@ def get_frozen_bit_indices_from_z_parameters(z_params, 
nfrozen):
     while indexes.size < nfrozen:
         index = np.argmax(z_params)
         indexes = np.append(indexes, index)
-        z_params[index] = 0.0
+        z_params[index] = -1.0
     return np.sort(indexes)