sizeof()/sizeof() -> LEN()

1 files changed, 16 insertions, 16 deletions

diff --git a/src/test.c b/src/test.c
index 8bd0688..633897d 100644
--- a/src/test.c
+++ b/src/test.c
@@ -324,7 +324,7 @@ int test_refractive_index(char *err)
     double n;
     struct refractive_index_results result;
 
-    for (i = 0; i < sizeof(refractive_index_results)/sizeof(struct refractive_index_results); i++) {
+    for (i = 0; i < LEN(refractive_index_results); i++) {
         result = refractive_index_results[i];
         n = get_index(result.p, result.wavelength, result.T);
 
@@ -354,7 +354,7 @@ int test_solid_angle_approx(char *err)
         return 1;
     }
 
-    for (i = 0; i < sizeof(solid_angle_results)/sizeof(struct solid_angle_results); i++) {
+    for (i = 0; i < LEN(solid_angle_results); i++) {
         pos[0] = solid_angle_results[i].r0*r;
         pos[2] = solid_angle_results[i].L*r;
 
@@ -386,7 +386,7 @@ int test_solid_angle(char *err)
         return 1;
     }
 
-    for (i = 0; i < sizeof(solid_angle_results)/sizeof(struct solid_angle_results); i++) {
+    for (i = 0; i < LEN(solid_angle_results); i++) {
         pos[0] = solid_angle_results[i].r0*r;
         pos[2] = solid_angle_results[i].L*r;
 
@@ -451,10 +451,10 @@ int test_logsumexp(char *err)
     for (i = 0; i < 100; i++) {
         mu = genrand_real2();
 
-        for (j = 0; j < sizeof(logp)/sizeof(double); j++) {
+        for (j = 0; j < LEN(logp); j++) {
             logp[j] = -mu + j*log(mu) - gsl_sf_lnfact(j);
         }
-        result = logsumexp(logp, sizeof(logp)/sizeof(double));
+        result = logsumexp(logp, LEN(logp));
 
         expected = 0.0;
 
@@ -557,7 +557,7 @@ int test_interp1d(char *err)
 
     init_genrand(0);
 
-    for (i = 0; i < sizeof(xp)/sizeof(xp[0]); i++) {
+    for (i = 0; i < LEN(xp); i++) {
         xp[i] = range*i/(100-1);
         yp[i] = genrand_real2();
     }
@@ -597,12 +597,12 @@ int test_kahan_sum(char *err)
     init_genrand(0);
 
     expected = 0.0;
-    for (i = 0; i < sizeof(x)/sizeof(x[0]); i++) {
+    for (i = 0; i < LEN(x); i++) {
         x[i] = genrand_real2();
         expected += x[i];
     }
 
-    sum = kahan_sum(x,sizeof(x)/sizeof(x[0]));
+    sum = kahan_sum(x,LEN(x));
 
     if (!isclose(sum, expected, 1e-9, 1e-9)) {
         sprintf(err, "kahan_sum returned %.5g, but expected %.5g", sum, expected);
@@ -804,12 +804,12 @@ int test_mean(char *err)
     init_genrand(0);
 
     for (i = 0; i < 100; i++) {
-        for (j = 0; j < sizeof(x)/sizeof(x[0]); j++) {
+        for (j = 0; j < LEN(x); j++) {
             x[j] = genrand_real2();
         }
 
-        mu = mean(x,sizeof(x)/sizeof(x[0]));
-        expected = gsl_stats_mean(x,1,sizeof(x)/sizeof(x[0]));
+        mu = mean(x,LEN(x));
+        expected = gsl_stats_mean(x,1,LEN(x));
 
         if (!isclose(mu, expected, 0, 1e-9)) {
             sprintf(err, "mean() returned %.5g, but expected %.5g", mu, expected);
@@ -833,13 +833,13 @@ int test_std(char *err)
     init_genrand(0);
 
     for (i = 0; i < 100; i++) {
-        for (j = 0; j < sizeof(x)/sizeof(x[0]); j++) {
+        for (j = 0; j < LEN(x); j++) {
             x[j] = genrand_real2();
         }
 
-        sigma = std(x,sizeof(x)/sizeof(x[0]));
-        mu = gsl_stats_mean(x,1,sizeof(x)/sizeof(x[0]));
-        expected = gsl_stats_sd_with_fixed_mean(x,1,sizeof(x)/sizeof(x[0]),mu);
+        sigma = std(x,LEN(x));
+        mu = gsl_stats_mean(x,1,LEN(x));
+        expected = gsl_stats_sd_with_fixed_mean(x,1,LEN(x),mu);
 
         if (!isclose(sigma, expected, 0, 1e-9)) {
             sprintf(err, "std() returned %.5g, but expected %.5g", sigma, expected);
@@ -1405,7 +1405,7 @@ int main(int argc, char **argv)
     int retval = 0;
     struct tests test;
 
-    for (i = 0; i < sizeof(tests)/sizeof(struct tests); i++) {
+    for (i = 0; i < LEN(tests); i++) {
         test = tests[i];
 
         if (!test.test(err)) {