Rename C function 'siminf_run' to 'SimInf_run'

stewid · Mar 14, 2017 · 9ef4fab · 9ef4fab
1 parent 1e33a88
commit 9ef4fab
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src/SimInf.c b/src/SimInf.c
@@ -33,7 +33,7 @@
  * @param pts_fun Function pointer to callback after each time step
  *        e.g. update infectious pressure.
  */
-SEXP siminf_run(
+SEXP SimInf_run(
     SEXP model,
     SEXP threads,
     SEXP seed,

diff --git a/src/SimInf.h b/src/SimInf.h
@@ -61,7 +61,7 @@ typedef int (*PTSFun)(
 
 /* Forward declaration of the function to initiate and run the
  * simulation */
-SEXP siminf_run(
+SEXP SimInf_run(
     SEXP model,
     SEXP threads,
     SEXP seed,

diff --git a/src/models/SEIR.c b/src/models/SEIR.c
@@ -128,5 +128,5 @@ SEXP SEIR_run(SEXP model, SEXP threads, SEXP seed)
 {
     TRFun tr_fun[] = {&SEIR_S_to_E, &SEIR_E_to_I, &SEIR_I_to_R};
 
-    return siminf_run(model, threads, seed, tr_fun, &SEIR_post_time_step);
+    return SimInf_run(model, threads, seed, tr_fun, &SEIR_post_time_step);
 }
diff --git a/src/models/SIR.c b/src/models/SIR.c
@@ -108,5 +108,5 @@ SEXP SIR_run(SEXP model, SEXP threads, SEXP seed)
 {
     TRFun tr_fun[] = {&SIR_S_to_I, &SIR_I_to_R};
 
-    return siminf_run(model, threads, seed, tr_fun, &SIR_post_time_step);
+    return SimInf_run(model, threads, seed, tr_fun, &SIR_post_time_step);
 }
diff --git a/src/models/SISe.c b/src/models/SISe.c
@@ -1,8 +1,8 @@
 /*
  *  SimInf, a framework for stochastic disease spread simulations
  *  Copyright (C) 2015  Pavol Bauer
- *  Copyright (C) 2015 - 2016  Stefan Engblom
- *  Copyright (C) 2015 - 2016  Stefan Widgren
+ *  Copyright (C) 2015 - 2017  Stefan Engblom
+ *  Copyright (C) 2015 - 2017  Stefan Widgren
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -135,5 +135,5 @@ SEXP SISe_run(SEXP model, SEXP threads, SEXP seed)
 {
     TRFun tr_fun[] = {&SISe_S_to_I, &SISe_I_to_S};
 
-    return siminf_run(model, threads, seed, tr_fun, &SISe_post_time_step);
+    return SimInf_run(model, threads, seed, tr_fun, &SISe_post_time_step);
 }
diff --git a/src/models/SISe3.c b/src/models/SISe3.c
@@ -1,8 +1,8 @@
 /*
  *  SimInf, a framework for stochastic disease spread simulations
  *  Copyright (C) 2015  Pavol Bauer
- *  Copyright (C) 2015 - 2016  Stefan Engblom
- *  Copyright (C) 2015 - 2016  Stefan Widgren
+ *  Copyright (C) 2015 - 2017  Stefan Engblom
+ *  Copyright (C) 2015 - 2017  Stefan Widgren
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -218,5 +218,5 @@ SEXP SISe3_run(SEXP model, SEXP threads, SEXP seed)
                       &SISe3_S_2_to_I_2, &SISe3_I_2_to_S_2,
                       &SISe3_S_3_to_I_3, &SISe3_I_3_to_S_3};
 
-    return siminf_run(model, threads, seed, tr_fun, &SISe3_post_time_step);
+    return SimInf_run(model, threads, seed, tr_fun, &SISe3_post_time_step);
 }
diff --git a/src/models/SISe3_sp.c b/src/models/SISe3_sp.c
@@ -1,7 +1,7 @@
 /*
  *  SimInf, a framework for stochastic disease spread simulations
- *  Copyright (C) 2015 - 2016  Stefan Engblom
- *  Copyright (C) 2015 - 2016  Stefan Widgren
+ *  Copyright (C) 2015 - 2017  Stefan Engblom
+ *  Copyright (C) 2015 - 2017  Stefan Widgren
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -233,5 +233,5 @@ SEXP SISe3_sp_run(SEXP model, SEXP threads, SEXP seed)
                       &SISe3_sp_S_2_to_I_2, &SISe3_sp_I_2_to_S_2,
                       &SISe3_sp_S_3_to_I_3, &SISe3_sp_I_3_to_S_3};
 
-    return siminf_run(model, threads, seed, tr_fun, &SISe3_sp_post_time_step);
+    return SimInf_run(model, threads, seed, tr_fun, &SISe3_sp_post_time_step);
 }
diff --git a/src/models/SISe_sp.c b/src/models/SISe_sp.c
@@ -151,5 +151,5 @@ SEXP SISe_sp_run(SEXP model, SEXP threads, SEXP seed)
 {
     TRFun tr_fun[] = {&SISe_sp_S_to_I, &SISe_sp_I_to_S};
 
-    return siminf_run(model, threads, seed, tr_fun, &SISe_sp_post_time_step);
+    return SimInf_run(model, threads, seed, tr_fun, &SISe_sp_post_time_step);
 }