Updated unit tests

Updated hanlding of encoding names, added GLONASS tracking test.

Author: valeri-atamaniouk

tests/test_acquisition.py

@@ -8,12 +8,13 @@
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
 from test_common import generate_sample_file, \
-                        run_peregrine,\
-                        propagate_code_phase, \
-                        get_sampling_freq
+    run_peregrine,\
+    propagate_code_phase, \
+    get_sampling_freq
 
 import os
 import peregrine.acquisition as acq
+from peregrine import defaults
 
 
 def get_acq_result_file_name(sample_file):
@@ -37,15 +38,15 @@ def run_acq_test(init_doppler, init_code_phase,
 
   for prn in prns:
     samples_filename = generate_sample_file(prn, init_doppler,
-                                   init_code_phase,
-                                   file_format, freq_profile)
+                                            init_code_phase,
+                                            file_format, freq_profile)
 
     run_peregrine(samples_filename, file_format, freq_profile,
                   skip_param, skip_val)
 
     code_phase = propagate_code_phase(init_code_phase,
-                   get_sampling_freq(freq_profile),
-                   skip_param, skip_val)
+                                      get_sampling_freq(freq_profile),
+                                      skip_param, skip_val)
 
     if skip_val == 0:
       check_acq_results(samples_filename, prn, init_doppler, code_phase)
@@ -57,7 +58,7 @@ def run_acq_test(init_doppler, init_code_phase,
 
 def check_acq_results(filename, prn, doppler, code_phase):
   acq_results = acq.load_acq_results(
-                    get_acq_result_file_name(filename))
+      get_acq_result_file_name(filename))
 
   acq_results = sorted(acq_results,
                        lambda x, y: -1 if x.snr > y.snr else 1)
@@ -79,7 +80,7 @@ def check_acq_results(filename, prn, doppler, code_phase):
   assert code_phase_diff < 1.0
 
 
-#def test_acquisition():
+# def test_acquisition():
 #  """
 #  Test GPS L1C/A acquisition
 #  """
@@ -97,21 +98,21 @@ def test_acqusition_prn1_m1000():
   """
   Test GPS L1C/A acquisition
   """
-  run_acq_test(-1000., 0., [1], '2bits')
+  run_acq_test(-1000., 0., [1], defaults.FORMAT_2BITS_X1_GPS_L1)
 
 
 def test_acqusition_prn32_0():
   """
   Test GPS L1C/A acquisition
   """
-  run_acq_test(0., 0., [32], '2bits')
+  run_acq_test(0., 0., [32], defaults.FORMAT_2BITS_X1_GPS_L1)
 
 
 def test_acqusition_prn5_p1000():
   """
   Test GPS L1C/A acquisition
   """
-  run_acq_test(1000., 0., [5], '2bits')
+  run_acq_test(1000., 0., [5], defaults.FORMAT_2BITS_X1_GPS_L1)
 
 
 def test_skip_params():
