From ea1cce4c80ddb68c0b46a6873ef3b64cc4a958a1 Mon Sep 17 00:00:00 2001 From: mihaf <miha.fosnaric@gmail.com> Date: Mon, 24 Mar 2014 16:37:44 +0000 Subject: [PATCH] Added dmin_interspecies. --- src/cell.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cell.c b/src/cell.c index 97f2fe7..f95ff21 100644 --- a/src/cell.c +++ b/src/cell.c @@ -44,7 +44,6 @@ } -//TODO: not debugged at all! inline ts_uint vertex_self_avoidance(ts_vesicle *vesicle, ts_vertex *vtx){ ts_uint cellidx; ts_uint ncx, ncy,ncz; @@ -68,7 +67,6 @@ } -//TODO: looks ok, but debug anyway in the future inline ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx){ ts_uint i; for(i=0;i<cell->nvertex;i++){ @@ -124,7 +122,7 @@ return TS_SUCCESS; } -// TODO: compiles ok, but it is completely untested and undebugged. It was debugged before rewrite, but this was long time ago. + ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist, ts_uint cellidx, ts_vertex *vtx){ ts_uint ncx,ncy,ncz,remainder,cell_occupation; ts_uint i,j,k,l,neigh_cidx; @@ -155,7 +153,7 @@ // fprintf(stderr,"calling dist on vertex %i\n",l); dist=vtx_distance_sq(clist->cell[neigh_cidx]->vertex[l],vtx); // fprintf(stderr,"dist was %f\n",dist); - if(dist<=1.0) return TS_FAIL; + if(dist<=1.0 || (dist<=clist->dmin_interspecies && (clist->cell[neigh_cidx]->vertex[l]->id != vtx->id))) return TS_FAIL; } } } -- Gitblit v1.9.3