From 64c113ed06cb749fdc513162a1cddf4ec024fd72 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 30 Nov 2013 10:10:13 +0000
Subject: [PATCH] Changes in data structure, added vertex_list_remove_vtx and vertex_list_add_vtx. Trying to fix the rest
---
src/general.h | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/general.h b/src/general.h
index 6263862..cc051f5 100644
--- a/src/general.h
+++ b/src/general.h
@@ -136,8 +136,9 @@
ts_double x; /**< The x coordinate of vertex. */
ts_double y; /**< The y coordinate of vertex. */
ts_double z; /**< The z coordinate of vertex. */
- ts_uint neigh_no; /**< The number of neighbours. */
- struct ts_vertex **neigh; /**< The pointer that holds neigh_no pointers to this structure. */
+// ts_uint neigh_no; /**< The number of neighbours. */
+// struct ts_vertex **neigh; /**< The pointer that holds neigh_no pointers to this structure. */
+ struct ts_vertex_list *neigh;
ts_double *bond_length; /**< Obsolete! The bond lenght is moved to ts_bond */
ts_double *bond_length_dual; /**< Obsolete! Bond length in dual lattice is moved to ts_bond! */
ts_double curvature;
@@ -157,11 +158,13 @@
};
typedef struct ts_vertex ts_vertex;
-typedef struct {
+struct ts_vertex_list{
ts_uint n;
+ ts_uint list_size;
ts_vertex **vtx;
-} ts_vertex_list;
+};
+typedef struct ts_vertex_list ts_vertex_list;
struct ts_bond {
ts_uint idx;
@@ -169,6 +172,7 @@
ts_vertex *vtx2;
ts_double bond_length;
ts_double bond_length_dual;
+ ts_bool tainted;
};
typedef struct ts_bond ts_bond;
--
Gitblit v1.9.3