diff options
| -rwxr-xr-x | gr-digital/python/qa_constellation_receiver.py | 10 | ||||
| -rw-r--r-- | gr-digital/python/utils/alignment.py | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/qa_constellation_receiver.py index fc2277158..2d25433b9 100755 --- a/gr-digital/python/qa_constellation_receiver.py +++ b/gr-digital/python/qa_constellation_receiver.py @@ -32,16 +32,14 @@ from qa_constellation import tested_constellations, twod_constell import math # Set a seed so that if errors turn up they are reproducible. -# 1234 fails SEED = 1239 -random.seed(SEED) # TESTING PARAMETERS # The number of symbols to test with. # We need this many to let the frequency recovery block converge. DATA_LENGTH = 2000 # Test fails if fraction of output that is correct is less than this. -REQ_CORRECT = 0.8 +REQ_CORRECT = 0.7 # CHANNEL PARAMETERS NOISE_VOLTAGE = 0.01 @@ -69,10 +67,12 @@ class test_constellation_receiver (gr_unittest.TestCase): we're really trying to test. """ + rndm = random.Random() + rndm.seed(SEED) # Assumes not more than 64 points in a constellation # Generates some random input data to use. self.src_data = tuple( - [random.randint(0,1) for i in range(0, self.max_data_length)]) + [rndm.randint(0,1) for i in range(0, self.max_data_length)]) # Generates some random indices to use for comparing input and # output data (a full comparison is too slow in python). self.indices = alignment.random_sample( @@ -115,7 +115,7 @@ class rec_test_tb (gr.top_block): super(rec_test_tb, self).__init__() # Transmission Blocks if src_data is None: - self.src_data = tuple([random.randint(0,1) for i in range(0, data_length)]) + self.src_data = tuple([rndm.randint(0,1) for i in range(0, data_length)]) else: self.src_data = src_data packer = gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST) diff --git a/gr-digital/python/utils/alignment.py b/gr-digital/python/utils/alignment.py index d32365866..f3ad3781e 100644 --- a/gr-digital/python/utils/alignment.py +++ b/gr-digital/python/utils/alignment.py @@ -23,16 +23,17 @@ This module contains functions for aligning sequences. >>> import random ->>> random.seed(1234) ->>> ran_seq = [random.randint(0,1) for i in range(0, 100)] +>>> rndm = random.Random() +>>> rndm.seed(1234) +>>> ran_seq = [rndm.randint(0,1) for i in range(0, 100)] >>> offset_seq = [0] * 20 + ran_seq >>> correct, overlap, offset = align_sequences(ran_seq, offset_seq) >>> print(correct, overlap, offset) (1.0, 100, -20) >>> offset_err_seq = [] >>> for bit in offset_seq: -... if random.randint(0,4) == 4: -... offset_err_seq.append(random.randint(0,1)) +... if rndm.randint(0,4) == 4: +... offset_err_seq.append(rndm.randint(0,1)) ... else: ... offset_err_seq.append(bit) >>> correct, overlap, offset = align_sequences(ran_seq, offset_err_seq) @@ -78,7 +79,8 @@ def random_sample(size, num_samples=def_num_samples, seed=None): Returns a set of random integers between 0 and (size-1). The set contains no more than num_samples integers. """ - random.seed(seed) + rndm = random.Random() + rndm.seed(seed) if num_samples > size: indices = set(range(0, size)) else: @@ -86,7 +88,7 @@ def random_sample(size, num_samples=def_num_samples, seed=None): num_samples = num_samples/2 indices = set([]) while len(indices) < num_samples: - index = random.randint(0, size-1) + index = rndm.randint(0, size-1) indices.add(index) indices = list(indices) indices.sort() |