diff options
| author | Tom Rondeau <tom@trondeau.com> | 2015-10-14 17:52:41 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2015-10-15 10:40:25 -0400 |
| commit | 3688105f23791c00349d4fa01c3a4f671af3b00b (patch) | |
| tree | 484f6bdce2360ed54629fb7e4383f9caf9a0a6c9 /gr-fec/python | |
| parent | 62fb423cc415f658e6a7e1b8cafd37d066573a70 (diff) | |
fec: LDPC: fixed issue with bit_flip_decoder.
We can't use a raw pointer, so using a shared_ptr to the base class,
instead, from the H and G matrices.
Diffstat (limited to 'gr-fec/python')
| -rw-r--r-- | gr-fec/python/fec/qa_fecapi_ldpc.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gr-fec/python/fec/qa_fecapi_ldpc.py b/gr-fec/python/fec/qa_fecapi_ldpc.py index e5a968b839..52a05dccee 100644 --- a/gr-fec/python/fec/qa_fecapi_ldpc.py +++ b/gr-fec/python/fec/qa_fecapi_ldpc.py @@ -48,7 +48,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) k = LDPC_matrix_object.k() enc = fec.ldpc_par_mtrx_encoder.make_H(LDPC_matrix_object) - dec = fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr()) + dec = fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr()) threading = None self.test = _qa_helper(10*k, enc, dec, threading) self.tb.connect(self.test) @@ -65,7 +65,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) k = LDPC_matrix_object.k() enc = fec.ldpc_par_mtrx_encoder.make_H(LDPC_matrix_object) - dec = fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr()) + dec = fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr()) threading = 'ordinary' self.test = _qa_helper(10*k, enc, dec, threading) self.tb.connect(self.test) @@ -82,7 +82,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) k = LDPC_matrix_object.k() enc = fec.ldpc_par_mtrx_encoder.make_H(LDPC_matrix_object) - dec = fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr()) + dec = fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr()) threading = 'capillary' self.test = _qa_helper(10*k, enc, dec, threading) self.tb.connect(self.test) @@ -99,7 +99,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) k = LDPC_matrix_object.k() enc = map((lambda a: fec.ldpc_par_mtrx_encoder.make_H(LDPC_matrix_object)), range(0,1)) - dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr())), range(0,1)) + dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr())), range(0,1)) threading = None self.test = _qa_helper(10*k, enc, dec, threading) self.tb.connect(self.test) @@ -116,7 +116,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) k = LDPC_matrix_object.k() enc = map((lambda a: fec.ldpc_par_mtrx_encoder.make_H(LDPC_matrix_object)), range(0,1)) - dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr())), range(0,1)) + dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr())), range(0,1)) threading = 'ordinary' self.test = _qa_helper(10*k, enc, dec, threading) self.tb.connect(self.test) @@ -133,7 +133,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) k = LDPC_matrix_object.k() enc = map((lambda a: fec.ldpc_par_mtrx_encoder.make_H(LDPC_matrix_object)), range(0,1)) - dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr())), range(0,1)) + dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr())), range(0,1)) threading = 'capillary' self.test = _qa_helper(10*k, enc, dec, threading) self.tb.connect(self.test) @@ -157,7 +157,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): dec = [] for n in range(0,dims): H = fec.ldpc_H_matrix(filename, gap) - dec.append(fec.ldpc_bit_flip_decoder.make(H.get_base_ptr())) + dec.append(fec.ldpc_bit_flip_decoder.make(H.get_base_sptr())) k = 27 threading = 'ordinary' @@ -177,7 +177,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): # LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) # k = LDPC_matrix_object.k() # enc = map((lambda a: fec.ldpc_par_mtrx_encoder.make_H(LDPC_matrix_object)), range(0,dims)) -# dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr())), range(0,dims)) +# dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr())), range(0,dims)) # threading = 'capillary' # self.test = _qa_helper(dims*k, enc, dec, threading) # self.tb.connect(self.test) @@ -206,7 +206,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): # LDPC_matrix_object = fec.ldpc_H_matrix(filename, gap) # k = LDPC_matrix_object.k() # # enc = map((lambda a: fec.ldpc_encoder_make(LDPC_matrix_object)), range(0,dims)) -# dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr())), range(0,dims)) +# dec = map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr())), range(0,dims)) # threading = 'capillary' # self.assertRaises(AttributeError, lambda: extended_decoder(dec, threading=threading, puncpat="11")) # @@ -244,7 +244,7 @@ class test_fecapi_ldpc(gr_unittest.TestCase): # k = LDPC_matrix_object.k() # dims1 = 16 # dims2 = 16 -# dec = map((lambda b: map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_ptr())), range(0,dims1))), range(0,dims2)) +# dec = map((lambda b: map((lambda a: fec.ldpc_bit_flip_decoder.make(LDPC_matrix_object.get_base_sptr())), range(0,dims1))), range(0,dims2)) # threading = 'capillary' # # self.assertRaises(AttributeError, lambda: extended_decoder(dec, threading=threading, puncpat="11")) |