commit d3446f0b24bb5d230bf357b08dc38c3cee5a266f
parent 5a4725ec67bcfae858b47184399d9fc8abc58051
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 6 Dec 2016 16:36:39 +0100
Fix API coding style
Diffstat:
11 files changed, 71 insertions(+), 73 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -24,7 +24,7 @@ option(NO_TEST "Do not build tests" OFF)
# Check dependencies
################################################################################
find_package(RCMake 0.2.3 REQUIRED)
-find_package(RSys 0.3 REQUIRED)
+find_package(RSys 0.4 REQUIRED)
find_package(Star3D 0.4 REQUIRED)
find_package(StarCPR REQUIRED)
find_package(StarSF 0.0 REQUIRED)
diff --git a/src/ssol.h b/src/ssol.h
@@ -239,10 +239,10 @@ struct ssol_estimator_status {
};
/* the always-ON indicators (MC computations) */
-enum status_type {
- STATUS_SHADOW,
- STATUS_MISSING,
- STATUS_TYPES_COUNT__
+enum ssol_status_type {
+ SSOL_STATUS_SHADOW,
+ SSOL_STATUS_MISSING,
+ SSOL_STATUS_TYPES_COUNT__
};
/*
@@ -670,8 +670,8 @@ ssol_estimator_create
SSOL_API res_T
ssol_estimator_get_status
(const struct ssol_estimator* estimator,
- enum status_type type,
- struct ssol_estimator_status* status);
+ const enum ssol_status_type type,
+ struct ssol_estimator_status* status);
SSOL_API res_T
ssol_estimator_get_count
diff --git a/src/ssol_estimator.c b/src/ssol_estimator.c
@@ -97,20 +97,16 @@ ssol_estimator_ref_put
res_T
ssol_estimator_get_status
(const struct ssol_estimator* estimator,
- enum status_type type,
+ const enum ssol_status_type type,
struct ssol_estimator_status* status)
{
const struct mc_data* data;
- if (!estimator || type >= STATUS_TYPES_COUNT__ || !status)
+ if (!estimator || type >= SSOL_STATUS_TYPES_COUNT__ || !status)
return RES_BAD_ARG;
switch (type) {
- case STATUS_SHADOW:
- data = &estimator->shadow;
- break;
- case STATUS_MISSING:
- data = &estimator->missing;
- break;
+ case SSOL_STATUS_SHADOW: data = &estimator->shadow; break;
+ case SSOL_STATUS_MISSING: data = &estimator->missing; break;
default: FATAL("Unreachable code.\n"); break;
}
status->N = estimator->realisation_count;
diff --git a/src/test_ssol_estimator.c b/src/test_ssol_estimator.c
@@ -64,10 +64,12 @@ main(int argc, char** argv)
CHECK(ssol_estimator_ref_put(NULL), RES_BAD_ARG);
CHECK(ssol_estimator_ref_put(estimator), RES_OK);
- CHECK(ssol_estimator_get_status(NULL, STATUS_MISSING, &status), RES_BAD_ARG);
- CHECK(ssol_estimator_get_status(estimator, STATUS_TYPES_COUNT__, &status), RES_BAD_ARG);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, NULL), RES_BAD_ARG);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ #define GET_STATUS ssol_estimator_get_status
+ CHECK(GET_STATUS(NULL, SSOL_STATUS_MISSING, &status), RES_BAD_ARG);
+ CHECK(GET_STATUS(estimator, SSOL_STATUS_TYPES_COUNT__, &status), RES_BAD_ARG);
+ CHECK(GET_STATUS(estimator, SSOL_STATUS_MISSING, NULL), RES_BAD_ARG);
+ CHECK(GET_STATUS(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
+ #undef GET_STATUS
CHECK(ssol_estimator_get_count(NULL, &count), RES_BAD_ARG);
CHECK(ssol_estimator_get_count(estimator, NULL), RES_BAD_ARG);
@@ -79,8 +81,6 @@ main(int argc, char** argv)
CHECK(ssol_estimator_ref_put(estimator), RES_OK);
- /* free data */
-
CHECK(ssol_device_ref_put(dev), RES_OK);
CHECK(ssp_rng_ref_put(rng), RES_OK);
diff --git a/src/test_ssol_solver1.c b/src/test_ssol_solver1.c
@@ -108,9 +108,11 @@ main(int argc, char** argv)
CHECK(ssol_solve(scene, rng, 0, stdout, estimator), RES_BAD_ARG);
CHECK(ssol_solve(scene, rng, 10, NULL, estimator), RES_BAD_ARG);
CHECK(ssol_solve(scene, rng, 10, stdout, NULL), RES_BAD_ARG);
- CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG); /* no geometry */
- /* create scene content */
+ /* No geometry */
+ CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG);
+
+ /* Create scene content */
CHECK(ssol_shape_create_mesh(dev, &square), RES_OK);
attribs[0].usage = SSOL_POSITION;
@@ -143,54 +145,61 @@ main(int argc, char** argv)
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target), RES_OK);
- CHECK(ssol_solve(scene, rng, 1, stdout, estimator), RES_OK); /* ready to solve! */
+ CHECK(ssol_solve(scene, rng, 1, stdout, estimator), RES_OK);
+ /* No geometry to sample */
CHECK(ssol_instance_sample(target, 0), RES_OK);
CHECK(ssol_instance_sample(secondary, 0), RES_OK);
CHECK(ssol_instance_sample(heliostat, 0), RES_OK);
- CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG); /* no geometry to sample */
+ CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG);
+
CHECK(ssol_instance_sample(target, 1), RES_OK);
CHECK(ssol_instance_sample(secondary, 1), RES_OK);
CHECK(ssol_instance_sample(heliostat, 1), RES_OK);
+ /* No attached sun */
CHECK(ssol_scene_detach_sun(scene, sun), RES_OK);
- CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG); /* no attached sun */
+ CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG);
CHECK(ssol_sun_ref_put(sun), RES_OK);
+ /* Sun with no spectrum */
CHECK(ssol_sun_create_directional(dev, &sun), RES_OK);
CHECK(ssol_sun_set_direction(sun, d3(dir, 1, 0, -1)), RES_OK);
CHECK(ssol_sun_set_dni(sun, 1000), RES_OK);
CHECK(ssol_scene_attach_sun(scene, sun), RES_OK);
- CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG); /* sun with no spectrum */
+ CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG);
CHECK(ssol_scene_detach_sun(scene, sun), RES_OK);
CHECK(ssol_sun_ref_put(sun), RES_OK);
+ /* Sun with undefined DNI */
CHECK(ssol_sun_create_directional(dev, &sun), RES_OK);
CHECK(ssol_sun_set_direction(sun, d3(dir, 1, 0, -1)), RES_OK);
CHECK(ssol_sun_set_spectrum(sun, spectrum), RES_OK);
CHECK(ssol_scene_attach_sun(scene, sun), RES_OK);
- CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG); /* sun with undefined DNI */
+ CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG);
CHECK(ssol_sun_set_dni(sun, 1000), RES_OK);
+ /* No receiver in scene */
CHECK(ssol_instance_set_receiver(heliostat, 0), RES_OK);
CHECK(ssol_instance_set_receiver(secondary, 0), RES_OK);
CHECK(ssol_instance_set_receiver(target, 0), RES_OK);
- CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_OK); /* no receiver in scene */
+ CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_OK);
CHECK(ssol_instance_set_receiver(heliostat, SSOL_FRONT), RES_OK);
CHECK(ssol_instance_set_receiver(secondary, SSOL_FRONT), RES_OK);
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
+ /* Spectra mismatch */
CHECK(ssol_spectrum_create(dev, &abs), RES_OK);
CHECK(ssol_spectrum_setup(abs, mismatch, ka, 2), RES_OK);
CHECK(ssol_atmosphere_create_uniform(dev, &atm), RES_OK);
CHECK(ssol_atmosphere_set_uniform_absorption(atm, abs), RES_OK);
CHECK(ssol_scene_attach_atmosphere(scene, atm), RES_OK);
- CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG); /* spectra mismatch */
+ CHECK(ssol_solve(scene, rng, 10, stdout, estimator), RES_BAD_ARG);
CHECK(ssol_scene_detach_atmosphere(scene, atm), RES_OK);
CHECK(ssol_spectrum_ref_put(abs), RES_OK);
CHECK(ssol_atmosphere_ref_put(atm), RES_OK);
- /* can sample any geometry; variance is high */
+ /* Can sample any geometry; variance is high */
NCHECK(tmp = tmpfile(), 0);
#define N__ 10000
CHECK(ssol_estimator_clear(estimator), RES_OK);
@@ -209,19 +218,19 @@ main(int argc, char** argv)
#define SQR(x) ((x)*(x))
dbl = sqrt((SQR(12 * DNI_cos) / 3 - SQR(4 * DNI_cos)) / (double)count);
CHECK(eq_eps(std, dbl, dbl*1e-2), 1);
- /* target was sampled but shadowed by secondary */
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ /* Target was sampled but shadowed by secondary */
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, m, 2 * dbl), 1);
CHECK(status.N, count);
CHECK(status.Nf, fcount);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, m, 2*status.SE), 1);
CHECK(status.N, count);
CHECK(status.Nf, fcount);
- /* sample primary mirror only; variance is low */
+ /* Sample primary mirror only; variance is low */
CHECK(ssol_instance_sample(target, 0), RES_OK);
CHECK(ssol_instance_sample(secondary, 0), RES_OK);
@@ -235,14 +244,14 @@ main(int argc, char** argv)
logger_print(&logger, LOG_OUTPUT, "\nP = %g +/- %g", m, std);
CHECK(eq_eps(m, 4 * DNI_cos, MMAX(4 * DNI_cos * 1e-2, std)), 1);
CHECK(eq_eps(std, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- /* check atmosphere model; with no absorption result is unchanged */
+ /* Check atmosphere model; with no absorption result is unchanged */
CHECK(ssol_spectrum_create(dev, &abs), RES_OK);
CHECK(ssol_spectrum_setup(abs, wavelengths, ka, 3), RES_OK);
CHECK(ssol_atmosphere_create_uniform(dev, &atm), RES_OK);
@@ -262,14 +271,14 @@ main(int argc, char** argv)
CHECK(ssol_scene_detach_atmosphere(scene, atm), RES_OK);
CHECK(ssol_spectrum_ref_put(abs), RES_OK);
CHECK(ssol_atmosphere_ref_put(atm), RES_OK);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- /* check atmosphere model; with absorption power decreases */
+ /* Check atmosphere model; with absorption power decreases */
ka[0] = ka[1] = ka[2] = 0.1;
CHECK(ssol_spectrum_create(dev, &abs), RES_OK);
CHECK(ssol_spectrum_setup(abs, wavelengths, ka, 3), RES_OK);
@@ -288,14 +297,14 @@ main(int argc, char** argv)
#define K (exp(-0.1 * 4 * sqrt(2)))
CHECK(eq_eps(m, 4 * K * DNI_cos, MMAX(4 * K * DNI_cos * 1e-1, std)), 1);
CHECK(eq_eps(std, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- /* check a monochromatic sun */
+ /* Check a monochromatic sun */
CHECK(ssol_spectrum_setup(spectrum, &mono, intensities, 1), RES_OK);
CHECK(ssol_sun_create_directional(dev, &sun_mono), RES_OK);
CHECK(ssol_sun_set_direction(sun_mono, d3(dir, 1, 0, -1)), RES_OK);
@@ -316,15 +325,14 @@ main(int argc, char** argv)
#define K2 (exp(-0.121 * 4 * sqrt(2)))
CHECK(eq_eps(m, 4 * K2 * DNI_cos, MMAX(4 * K2 * DNI_cos * 1e-4, std)), 1);
CHECK(eq_eps(std, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- /* free data */
-
+ /* Free data */
CHECK(ssol_instance_ref_put(heliostat), RES_OK);
CHECK(ssol_instance_ref_put(secondary), RES_OK);
CHECK(ssol_instance_ref_put(target), RES_OK);
diff --git a/src/test_ssol_solver2.c b/src/test_ssol_solver2.c
@@ -191,15 +191,14 @@ main(int argc, char** argv)
CHECK(eq_eps(m, 4 * DNI_cos, 4 * DNI_cos * 1e-4), 1);
#define SQR(x) ((x)*(x))
CHECK(eq_eps(std, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- /* free data */
-
+ /* Free data */
CHECK(ssol_instance_ref_put(heliostat1), RES_OK);
CHECK(ssol_instance_ref_put(heliostat2), RES_OK);
CHECK(ssol_instance_ref_put(secondary), RES_OK);
diff --git a/src/test_ssol_solver2b.c b/src/test_ssol_solver2b.c
@@ -197,16 +197,15 @@ main(int argc, char** argv)
#define SQR(x) ((x)*(x))
CHECK(eq_eps(std,
sqrt((SQR(4 * DNI_cos) / 2 - SQR(2 * DNI_cos)) / (double)count), 1e-3), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
CHECK(status.Nf, 0);
- /* free data */
-
+ /* Free data */
CHECK(ssol_instance_ref_put(heliostat1), RES_OK);
CHECK(ssol_instance_ref_put(heliostat2), RES_OK);
CHECK(ssol_instance_ref_put(secondary), RES_OK);
diff --git a/src/test_ssol_solver3.c b/src/test_ssol_solver3.c
@@ -97,7 +97,7 @@ main(int argc, char** argv)
CHECK(ssol_scene_attach_sun(scene, sun), RES_OK);
CHECK(ssol_estimator_create(dev, &estimator), RES_OK);
- /* create scene content */
+ /* Create scene content */
CHECK(ssol_shape_create_mesh(dev, &square), RES_OK);
attribs[0].usage = SSOL_POSITION;
@@ -151,16 +151,15 @@ main(int argc, char** argv)
#define SQR(x) ((x)*(x))
CHECK(eq_eps(std,
sqrt((SQR(400*DNI_cos) / 100 - SQR(4*DNI_cos)) / (double)count), 20), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
CHECK(status.Nf, 0);
- /* free data */
-
+ /* Free data */
CHECK(ssol_instance_ref_put(heliostat), RES_OK);
CHECK(ssol_instance_ref_put(target), RES_OK);
CHECK(ssol_object_ref_put(m_object), RES_OK);
diff --git a/src/test_ssol_solver3N.c b/src/test_ssol_solver3N.c
@@ -212,16 +212,15 @@ main(int argc, char** argv)
logger_print(&logger, LOG_OUTPUT, "\nP = %g +/- %g\n", m, std);
#define DNI_cos (1000 * cos(PI / 8))
CHECK(eq_eps(m, 4 * NX * NY * NZ * DNI_cos, 4 * NX * NY * NZ * DNI_cos * 2e-1), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
CHECK(status.Nf, 0);
- /* free data */
-
+ /* Free data */
CHECK(ssol_instance_ref_put(target), RES_OK);
CHECK(ssol_object_ref_put(m_object), RES_OK);
CHECK(ssol_object_ref_put(t_object), RES_OK);
diff --git a/src/test_ssol_solver4.c b/src/test_ssol_solver4.c
@@ -160,16 +160,15 @@ main(int argc, char** argv)
CHECK(eq_eps(std1, 0, 1), 1);
CHECK(m1, m2);
CHECK(std1, std2);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
CHECK(status.Nf, 0);
- /* free data */
-
+ /* Free data */
CHECK(ssol_instance_ref_put(heliostat), RES_OK);
CHECK(ssol_instance_ref_put(target1), RES_OK);
CHECK(ssol_instance_ref_put(target2), RES_OK);
diff --git a/src/test_ssol_solver5.c b/src/test_ssol_solver5.c
@@ -149,16 +149,15 @@ main(int argc, char** argv)
#define DNI_cos (1000 * cos(0))
CHECK(eq_eps(m, 400 * DNI_cos, 20), 1);
CHECK(eq_eps(std, 0, 1), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_SHADOW, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_SHADOW, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Shadows = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
- CHECK(ssol_estimator_get_status(estimator, STATUS_MISSING, &status), RES_OK);
+ CHECK(ssol_estimator_get_status(estimator, SSOL_STATUS_MISSING, &status), RES_OK);
logger_print(&logger, LOG_OUTPUT, "Missing = %g +/- %g", status.E, status.SE);
CHECK(eq_eps(status.E, 0, 1e-4), 1);
CHECK(status.Nf, 0);
- /* free data */
-
+ /* Free data */
CHECK(ssol_instance_ref_put(heliostat), RES_OK);
CHECK(ssol_instance_ref_put(target), RES_OK);
CHECK(ssol_object_ref_put(m_object), RES_OK);
