From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD

---
 src/general.h |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/general.h b/src/general.h
index 4eab674..983361b 100644
--- a/src/general.h
+++ b/src/general.h
@@ -156,7 +156,8 @@
         ts_double projArea;
         ts_double relR;
         ts_double solAngle;
-	struct ts_poly *grafted_poly;
+		struct ts_poly *grafted_poly;
+		struct ts_cluster *cluster;
 };
 typedef struct ts_vertex ts_vertex;
 
@@ -284,6 +285,10 @@
 	long int mcsweeps;
 	long int quiet;
 	long int shc;
+	long int number_of_vertices_with_c0;
+	ts_double c0;
+	ts_double w;
+	ts_double F;
 } ts_tape;
 
 
@@ -320,6 +325,20 @@
 
 
 
+struct ts_cluster{
+	ts_uint nvtx;
+	ts_uint idx;
+	ts_vertex **vtx;
+};
+
+typedef struct ts_cluster ts_cluster;
+
+typedef struct{
+	ts_uint n;
+	ts_cluster **cluster;
+} ts_cluster_list;
+
+
 /* GLOBAL VARIABLES */
 
 int quiet;

--
Gitblit v1.9.3