Added FSTI_HOOK_AGENT_INIT hook.

nathangeffen · Sep 18, 2019 · 7d91221 · 7d91221
1 parent 8d63136
commit 7d91221
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/fsti-defaults.h b/src/fsti-defaults.h
@@ -284,7 +284,7 @@ unsigned total_partners;
         fsti_generate_infected(simulation, agent);                      \
         fsti_generate_treated(simulation, agent);                       \
         fsti_generate_resistant(simulation, agent);                     \
-        FSTI_HOOK_GENERATE_AGENT(simulation, agent)                     \
+        FSTI_HOOK_AGENT_GENERATE(simulation, agent)                     \
     } while(0)
 #endif
 
@@ -410,15 +410,15 @@ unsigned total_partners;
 /*
   Hook after an agent is created, but before being put in the agent array.
 */
-#ifndef FSTI_HOOK_CREATE_AGENT
-#define FSTI_HOOK_CREATE_AGENT(simulation, agent)
+#ifndef FSTI_HOOK_AGENT_INIT
+#define FSTI_HOOK_AGENT_INIT(simulation, agent)
 #endif
 
 /*
   Hook after when an agent is generated at beginning of simulation.
 */
-#ifndef FSTI_HOOK_GENERATE_AGENT
-#define FSTI_HOOK_GENERATE_AGENT(simulation, agent)
+#ifndef FSTI_HOOK_AGENT_GENERATE
+#define FSTI_HOOK_AGENT_GENERATE(simulation, agent)
 #endif
 
 

diff --git a/src/fsti-events.c b/src/fsti-events.c
@@ -167,6 +167,7 @@ make_agent(struct fsti_simulation *simulation,
 #endif
         simulation->csv_agent.iter_death = FSTI_MAX_ITERATION;
         simulation->csv_agent.iter_cured = FSTI_MAX_ITERATION;
+        FSTI_HOOK_AGENT_INIT(simulation, (&simulation->csv_agent) );
         for (j = 0; j < cs->rows[i].len; ++j) {
             process_cell(simulation, &simulation->csv_agent,
                          cs->rows[i].cells[j],
@@ -438,6 +439,7 @@ fsti_event_generate_agents(struct fsti_simulation *simulation)
 #endif
         agent.iter_death = FSTI_MAX_ITERATION;
         agent.iter_cured = FSTI_MAX_ITERATION;
+        FSTI_HOOK_AGENT_INIT(simulation, (&agent));
         FSTI_AGENT_GENERATE(simulation, &agent);
         fsti_agent_arr_push(&simulation->agent_arr, &agent);
     }
@@ -525,6 +527,7 @@ fsti_event_birth(struct fsti_simulation *simulation)
 #endif
             agent.iter_death = FSTI_MAX_ITERATION;
             agent.iter_cured = FSTI_MAX_ITERATION;
+            FSTI_HOOK_AGENT_INIT(simulation, (&agent));
             FSTI_AGENT_BIRTH(simulation, &agent);
             fsti_agent_arr_push(&simulation->agent_arr, &agent);
             agent.id = simulation->agent_arr.len - 1;