star-mc

commit 81c4043c34487a5f8c1fa0faa304fff6b7496dce
parent 86820bac064a09b79faff66693163a579c645672
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 15 Jul 2015 14:06:45 +0200

Rename the smc_<type|integrator>_raw types in smc_<type|integrator>_accum

Diffstat:
M
src/smc.h
 | 
10
+++++-----
M
src/smc_accumulator.c
 | 
12
++++++------
M
src/smc_type_c.h
 | 
2
+-
M
src/test_smc_integrate.c
 | 
4
++--

4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/smc.h b/src/smc.h
@@ -76,7 +76,7 @@ struct smc_type {
 
 /* Type for raw integration, i.e. whithout estimator. Experiment results are
  * simply accumulated */
-struct smc_type_raw {
+struct smc_type_accum {
   void* (*create)(struct mem_allocator* allocator, void* ctx);
   void (*destroy)(struct mem_allocator*, void* accum);
   void (*clear)(void* accum);
@@ -107,13 +107,13 @@ struct smc_integrator {
 static const struct smc_integrator SMC_INTEGRATOR_NULL =
 { NULL, NULL, SIZE_MAX };
 
-struct smc_integrator_raw {
+struct smc_integrator_accum {
   void (*integrand)(void* accum, struct ssp_rng* rng, void* ctx);
-  const struct smc_type_raw* type;
+  const struct smc_type_accum* type;
   size_t max_steps; /* Maximum # of accumulation */
 };
 
-static const struct smc_integrator_raw SMC_INTEGRATOR_RAW_NULL =
+static const struct smc_integrator_accum SMC_INTEGRATOR_ACCUM_NULL =
 { NULL, NULL, SIZE_MAX };
 
 /* Forward declaration of opaque types */
@@ -187,7 +187,7 @@ smc_estimator_get_status
 SMC_API res_T
 smc_integrate
   (struct smc_device* dev,
-   struct smc_integrator_raw* integrator,
+   struct smc_integrator_accum* integrator,
    void* ctx,
    struct smc_accumulator** accumulator);
 
diff --git a/src/smc_accumulator.c b/src/smc_accumulator.c
@@ -38,7 +38,7 @@
 #include <omp.h>
 
 struct smc_accumulator {
-  struct smc_type_raw type;
+  struct smc_type_accum type;
   struct smc_accumulator_status status;
   struct smc_device* dev;
   ref_T ref;
@@ -50,7 +50,7 @@ struct smc_accumulator {
 static res_T
 accumulator_create
   (struct smc_device* dev,
-   const struct smc_type_raw* type,
+   const struct smc_type_accum* type,
    void* ctx,
    struct smc_accumulator** out_accum)
 {
@@ -89,13 +89,13 @@ error:
 }
 
 static char
-check_integrator_raw(struct smc_integrator_raw* integrator)
+check_integrator_accum(struct smc_integrator_accum* integrator)
 {
   ASSERT(integrator);
   return integrator->integrand
       && integrator->type
       && integrator->max_steps
-      && check_type_raw(integrator->type);
+      && check_type_accum(integrator->type);
 }
 
 static void
@@ -119,7 +119,7 @@ accumulator_release(ref_T* ref)
 res_T
 smc_integrate
   (struct smc_device* dev,
-   struct smc_integrator_raw* integrator,
+   struct smc_integrator_accum* integrator,
    void* ctx,
    struct smc_accumulator** out_accum)
 {
@@ -131,7 +131,7 @@ smc_integrate
   size_t* nsamples = NULL;
   res_T res = RES_OK;
 
-  if(!dev || !integrator || !out_accum || !check_integrator_raw(integrator)) {
+  if(!dev || !integrator || !out_accum || !check_integrator_accum(integrator)) {
     res = RES_BAD_ARG;
     goto error;
   }
diff --git a/src/smc_type_c.h b/src/smc_type_c.h
@@ -50,7 +50,7 @@ check_type(const struct smc_type* type)
 }
 
 static INLINE char
-check_type_raw(const struct smc_type_raw* type)
+check_type_accum(const struct smc_type_accum* type)
 {
   ASSERT(type);
   return type->create != NULL
diff --git a/src/test_smc_integrate.c b/src/test_smc_integrate.c
@@ -64,7 +64,7 @@ dbl2_add(void* result, const void* op0, const void* op1)
   }
 }
 
-static const struct smc_type_raw smc_accum_dbl2 = {
+static const struct smc_type_accum smc_accum_dbl2 = {
   dbl2_create,
   dbl2_destroy,
   dbl2_clear,
@@ -102,7 +102,7 @@ main(int argc, char** argv)
 {
   struct mem_allocator allocator;
   struct smc_device* dev;
-  struct smc_integrator_raw integrator = SMC_INTEGRATOR_RAW_NULL;
+  struct smc_integrator_accum integrator = SMC_INTEGRATOR_ACCUM_NULL;
   struct smc_accumulator* accum;
   struct smc_accumulator_status status;
   double* val;