Merge pull request #197 from kovach/fix

fix loop error, add unit test

Author: kovach

src/sats_management.c

@@ -94,16 +94,17 @@ void set_reference_sat_of_prns(const u8 ref_prn, const u8 num_sats, u8 *prns)
     memcpy(old_prns, prns, num_sats * sizeof(u8));
     u8 set_old_yet = 0;
     prns[0] = ref_prn;
-    for (u8 i=1; i<num_sats; ) {
+    for (u8 i=1; i<num_sats; i++) {
       if (old_prns[i] != ref_prn) {
         if (old_prns[i]>old_ref && set_old_yet == 0) {
           prns[j] = old_ref;
           j++;
+          i--;
           set_old_yet++;
         }
         else {
           prns[j] = old_prns[i];
-          i++, j++;
+          j++;
         }
       }
     }
@@ -135,16 +136,17 @@ static void set_reference_sat(const u8 ref_prn, sats_management_t *sats_manageme
     memcpy(old_prns, sats_management->prns, sats_management->num_sats * sizeof(u8));
     u8 set_old_yet = 0;
     sats_management->prns[0] = ref_prn;
-    for (u8 i=1; i<sats_management->num_sats; ) {
+    for (u8 i=1; i<sats_management->num_sats; i++) {
       if (old_prns[i] != ref_prn) {
         if (old_prns[i]>old_ref && set_old_yet == 0) {
           sats_management->prns[j] = old_ref;
           j++;
+          i--;
           set_old_yet++;
         }
         else {
           sats_management->prns[j] = old_prns[i];
-          i++, j++;
+          j++;
         }
       }
     }

tests/CMakeLists.txt

@@ -36,6 +36,7 @@ else (CMAKE_CROSSCOMPILING)
       check_rtcm3.c
       check_coord_system.c
       check_linear_algebra.c
+      check_sats_management.c
       check_ambiguity_test.c
       check_filter_utils.c
       check_ephemeris.c

tests/check_ambiguity_test.c

@@ -133,10 +133,12 @@ START_TEST(test_ambiguity_update_reference)
                                         .prns = {3,1,2,4}}};
   create_empty_ambiguity_test(&amb_test);
 
+  amb_test.sats.num_sats = 4;
+
   sdiff_t sdiffs[4] = {{.prn = 1, .snr = 0},
                        {.prn = 2, .snr = 0},
                        {.prn = 4, .snr = 1}};
-  u8 num_sdiffs = 4;
+  u8 num_sdiffs = 3;
 
   for (u32 i=0; i<3; i++) {
     hypothesis_t *hyp = (hypothesis_t *)memory_pool_add(amb_test.pool);

tests/check_main.c

@@ -16,6 +16,7 @@ int main(void)
   srunner_add_suite(sr, amb_kf_test_suite());
   srunner_add_suite(sr, observation_test_suite());
   srunner_add_suite(sr, pvt_test_suite());
+  srunner_add_suite(sr, sats_management_test_suite());
   srunner_add_suite(sr, ambiguity_test_suite());
   srunner_add_suite(sr, rtcm3_suite());
   srunner_add_suite(sr, bits_suite());

tests/check_sats_management.c

@@ -0,0 +1,38 @@
+#include <check.h>
+#include <stdio.h>
+#include "linear_algebra.h"
+#include "check_utils.h"
+#include "sats_management.c"
+#include "amb_kf.h"
+
+
+START_TEST(test_rebase_1)
+{
+  u8 prns[4] = {2,1,3,4};
+  u8 num_sats = sizeof(prns);
+  u8 new_ref = 3;
+
+  sats_management_t sats_management;
+  sats_management.num_sats = 4;
+  sats_management.prns[0] = 2;
+  sats_management.prns[1] = 1;
+  sats_management.prns[2] = 3;
+  sats_management.prns[3] = 4;
+
+  set_reference_sat_of_prns(new_ref, num_sats, prns);
+  /* Just check the sats_management prns update */
+  set_reference_sat(new_ref, &sats_management, 0, 0, 0);
+  /* TODO make a better test */
+}
+END_TEST
+
+Suite* sats_management_test_suite(void)
+{
+  Suite *s = suite_create("Sats Management");
+
+  TCase *tc_rebase = tcase_create("rebase");
+  tcase_add_test(tc_rebase, test_rebase_1);
+  suite_add_tcase(s, tc_rebase);
+
+  return s;
+}

tests/check_suites.h

@@ -12,6 +12,7 @@ Suite* bits_suite(void);
 Suite* memory_pool_suite(void);
 Suite* edc_suite(void);
 Suite* linear_algebra_suite(void);
+Suite* sats_management_test_suite(void);
 Suite* ambiguity_test_suite(void);
 Suite* filter_utils_suite(void);
 Suite* ephemeris_suite(void);