From bc4e1ee61725fdf7ec81a9583b7fa545f847e07b Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Sat, 30 Nov 2013 17:12:09 +0000 Subject: [PATCH] It works --- src/bondflip.c | 92 ++++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 44 deletions(-) diff --git a/src/bondflip.c b/src/bondflip.c index b444975..17a1977 100644 --- a/src/bondflip.c +++ b/src/bondflip.c @@ -34,27 +34,27 @@ ts_vertex *kp,*km; - if(it->neigh_no< 3) return TS_FAIL; - if(k->neigh_no< 3) return TS_FAIL; + if(it->neigh->n< 3) return TS_FAIL; + if(k->neigh->n< 3) return TS_FAIL; if(k==NULL || it==NULL){ fatal("In bondflip, number of neighbours of k or it is less than 3!",999); } nei=0; - for(i=0;i<it->neigh_no;i++){ // Finds the nn of it, that is k - if(it->neigh[i]==k){ + for(i=0;i<it->neigh->n;i++){ // Finds the nn of it, that is k + if(it->neigh->vtx[i]==k){ nei=i; break; } } neip=nei+1; // I don't like it.. Smells like I must have it in correct order neim=nei-1; - if(neip>=it->neigh_no) neip=0; - if((ts_int)neim<0) neim=it->neigh_no-1; /* casting is essential... If not + if(neip>=it->neigh->n) neip=0; + if((ts_int)neim<0) neim=it->neigh->n-1; /* casting is essential... If not there the neim is never <0 !!! */ // fprintf(stderr,"The numbers are: %u %u\n",neip, neim); - km=it->neigh[neim]; // We located km and kp - kp=it->neigh[neip]; + km=it->neigh->vtx[neim]; // We located km and kp + kp=it->neigh->vtx[neip]; if(km==NULL || kp==NULL){ fatal("In bondflip, cannot determine km and kp!",999); @@ -64,8 +64,8 @@ /* test if the membrane is wrapped too much, so that kp is nearest neighbour of * km. If it is true, then don't flip! */ - for(i=0;i<km->neigh_no;i++){ - if(km->neigh[i] == kp) return TS_FAIL; + for(i=0;i<km->neigh->n;i++){ + if(km->neigh->vtx[i] == kp) return TS_FAIL; } // fprintf(stderr,"Membrane didn't wrap too much.. Continue.\n"); /* if bond would be too long, return... */ @@ -84,33 +84,33 @@ // for(i=0;i<km->neigh_no;i++) oldenergy+=km->neigh[i]->xk*km->neigh[i]->energy; // for(i=0;i<it->neigh_no;i++) oldenergy+=it->neigh[i]->xk*it->neigh[i]->energy; /* -fprintf(stderr,"*** Naslov k=%d\n",k); -fprintf(stderr,"*** Naslov it=%d\n",it); -fprintf(stderr,"*** Naslov km=%d\n",km); -fprintf(stderr,"*** Naslov kp=%d\n",kp); +fprintf(stderr,"*** Naslov k=%ld\n",(long)k); +fprintf(stderr,"*** Naslov it=%ld\n",(long)it); +fprintf(stderr,"*** Naslov km=%ld\n",(long)km); +fprintf(stderr,"*** Naslov kp=%ld\n",(long)kp); for(i=0;i<k->neigh_no;i++) - fprintf(stderr,"k sosed=%d\n",k->neigh[i]); + fprintf(stderr,"k sosed=%ld\n",(long)k->neigh[i]); for(i=0;i<it->neigh_no;i++) - fprintf(stderr,"it sosed=%d\n",it->neigh[i]); + fprintf(stderr,"it sosed=%ld\n",(long)it->neigh[i]); for(i=0;i<km->neigh_no;i++) - fprintf(stderr,"km sosed=%d\n",km->neigh[i]); + fprintf(stderr,"km sosed=%ld\n",(long)km->neigh[i]); for(i=0;i<kp->neigh_no;i++) - fprintf(stderr,"kp sosed=%d\n",kp->neigh[i]); + fprintf(stderr,"kp sosed=%ld\n",(long)kp->neigh[i]); */ - // fprintf(stderr,"I WAS HERE! Before bondflip!\n"); +// fprintf(stderr,"I WAS HERE! Before bondflip!\n"); ts_flip_bond(k,it,km,kp, bond); - // fprintf(stderr,"I WAS HERE! Bondflip successful!\n"); +// fprintf(stderr,"I WAS HERE! Bondflip successful!\n"); /* Calculating the new energy */ delta_energy=0; - for(i=0;i<k->neigh_no;i++) energy_vertex(k->neigh[i]); - for(i=0;i<kp->neigh_no;i++) energy_vertex(kp->neigh[i]); - for(i=0;i<km->neigh_no;i++) energy_vertex(km->neigh[i]); - for(i=0;i<it->neigh_no;i++) energy_vertex(it->neigh[i]); + for(i=0;i<k->neigh->n;i++) energy_vertex(k->neigh->vtx[i]); + for(i=0;i<kp->neigh->n;i++) energy_vertex(kp->neigh->vtx[i]); + for(i=0;i<km->neigh->n;i++) energy_vertex(km->neigh->vtx[i]); + for(i=0;i<it->neigh->n;i++) energy_vertex(it->neigh->vtx[i]); delta_energy+=k->xk* k->energy; delta_energy+=kp->xk* kp->energy; delta_energy+=km->xk* km->energy; @@ -233,26 +233,24 @@ */ if(lm2==NULL || lp1==NULL) fatal("ts_flip_bond: Cannot find triangles lm2 and lp1!",999); - -//fprintf(stderr,"1. step: lm, lm2, lp1 and lp found!\n"); - /* //DEBUG TESTING -fprintf(stderr,"--- Naslov lm=%d",lm); +fprintf(stderr,"1. step: lm, lm2, lp1 and lp found!\n"); +fprintf(stderr,"--- Naslov lm=%ld",(long)lm); -fprintf(stderr," vtxs(%d, %d, %d)\n",lm->vertex[0],lm->vertex[1], lm->vertex[2]); -fprintf(stderr,"--- Naslov lp=%d",lp); -fprintf(stderr," vtxs(%d, %d, %d)\n",lp->vertex[0],lp->vertex[1], lp->vertex[2]); -fprintf(stderr,"--- Naslov lm2=%d",lm2); -fprintf(stderr," vtxs(%d, %d, %d)\n",lm2->vertex[0],lm2->vertex[1], lm2->vertex[2]); -fprintf(stderr,"--- Naslov lp1=%d",lp1); -fprintf(stderr," vtxs(%d, %d, %d)\n",lp1->vertex[0],lp1->vertex[1], lp1->vertex[2]); +fprintf(stderr," vtxs(%ld, %ld, %ld)\n",(long)lm->vertex[0],(long)lm->vertex[1], (long)lm->vertex[2]); +fprintf(stderr,"--- Naslov lp=%ld",(long)lp); +fprintf(stderr," vtxs(%ld, %ld, %ld)\n",(long)lp->vertex[0],(long)lp->vertex[1], (long)lp->vertex[2]); +fprintf(stderr,"--- Naslov lm2=%ld",(long)lm2); +fprintf(stderr," vtxs(%ld, %ld, %ld)\n",(long)lm2->vertex[0],(long)lm2->vertex[1], (long)lm2->vertex[2]); +fprintf(stderr,"--- Naslov lp1=%ld",(long)lp1); +fprintf(stderr," vtxs(%ld, %ld, %ld)\n",(long)lp1->vertex[0],(long)lp1->vertex[1], (long)lp1->vertex[2]); for(i=0;i<lm->neigh_no;i++) - fprintf(stderr,"lm sosed=%d\n",lm->neigh[i]); + fprintf(stderr,"lm sosed=%ld\n",(long)lm->neigh[i]); for(i=0;i<lp->neigh_no;i++) - fprintf(stderr,"lp sosed=%d\n",lp->neigh[i]); + fprintf(stderr,"lp sosed=%ld\n",(long)lp->neigh[i]); // END DEBUG TESTING */ /* @@ -277,16 +275,22 @@ // * normals are recalculated here triangle_normal_vector(lp); triangle_normal_vector(lm); +//fprintf(stderr,"2a. step: triangle normals recalculated\n"); // 3. step. Correct neighbours in vertex_list - vtx_remove_neighbour(k,it); - vtx_remove_neighbour(it,k); + vertex_list_remove_vtx(k->neigh, it); + vertex_list_remove_vtx(it->neigh, k); + //vtx_remove_neighbour(k,it); +// vtx_remove_neighbour(it,k); +//fprintf(stderr,"3. step (PROGRESS): removed k and it neighbours\n"); + //Tukaj pa nastopi tezava... Kam dodati soseda? - vtx_insert_neighbour(km,kp,k); - vtx_insert_neighbour(kp,km,it); -// vertex_add_neighbour(km,kp); //pazi na vrstni red. -// vertex_add_neighbour(kp,km); + +// vtx_insert_neighbour(km,kp,k); +// vtx_insert_neighbour(kp,km,it); + vtx_add_neighbour(km,kp); //pazi na vrstni red. + vtx_add_neighbour(kp,km); //fprintf(stderr,"3. step: vertex neighbours corrected\n"); // 3a. step. If any changes to ts_vertex, do it here! @@ -301,7 +305,7 @@ // 5. step. Correct neighbouring triangles triangle_remove_neighbour(lp,lp1); - // fprintf(stderr,".\n"); + // fprintf(stderr,".\n"); triangle_remove_neighbour(lp1,lp); // fprintf(stderr,".\n"); triangle_remove_neighbour(lm,lm2); -- Gitblit v1.9.3