rnsf

commit 8f89eef98a758b05301e5c57f366a6b6e1061da5
parent 9c1760906a3d0ac9e60223eaeda0c2945d1899df
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri,  8 Jul 2022 10:24:45 +0200

Minor updates to load tests

Diffstat:
M
src/test_rnsf_bands.c
 | 
42
++++++++++++++++++++++--------------------
M
src/test_rnsf_wlens.c
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------

2 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/src/test_rnsf_bands.c b/src/test_rnsf_bands.c
@@ -28,13 +28,15 @@
 #include <rsys/math.h>
 #include <rsys/mem_allocator.h>
 
+#include <stdio.h>
+
 static void
 test_load1(struct rnsf* rnsf)
 {
   FILE* fp = NULL;
   const char* filename = "test_file_bands.rnsf";
   const struct rnsf_phase_fn* phase = NULL;
-  struct rnsf_phase_fn_hg HG = RNSF_PHASE_FN_HG_NULL;
+  struct rnsf_phase_fn_hg hg = RNSF_PHASE_FN_HG_NULL;
 
   CHK(fp = fopen(filename, "w+"));
   fprintf(fp, "# Comment\n");
@@ -59,12 +61,12 @@ test_load1(struct rnsf* rnsf)
   CHK(phase = rnsf_get_phase_fn(rnsf, 0));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
 
-  CHK(rnsf_phase_fn_get_hg(NULL, &HG) == RES_BAD_ARG);
+  CHK(rnsf_phase_fn_get_hg(NULL, &hg) == RES_BAD_ARG);
   CHK(rnsf_phase_fn_get_hg(phase, NULL) == RES_BAD_ARG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 200.1);
-  CHK(HG.wavelengths[1] == 280.3);
-  CHK(HG.g == 0);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 200.1);
+  CHK(hg.wavelengths[1] == 280.3);
+  CHK(hg.g == 0);
   CHK(fclose(fp) == 0);
 }
 
@@ -72,7 +74,7 @@ static void
 test_load2(struct rnsf* rnsf)
 {
   struct rnsf_phase_fn_discrete discrete = RNSF_PHASE_FN_DISCRETE_NULL;
-  struct rnsf_phase_fn_hg HG = RNSF_PHASE_FN_HG_NULL;
+  struct rnsf_phase_fn_hg hg = RNSF_PHASE_FN_HG_NULL;
   FILE* fp = NULL;
   const struct rnsf_phase_fn* phase = NULL;
 
@@ -103,25 +105,25 @@ test_load2(struct rnsf* rnsf)
   CHK(phase = rnsf_get_phase_fn(rnsf, 0));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
   CHK(rnsf_phase_fn_get_discrete(phase, &discrete) == RES_BAD_ARG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 100 && HG.wavelengths[1] == 200);
-  CHK(HG.g == -0.3);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 100 && hg.wavelengths[1] == 200);
+  CHK(hg.g == -0.3);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 1));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 200 && HG.wavelengths[1] == 300);
-  CHK(HG.g == 0.4);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 200 && hg.wavelengths[1] == 300);
+  CHK(hg.g == 0.4);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 2));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 300 && HG.wavelengths[1] == 400);
-  CHK(HG.g == 0.5);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 300 && hg.wavelengths[1] == 400);
+  CHK(hg.g == 0.5);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 3));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_DISCRETE);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_BAD_ARG);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_BAD_ARG);
   CHK(rnsf_phase_fn_get_discrete(NULL, &discrete) == RES_BAD_ARG);
   CHK(rnsf_phase_fn_get_discrete(phase, NULL) == RES_BAD_ARG);
   CHK(rnsf_phase_fn_get_discrete(phase, &discrete) == RES_OK);
@@ -141,9 +143,9 @@ test_load2(struct rnsf* rnsf)
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 4));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 900 && HG.wavelengths[1] == 900);
-  CHK(HG.g == -0.1);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 900 && hg.wavelengths[1] == 900);
+  CHK(hg.g == -0.1);
 
   CHK(fclose(fp) == 0);
 }
diff --git a/src/test_rnsf_wlens.c b/src/test_rnsf_wlens.c
@@ -32,7 +32,7 @@ static void
 test_load(struct rnsf* rnsf)
 {
   struct rnsf_phase_fn_discrete discrete = RNSF_PHASE_FN_DISCRETE_NULL;
-  struct rnsf_phase_fn_hg HG = RNSF_PHASE_FN_HG_NULL;
+  struct rnsf_phase_fn_hg hg = RNSF_PHASE_FN_HG_NULL;
   const struct rnsf_phase_fn* phase = NULL;
   FILE* fp = NULL;
 
@@ -56,10 +56,10 @@ test_load(struct rnsf* rnsf)
   CHK(phase = rnsf_get_phase_fn(rnsf, 0));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
 
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 200.1);
-  CHK(HG.wavelengths[1] == 200.1);
-  CHK(HG.g == 0);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 200.1);
+  CHK(hg.wavelengths[1] == 200.1);
+  CHK(hg.g == 0);
   CHK(fclose(fp) == 0);
 
   CHK(fp = tmpfile());
@@ -141,52 +141,52 @@ test_load(struct rnsf* rnsf)
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 3));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 1100);
-  CHK(HG.wavelengths[1] == 1100);
-  CHK(HG.g == -0.1);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 1100);
+  CHK(hg.wavelengths[1] == 1100);
+  CHK(hg.g == -0.1);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 4));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 1300);
-  CHK(HG.wavelengths[1] == 1300);
-  CHK(HG.g == 0.57);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 1300);
+  CHK(hg.wavelengths[1] == 1300);
+  CHK(hg.g == 0.57);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 5));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 1400);
-  CHK(HG.wavelengths[1] == 1400);
-  CHK(HG.g == 0.4);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 1400);
+  CHK(hg.wavelengths[1] == 1400);
+  CHK(hg.g == 0.4);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 6));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 2100);
-  CHK(HG.wavelengths[1] == 2100);
-  CHK(HG.g == 0.3);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 2100);
+  CHK(hg.wavelengths[1] == 2100);
+  CHK(hg.g == 0.3);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 7));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 2500);
-  CHK(HG.wavelengths[1] == 2500);
-  CHK(HG.g == -0.9);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 2500);
+  CHK(hg.wavelengths[1] == 2500);
+  CHK(hg.g == -0.9);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 8));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 2900);
-  CHK(HG.wavelengths[1] == 2900);
-  CHK(HG.g == -0.4);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 2900);
+  CHK(hg.wavelengths[1] == 2900);
+  CHK(hg.g == -0.4);
 
   CHK(phase = rnsf_get_phase_fn(rnsf, 9));
   CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG);
-  CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK);
-  CHK(HG.wavelengths[0] == 100000);
-  CHK(HG.wavelengths[1] == 100000);
-  CHK(HG.g == 0);
+  CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK);
+  CHK(hg.wavelengths[0] == 100000);
+  CHK(hg.wavelengths[1] == 100000);
+  CHK(hg.g == 0);
 
   CHK(fclose(fp) == 0);
 }