From e86357faa6caf28f5032c624fa0cba24e5dc4686 Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Fri, 07 Mar 2014 12:13:21 +0000
Subject: [PATCH] Many fixes, before changing bondflip. triangles are still calculated in ts_bond_flip
---
src/bondflip.c | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/src/bondflip.c b/src/bondflip.c
index b444975..2d41849 100644
--- a/src/bondflip.c
+++ b/src/bondflip.c
@@ -79,46 +79,59 @@
oldenergy+=kp->xk* kp->energy;
oldenergy+=km->xk* km->energy;
oldenergy+=it->xk* it->energy;
-// for(i=0;i<k->neigh_no;i++) oldenergy+=k->neigh[i]->xk*k->neigh[i]->energy;
-// for(i=0;i<kp->neigh_no;i++) oldenergy+=kp->neigh[i]->xk*kp->neigh[i]->energy;
-// 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;
+ //Neigbours don't change its 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]);
+/* ts_double dbg_energy=0.0;
+ for(i=0;i<k->neigh_no;i++) {
+ dbg_energy=k->neigh[i]->energy;
+ energy_vertex(k->neigh[i]);
+ if(abs(dbg_energy-k->neigh[i]->energy)>1e-100) fatal("Energy changes!",1);
+ }
+ for(i=0;i<kp->neigh_no;i++) {
+ dbg_energy=kp->neigh[i]->energy;
+ energy_vertex(kp->neigh[i]);
+ if(abs(dbg_energy-kp->neigh[i]->energy)>1e-100) fatal("Energy changes!",1);
+ }
+ for(i=0;i<km->neigh_no;i++){
+ dbg_energy=km->neigh[i]->energy;
+ energy_vertex(km->neigh[i]);
+ if(abs(dbg_energy-km->neigh[i]->energy)>1e-100) fatal("Energy changes!",1);
+ }
+
+ for(i=0;i<it->neigh_no;i++){
+ dbg_energy=it->neigh[i]->energy;
+ energy_vertex(it->neigh[i]);
+ if(abs(dbg_energy-it->neigh[i]->energy)>1e-100) fatal("Energy changes!",1);
+ }
+*/
delta_energy+=k->xk* k->energy;
delta_energy+=kp->xk* kp->energy;
delta_energy+=km->xk* km->energy;
delta_energy+=it->xk* it->energy;
-// for(i=0;i<k->neigh_no;i++) delta_energy+=k->neigh[i]->xk*k->neigh[i]->energy;
-// for(i=0;i<kp->neigh_no;i++) delta_energy+=kp->neigh[i]->xk*kp->neigh[i]->energy;
-// for(i=0;i<km->neigh_no;i++) delta_energy+=km->neigh[i]->xk*km->neigh[i]->energy;
-// for(i=0;i<it->neigh_no;i++) delta_energy+=it->neigh[i]->xk*it->neigh[i]->energy;
+ //Neigbours don't change its energy.
delta_energy-=oldenergy;
// fprintf(stderr,"I WAS HERE! Got energy!\n");
/* MONTE CARLO */
@@ -233,26 +246,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,11 +288,14 @@
// * 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);
+// 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);
@@ -301,7 +315,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