solstice-solver

commit ef9d4adf7196023d9e9f3a6a56704bce625f5f4a
parent 6c2067546da15ea254b71dd5df82e4b976c53a89
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue, 14 Mar 2017 11:16:08 +0100

API rename.

Diffstat:
M
src/ssol.h
 | 
2
+-
M
src/ssol_estimator.c
 | 
2
+-
M
src/test_ssol_solver1.c
 | 
18
+++++++++---------
M
src/test_ssol_solver2.c
 | 
2
+-
M
src/test_ssol_solver2b.c
 | 
2
+-
M
src/test_ssol_solver3.c
 | 
2
+-
M
src/test_ssol_solver4.c
 | 
2
+-
M
src/test_ssol_solver5.c
 | 
2
+-

8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/ssol.h b/src/ssol.h
@@ -921,7 +921,7 @@ ssol_estimator_get_mc_sampled_x_receiver
    struct ssol_mc_receiver* rcv);
 
 SSOL_API res_T
-ssol_estimator_get_count
+ssol_estimator_get_realisation_count
   (const struct ssol_estimator* estimator,
    size_t* count);
 
diff --git a/src/ssol_estimator.c b/src/ssol_estimator.c
@@ -175,7 +175,7 @@ ssol_estimator_get_mc_sampled_x_receiver
 }
 
 res_T
-ssol_estimator_get_count
+ssol_estimator_get_realisation_count
   (const struct ssol_estimator* estimator, size_t* count)
 {
   if (!estimator || !count) return RES_BAD_ARG;
diff --git a/src/test_ssol_solver1.c b/src/test_ssol_solver1.c
@@ -167,10 +167,10 @@ main(int argc, char** argv)
   CHECK(ssol_estimator_get_sampled_area(estimator, &dbl), RES_OK);
   CHECK(eq_eps(dbl, 12, 1.e-6), 1);
 
-  CHECK(ssol_estimator_get_count(NULL, NULL), RES_BAD_ARG);
-  CHECK(ssol_estimator_get_count(estimator, NULL), RES_BAD_ARG);
-  CHECK(ssol_estimator_get_count(NULL, &count), RES_BAD_ARG);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(NULL, NULL), RES_BAD_ARG);
+  CHECK(ssol_estimator_get_realisation_count(estimator, NULL), RES_BAD_ARG);
+  CHECK(ssol_estimator_get_realisation_count(NULL, &count), RES_BAD_ARG);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, 1);
 
   CHECK(ssol_estimator_get_failed_count(NULL, NULL), RES_BAD_ARG);
@@ -264,7 +264,7 @@ main(int argc, char** argv)
 #define GET_MC_GLOBAL ssol_estimator_get_mc_global
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
   CHECK(ssol_instance_get_id(target, &r_id), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);
@@ -312,7 +312,7 @@ main(int argc, char** argv)
 
   NCHECK(tmp = tmpfile(), 0);
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);
@@ -345,7 +345,7 @@ main(int argc, char** argv)
 
   NCHECK(tmp = tmpfile(), 0);
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);
@@ -396,7 +396,7 @@ main(int argc, char** argv)
 
   NCHECK(tmp = tmpfile(), 0);
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &a_m, &a_std), RES_OK);
   CHECK(fclose(tmp), 0);
@@ -487,7 +487,7 @@ main(int argc, char** argv)
   CHECK(ssol_spectrum_setup(abs, get_wlen, 2, &desc), RES_OK);
   NCHECK(tmp = tmpfile(), 0);
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);
diff --git a/src/test_ssol_solver2.c b/src/test_ssol_solver2.c
@@ -182,7 +182,7 @@ main(int argc, char** argv)
 #define GET_MC_RCV ssol_estimator_get_mc_receiver
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
   CHECK(ssol_instance_get_id(target, &r_id), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);
diff --git a/src/test_ssol_solver2b.c b/src/test_ssol_solver2b.c
@@ -185,7 +185,7 @@ main(int argc, char** argv)
 #define N__ 50000
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
   CHECK(ssol_instance_get_id(target, &r_id), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);
diff --git a/src/test_ssol_solver3.c b/src/test_ssol_solver3.c
@@ -139,7 +139,7 @@ main(int argc, char** argv)
 #define N__ 20000
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
   CHECK(ssol_instance_get_id(target, &r_id), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);
diff --git a/src/test_ssol_solver4.c b/src/test_ssol_solver4.c
@@ -149,7 +149,7 @@ main(int argc, char** argv)
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
   CHECK(ssol_instance_get_id(target1, &r_id1), RES_OK);
   CHECK(ssol_instance_get_id(target2, &r_id2), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id1, count, &m1, &std1), RES_OK);
   CHECK(pp_sum(tmp, (int32_t)r_id2, count, &m2, &std2), RES_OK);
diff --git a/src/test_ssol_solver5.c b/src/test_ssol_solver5.c
@@ -140,7 +140,7 @@ main(int argc, char** argv)
 #define N__ 10000
   CHECK(ssol_solve(scene, rng, N__, tmp, &estimator), RES_OK);
   CHECK(ssol_instance_get_id(target, &r_id), RES_OK);
-  CHECK(ssol_estimator_get_count(estimator, &count), RES_OK);
+  CHECK(ssol_estimator_get_realisation_count(estimator, &count), RES_OK);
   CHECK(count, N__);
   CHECK(pp_sum(tmp, (int32_t)r_id, count, &m, &std), RES_OK);
   CHECK(fclose(tmp), 0);