From 7522b886602380764ce76f1d2244fad11bd1054f Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Fri, 08 Mar 2019 19:56:03 +0000 Subject: [PATCH] Full write of constant volume plugin --- src/general.h | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/general.h b/src/general.h index db3182e..90cf29c 100644 --- a/src/general.h +++ b/src/general.h @@ -309,12 +309,13 @@ void (*at_start)(int argc, char **argv); void *(*after_vesicle_init)(void *vesicle); ts_bool (*vm_hard_constraint)(void *vesicle, ts_vertex *vtx, ts_vertex *odl_vtx); - ts_double (*vm_energy_before_prepare)(void *vesicle, ts_vertex *vtx); + void (*vm_energy_before_prepare)(void *vesicle, ts_vertex *vtx); ts_double (*vm_energy_before_execute)(void *vesicle, ts_vertex *vtx); ts_double (*vm_energy_after_prepare)(void *vesicle, ts_vertex *vtx); ts_double (*vm_energy_after_execute)(void *vesicle, ts_vertex *vtx); - ts_double (*vm_new_state_accepted)(void *vesicle, ts_vertex *vtx); - ts_double (*vm_new_state_rejected)(void *vesicle, ts_vertex *vtx); + ts_double (*vm_before_montecarlo_constraint)(void *vesicle, ts_vertex *vtx, ts_vertex *old_vtx); + ts_double (*vm_new_state_accepted)(void *vesicle, ts_vertex *vtx, ts_vertex *old_vtx); + ts_double (*vm_new_state_rejected)(void *vesicle, ts_vertex *vtx, ts_vertex *old_vtx); void (*cleanup)(void); } ts_plugin_function; @@ -322,6 +323,7 @@ ts_char *name; ts_char *description; ts_char *author; + void *data; } ts_plugin_details; typedef struct { @@ -340,6 +342,12 @@ typedef struct { ts_plugin_chain *at_start; ts_plugin_chain *after_vesicle_init; + ts_plugin_chain *vm_hard_constraint; + ts_plugin_chain *vm_energy_before_prepare; + ts_plugin_chain *vm_energy_after_execute; + ts_plugin_chain *vm_before_montecarlo_constraint; + ts_plugin_chain *vm_new_state_accepted; + ts_plugin_chain *vm_new_state_rejected; ts_plugin_chain *cleanup; } ts_plugin_chains; @@ -348,6 +356,7 @@ ts_uint n; ts_plugin **plugin; ts_plugin_chains *chain; + ts_plugin_chain *pointer; } ts_plugin_list; /* end plugins */ -- Gitblit v1.9.3