@@ -122,5 +123,5 @@ def test_skip_params():
   --skip_ms
 
   """
-  run_acq_test(1000, 0, [1], '1bit', skip_samples=1000)
-  run_acq_test(1000, 0, [1], '1bit', skip_ms=50)
+  run_acq_test(1000, 0, [1], defaults.FORMAT_1BIT_X1_GPS_L1, skip_samples=1000)
+  run_acq_test(1000, 0, [1], defaults.FORMAT_1BIT_X1_GPS_L1, skip_ms=50)

tests/test_common.py

@@ -12,22 +12,24 @@
 import peregrine.iqgen.iqgen_main as iqgen
 import peregrine.defaults as defaults
 import peregrine.gps_constants as gps
+import peregrine.glo_constants as glo
 import numpy as np
 
 from mock import patch
 
 
 def fileformat_to_bands(file_format):
-  if file_format == '1bit':
-    bands = ['l1ca']
-  elif file_format == '1bit_x2':
-    bands = ['l1ca', 'l2c']
-  elif file_format == '2bits':
-    bands = ['l1ca']
-  elif file_format == '2bits_x2':
-    bands = ['l1ca', 'l2c']
-  elif file_format == '2bits_x4':
-    bands = ['l1ca', 'l2c']
+  profile = defaults.file_encoding_profile[file_format]
+  bands = []
+  for p in profile:
+    if p == defaults.sample_channel_GPS_L1:
+      bands += [gps.L1CA]
+    elif p == defaults.sample_channel_GPS_L2:
+      bands += [gps.L2C]
+    elif p == defaults.sample_channel_GLO_L1:
+      bands += [glo.GLO_L1]
+    elif p == defaults.sample_channel_GLO_L2:
+      bands += [glo.GLO_L2]
   return bands
 
 
@@ -67,8 +69,8 @@ def generate_2bits_x4_sample_file(filename):
     samples[channel_lookup[rx]][:] = chan
   # Store the result back to the same file
   packed = np.zeros(num_samples, dtype=np.uint8)
-  packed = samples[3][::] << 6
-  packed |= samples[0][::] & 3
+  packed[:] = samples[3] << 6
+  packed |= samples[0] & 3
   with open(filename, 'wb') as f:
     packed.tofile(f)
 
@@ -77,17 +79,17 @@ def generate_2bits_x4_sample_file(filename):
 
 def generate_piksi_sample_file(filename):
   samples_lookup = [
-    0b11111100,
-    0b11011000,
-    0b10110100,
-    0b10010000,
-    0b00000000,
-    0b00100100,
-    0b01001000,
-    0b01101100
+      0b11111100,
+      0b11011000,
+      0b10110100,
+      0b10010000,
+      0b00000000,
+      0b00100100,
+      0b01001000,
+      0b01101100
   ]
   samples_lookup_values = [
-    -7, -7, -5, -5, -3, -3, -1, -1, 1, 1, 3, 3, 5, 5, 7, 7
+      -7, -7, -5, -5, -3, -3, -1, -1, 1, 1, 3, 3, 5, 5, 7, 7
   ]
   num_samples = int(1e6)
   packed = np.zeros(num_samples, dtype=np.uint8)
@@ -104,23 +106,53 @@ def generate_sample_file(gps_sv_prn, init_doppler,
                          freq_profile, generate=.1):
   sample_file = 'iqgen-data-samples.bin'
   params = ['iqgen_main']
-  params += ['--gps-sv', str(gps_sv_prn)]
-
-  if file_format == '1bit':
-    encoder = '1bit'
-    params += ['--bands', 'l1ca']
-  elif file_format == '1bit_x2':
-    encoder = '1bit'
-    params += ['--bands', 'l1ca+l2c']
-  elif file_format == '2bits':
-    encoder = '2bits'
-    params += ['--bands', 'l1ca']
-  elif file_format == '2bits_x2':
-    encoder = '2bits'
-    params += ['--bands', 'l1ca+l2c']
-  elif file_format == '2bits_x4':
-    encoder = '2bits'
-    params += ['--bands', 'l1ca+l2c']
+  bands = fileformat_to_bands(file_format)
+
+  if gps.L1CA in bands or gps.L2C in bands:
+    params += ['--gps-sv', str(gps_sv_prn)]
+
+    if file_format == defaults.FORMAT_1BIT_X1_GPS_L1:
+      encoder = '1bit'
+      params += ['--bands', 'l1ca']
+    elif file_format == defaults.FORMAT_1BIT_X2_GPS_L1L2:
+      encoder = '1bit'
+      params += ['--bands', 'l1ca+l2c']
+    elif file_format == defaults.FORMAT_2BITS_X1_GPS_L1:
+      encoder = '2bits'
+      params += ['--bands', 'l1ca']
+    elif file_format == defaults.FORMAT_2BITS_X2_GPS_L1L2:
+      encoder = '2bits'
+      params += ['--bands', 'l1ca+l2c']
+    elif file_format == defaults.FORMAT_2BITS_X4_GPS_L1L2_GLO_L1L2:
+      encoder = '2bits'
+      params += ['--bands', 'l1ca+l2c']
+    else:
+      assert False
+  elif glo.GLO_L1 in bands or glo.GLO_L2 in bands:
+    params += ['--glo-sv', str(gps_sv_prn)]
+
+    if file_format == defaults.FORMAT_1BIT_X1_GLO_L1:
+      encoder = '1bit'
+      params += ['--bands', 'l1']
+    elif file_format == defaults.FORMAT_1BIT_X1_GLO_L2:
+      encoder = '1bit'
+      params += ['--bands', 'l2']
+    elif file_format == defaults.FORMAT_1BIT_X2_GLO_L1L2:
+      encoder = '1bit'
+      params += ['--bands', 'l1+l2']
+    elif file_format == defaults.FORMAT_2BITS_X1_GLO_L1:
+      encoder = '2bits'
+      params += ['--bands', 'l1']
+    elif file_format == defaults.FORMAT_2BITS_X2_GLO_L1L2:
+      encoder = '2bits'
+      params += ['--bands', 'l1+l2']
+    elif file_format == defaults.FORMAT_2BITS_X4_GPS_L1L2_GLO_L1L2:
+      encoder = '2bits'
+      params += ['--bands', 'l1+l2']
+    else:
+      assert False
+  else:
+    assert False
 
   params += ['--encoder', encoder]
   params += ['--doppler-type', 'const']
@@ -153,12 +185,12 @@ def run_peregrine(file_name, file_format, freq_profile,
                   short_long_cycles=None):
 
   parameters = [
-    'peregrine',
-    '--file', file_name,
-    '--file-format', file_format,
-    '--profile', freq_profile,
-    skip_param, str(skip_val),
-    '--progress-bar', 'stdout'
+      'peregrine',
+      '--file', file_name,
+      '--file-format', file_format,
+      '--profile', freq_profile,
+      skip_param, str(skip_val),
+      '--progress-bar', 'stdout'
   ]
   if skip_tracking:
     parameters += ['-t']

tests/test_file_format.py

@@ -13,28 +13,28 @@ def test_file_format_1bit():
   """
   Test different file formats: '1bit'
   """
-  run_acq_test(1000, 0, [1], '1bit')
+  run_acq_test(1000, 0, [1], defaults.FORMAT_1BIT_X1_GPS_L1)
 
 
 def test_file_format_2bits():
   """
   Test different file formats: '2bits'
   """
-  run_acq_test(1000, 0, [1], '2bits')
+  run_acq_test(1000, 0, [1], defaults.FORMAT_2BITS_X1_GPS_L1)
 
 
 def test_file_format_1bitx2():
   """
   Test different file formats: '1bit_x2'
   """
-  run_acq_test(1000, 0, [1], '1bit_x2')
+  run_acq_test(1000, 0, [1], defaults.FORMAT_1BIT_X2_GPS_L1L2)
 
 
 def test_file_format_2bitsx2():
   """
   Test different file formats: '2bits_x2'
   """
-  run_acq_test(1000, 0, [1], '2bits_x2')
+  run_acq_test(1000, 0, [1],  defaults.FORMAT_2BITS_X2_GPS_L1L2)
 
 
 def test_file_formats():
@@ -45,9 +45,9 @@ def test_file_formats():
   # test 'piksi' format
   val = generate_piksi_sample_file(SAMPLE_FILE_NAME)
   samples = {
-    'samples_total': -1,
-    'sample_index': 0,
-    L1CA: {}
+      'samples_total': -1,
+      'sample_index': 0,
+      L1CA: {}
   }
   for num in [-1, defaults.processing_block_size]:
     load_samples(samples, SAMPLE_FILE_NAME, num, 'piksi')

tests/test_freq_profiles.py

@@ -8,21 +8,22 @@
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
 from test_acquisition import run_acq_test
+from peregrine import defaults
 
 
 def test_custom_rate():
-  run_acq_test(-4000, 0, [1], '2bits', 'custom_rate')
+  run_acq_test(-4000, 0, [1], defaults.FORMAT_2BITS_X1_GPS_L1, 'custom_rate')
 
 
 def test_low_rate():
-  run_acq_test(-2000, 0, [2], '2bits', 'low_rate')
+  run_acq_test(-2000, 0, [2], defaults.FORMAT_2BITS_X1_GPS_L1, 'low_rate')
 
 
 def test_normal_rate():
-  run_acq_test(2000, 0, [3], '2bits', 'normal_rate')
+  run_acq_test(2000, 0, [3], defaults.FORMAT_2BITS_X1_GPS_L1, 'normal_rate')
 
 
 # Takes long time to complete in Travis CI test and
 # therefore fails
-#def test_high_rate():
-#  run_acq_test(2000, 0, [4], '2bits', 'high_rate')
+# def test_high_rate():
+#  run_acq_test(2000, 0, [4], defaults.FORMAT_2BITS_X1_GPS_L1, 'high_rate')