From 9c6505dace488032dc4f5e3bbb8c5a4cb154b429 Mon Sep 17 00:00:00 2001 From: pants Date: Thu, 8 Sep 2016 12:46:49 -0400 Subject: more refactoring --- src/fracture.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/fracture.h') diff --git a/src/fracture.h b/src/fracture.h index 19b1e71..2401d25 100644 --- a/src/fracture.h +++ b/src/fracture.h @@ -148,8 +148,6 @@ graph_t *ini_voro_graph(unsigned int L, bound_t boundary, bool use_dual, double *(*genfunc)(unsigned int, bound_t, gsl_rng *, unsigned int *), cholmod_common *c); -bool check_instance(const net_t *instance, cholmod_common *c); - bool break_edge(net_t *instance, unsigned int edge, cholmod_common *c); void finish_instance(net_t *instance, cholmod_common *c); @@ -164,11 +162,7 @@ double *genfunc_uniform(unsigned int L, bound_t boundary, gsl_rng *r, unsigned i double *genfunc_hyperuniform(unsigned int L, bound_t boundary, gsl_rng *r, unsigned int *num); void randfunc_flat(gsl_rng *r, double *x, double *y); void randfunc_gaus(gsl_rng *r, double *x, double *y); -double beta_scaling_flat(double beta, double x, double y); -double beta_scaling_gaus(double beta, double x, double y); -double beta_mag(double beta); -unsigned int *dijkstra(const graph_t *network, unsigned int source); unsigned int **get_dists(const graph_t *network); double *get_corr(net_t *instance, unsigned int **dists, cholmod_common *c); @@ -176,9 +170,9 @@ double *bin_values(graph_t *network, unsigned int width, double *values); cholmod_dense *bound_set(const graph_t *g, bool vb, double notch_len, cholmod_common *c); -data_t *alloc_break_data(unsigned int num_edges); -void free_break_data(data_t *data); -void update_break_data(data_t *data, unsigned int last_broke, double strength, double conductivity); +data_t *data_create(uint_t num_edges); +void data_free(data_t *data); +void data_update(data_t *data, uint_t last_broke, double strength, double conductivity); double get_conductivity(net_t *inst, double *current, cholmod_common *c); -- cgit v1.2.3-70-g09d2