From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 src/cell.h |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/cell.h b/src/cell.h
index eb04a61..20a58e4 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -1,6 +1,11 @@
 #ifndef _H_CELL
 #define _H_CELL
+ts_cell_list  *init_cell_list(ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize);
+ts_bool cell_free(ts_cell* cell);
+ts_bool cell_list_free(ts_cell_list *clist);
 inline ts_uint vertex_self_avoidance(ts_vesicle *vesicle, ts_vertex *vtx);
-ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist,
-ts_uint cellidx, ts_vertex *vtx, ts_vertex *tvtx);
+inline ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx);
+inline ts_bool cell_remove_vertex(ts_cell *cell, ts_vertex *vtx);
+ts_bool cell_list_cell_occupation_clear(ts_cell_list *clist);
+inline ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist, ts_uint cellidx, ts_vertex *vtx);
 #endif

--
Gitblit v1.9.3