From 0652ee2715994b48a9bbfd1132bf0b65ad206289 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Nov 2013 18:46:13 +0000
Subject: [PATCH] commiting all changes.
---
src/vertex.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/vertex.c b/src/vertex.c
index 694ee84..cd999df 100644
--- a/src/vertex.c
+++ b/src/vertex.c
@@ -23,7 +23,7 @@
for(i=0;i<N;i++) {
vlist->vtx[i]=(ts_vertex *)calloc(1,sizeof(ts_vertex));
vlist->vtx[i]->idx=i;
-
+ vlist->vtx[i]->locked=(ts_uint *)calloc(1,sizeof(ts_vertex));
/* initialize Ylm for spherical hamonics DONE in sh.c */
/* for(i=0;i<l;i++){
vlist->vtx[i]->Ylm[i]=(ts_double **)calloc(2*i+1,sizeof(ts_double *));
@@ -72,25 +72,25 @@
ts_bool vtx_remove_neighbour(ts_vertex *vtx, ts_vertex *nvtx){
/* find a neighbour */
/* remove it from the list while shifting remaining neighbours up */
- ts_int i,j=-1;
+ ts_uint i,j=0;
for(i=0;i<vtx->neigh_no;i++){
+// fprintf(stderr,"neigh_addr=%ld\n", (long)vtx->neigh[i]);
if(vtx->neigh[i]!=nvtx){
vtx->neigh[j]=vtx->neigh[i];
j++;
}
}
- if(j==0) {
- fatal("vtx_remove_neighbour: Error, vertices are not neighbours", 100);
- }
+// fprintf(stderr,"remove_neighbour: vtx1_addr=%ld, vtx2_addr=%ld\n",(long)vtx,(long)nvtx);
/* resize memory. potentionally time consuming */
vtx->neigh_no--;
vtx->neigh=(ts_vertex **)realloc(vtx->neigh,vtx->neigh_no*sizeof(ts_vertex *));
if(vtx->neigh == NULL && vtx->neigh_no!=0)
- fatal("Reallocation of memory failed during removal of vertex neighbour in vtx_remove_neighbour",100);
-fprintf(stderr,"first alloc");
+ fatal("(1) Reallocation of memory failed during removal of vertex neighbour in vtx_remove_neighbour",100);
+//fprintf(stderr,"first alloc");
/* repeat for the neighbour */
/* find a neighbour */
/* remove it from the list while shifting remaining neighbours up */
+ j=0;
for(i=0;i<nvtx->neigh_no;i++){
if(nvtx->neigh[i]!=vtx){
nvtx->neigh[j]=nvtx->neigh[i];
@@ -98,10 +98,12 @@
}
}
/* resize memory. potentionally time consuming. */
+// fprintf(stderr,"Neigbours=%d\n",nvtx->neigh_no);
nvtx->neigh_no--;
- nvtx->neigh=(ts_vertex **)realloc(nvtx->neigh,nvtx->neigh_no*sizeof(ts_vertex *));
+ nvtx->neigh=(ts_vertex **)realloc(nvtx->neigh,nvtx->neigh_no*sizeof(ts_vertex *));
+// fprintf(stderr,"Neigbours=%d\n",nvtx->neigh_no);
if(nvtx->neigh == NULL && nvtx->neigh_no!=0)
- fatal("Reallocation of memory failed during removal of vertex neighbour in vtx_remove_neighbour",100);
+ fatal("(2) Reallocation of memory failed during removal of vertex neighbour in vtx_remove_neighbour",100);
return TS_SUCCESS;
}
@@ -128,6 +130,7 @@
ts_bool vtx_add_cneighbour(ts_bond_list *blist, ts_vertex *vtx1, ts_vertex *vtx2){
ts_bool retval;
retval=vtx_add_neighbour(vtx1,vtx2);
+ // retval=vtx_add_neighbour(vtx2,vtx1);
if(retval==TS_SUCCESS)
retval=vtx_add_bond(blist,vtx1,vtx2);
return retval;
@@ -308,3 +311,42 @@
return vlist;
}
+
+
+
+ts_bool vertex_taint(ts_vertex *vtx, ts_uint level){
+ ts_uint i;
+ (*(vtx->locked))=1; //lock current vertex
+ if(level==0){ //if we reach last in recursion exit
+ return TS_SUCCESS;
+ }
+ for(i=0; i<vtx->neigh_no; i++){ //else recursive call self with decreased level
+ vertex_taint(vtx->neigh[i], level-1);
+ }
+ return TS_SUCCESS;
+}
+
+ts_bool vertex_untaint(ts_vertex *vtx, ts_uint level){
+ (*(vtx->locked))=0;
+ if(level==0){
+ return TS_SUCCESS;
+ }
+ ts_uint i;
+ for(i=0; i<vtx->neigh_no; i++){
+ vertex_untaint(vtx->neigh[i], level-1);
+ }
+ return TS_SUCCESS;
+}
+
+inline ts_bool vertex_tainted(ts_vertex *vtx, ts_uint level, ts_uint amount){
+ if(*(vtx->locked)>amount) return 1;
+ if(level==0){
+ return 0;
+ }
+ ts_uint i;
+ for(i=0; i<vtx->neigh_no;i++){
+ if(vertex_tainted(vtx->neigh[i], level-1, amount)) return 1;
+ }
+
+ return 0;
+}
--
Gitblit v1.9.3