From bb77ca8f6e18e5a3ee2996095db5394dcd49197a Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@andromeda>
Date: Sat, 04 Dec 2010 14:31:17 +0000
Subject: [PATCH] Datastructure & basic functions rewritten. It seems there is no memory leaks in simple operations.
---
src/main.c | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main.c b/src/main.c
index d6c2854..77a84ab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,6 +2,9 @@
#include<math.h>
#include "general.h"
#include "vertex.h"
+#include "bond.h"
+#include "triangle.h"
+#include "cell.h"
//#include "io.h"
//#include "initial_timestep.h"
@@ -14,14 +17,41 @@
int main(int argv, char *argc[]){
ts_bool retval;
ts_vertex_list *vlist=init_vertex_list(5);
+ts_bond_list *blist=init_bond_list();
+ts_triangle_list *tlist=init_triangle_list();
+ts_cell_list *clist=init_cell_list(3,3,3,0.3);
-retval=vtx_add_neighbour(VTX(1),VTX(0));
+retval=vtx_add_cneighbour(blist,vlist->vtx[1],vlist->vtx[0]);
if(retval==TS_FAIL) printf("1. already a member or vertex is null!\n");
-retval=vtx_add_neighbour(VTX(0),VTX(1));
+
+retval=vtx_add_cneighbour(blist,vlist->vtx[0],vlist->vtx[1]);
if(retval==TS_FAIL) printf("2. already a member or vertex is null!\n");
-VTX_DATA(1)->x=1.0;
+
+retval=vtx_remove_neighbour(vlist->vtx[0],vlist->vtx[1]);
+vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
+
+vlist->vtx[0]->data->x=1.0;
+vlist->vtx[0]->data->x=1.1;
+
+bond_add(blist, vlist->vtx[1],vlist->vtx[0]);
+triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
+
+triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
+
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+cell_add_vertex(clist->cell[0], vlist->vtx[0]);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->data->vertex[0]->data->x);
+cell_list_cell_occupation_clear(clist);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+cell_add_vertex(clist->cell[0], vlist->vtx[0]);
+
+
+triangle_list_free(tlist);
+bond_list_free(blist);
vtx_list_free(vlist);
+cell_list_free(clist);
printf("Done.\n");
return 0; //program finished perfectly ok. We return 0.
}
--
Gitblit v1.9.3