From 30ee9c409ed7c743c693f1e068c1d7393949207a Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@fe.uni-lj.si> Date: Thu, 14 Jun 2012 09:24:31 +0000 Subject: [PATCH] Started with bondflip. There is still an error in calling vtx_remove_neighbour with vertices that are actually not neighbours. --- src/vertex.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/src/vertex.c b/src/vertex.c index 21ad48e..466c064 100644 --- a/src/vertex.c +++ b/src/vertex.c @@ -79,6 +79,9 @@ j++; } } + if(j==0) { + fatal("vtx_remove_neighbour: Error, vertices are not neighbours", 100); + } /* resize memory. potentionally time consuming */ vtx->neigh_no--; vtx->neigh=(ts_vertex **)realloc(vtx->neigh,vtx->neigh_no*sizeof(ts_vertex *)); @@ -110,11 +113,14 @@ bond=bond_add(blist,vtx1,vtx2); if(bond==NULL) return TS_FAIL; vtx1->bond_no++; + vtx2->bond_no++; // vtx2->data->bond_no++; vtx1->bond=(ts_bond **)realloc(vtx1->bond, vtx1->bond_no*sizeof(ts_bond *)); + vtx2->bond=(ts_bond **)realloc(vtx2->bond, vtx2->bond_no*sizeof(ts_bond *)); // vtx2->data->bond=(ts_bond **)realloc(vtx2->data->bond, vtx2->data->bond_no*sizeof(ts_bond *)); vtx1->bond[vtx1->bond_no-1]=bond; + vtx2->bond[vtx2->bond_no-1]=bond; // vtx2->ata->bond[vtx2->data->bond_no-1]=bond; return TS_SUCCESS; } @@ -207,6 +213,57 @@ } +/* Insert neighbour is a function that is required in bondflip. It inserts a + * neighbour exactly in the right place. */ +inline ts_bool vtx_insert_neighbour(ts_vertex *vtx, ts_vertex *nvtx, ts_vertex *vtxm){ +//nvtx is a vertex that is to be inserted after vtxm! + ts_uint i,j,midx; + vtx->neigh_no++; + if(vtxm==NULL || nvtx==NULL || vtx==NULL) + fatal("vertex_insert_neighbour: one of pointers has been zero.. Cannot proceed.",3); + //We need to reallocate space! The pointer *neight must be zero if not having neighbours jey (if neigh_no was 0 at thime of calling + vtx->neigh=realloc(vtx->neigh,vtx->neigh_no*sizeof(ts_vertex *)); + if(vtx->neigh == NULL){ + fatal("Reallocation of memory failed during insertion of vertex neighbour in vertex_insert_neighbour",3); + } + midx=0; + for(i=0;i<vtx->neigh_no-1;i++) if(vtx->neigh[i]==vtxm) {midx=i; break;} + // fprintf(stderr,"midx=%d, vseh=%d\n",midx,vtx->neigh_no-2); + if(midx==vtx->neigh_no-2) { + vtx->neigh[vtx->neigh_no-1]=nvtx; + } else { + for(j=vtx->neigh_no-2;j>midx;j--) { + vtx->neigh[j+1]=vtx->neigh[j]; +// vtx->bond_length[j+1]=vtx->bond_length[j]; +// vtx->bond_length_dual[j+1]=vtx->bond_length_dual[j]; + } + vtx->neigh[midx+1]=nvtx; + } + return TS_SUCCESS; +} + + +/* vtx remove tristar is required in bondflip. */ +/* TODO: Check whether it is important to keep the numbering of tristar + * elements in some order or not! */ +inline ts_bool vtx_remove_tristar(ts_vertex *vtx, ts_triangle *tristar){ + ts_uint i,j=0; + for(i=0;i<vtx->tristar_no;i++){ + if(vtx->tristar[i]!=tristar){ + vtx->tristar[j]=vtx->tristar[i]; + j++; + } + } + vtx->tristar_no--; + vtx->tristar=realloc(vtx->tristar,vtx->tristar_no*sizeof(ts_triangle *)); + if(vtx->neigh == NULL){ + fatal("Reallocation of memory failed during insertion of vertex neighbour in vertex_add_neighbour",3); + } + return TS_SUCCESS; +} + + + /* ****************************************************************** */ /* ***** New vertex copy operations. Inherently they are slow. ***** */ /* ****************************************************************** */ -- Gitblit v1.9.3