From f6bc99c334f6481e40f547d0e91f771b9564aa38 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 05 Jul 2016 10:09:08 +0000
Subject: [PATCH] Merge branch 'clustercount' into nirgov
---
src/general.h | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/general.h b/src/general.h
index 5189c23..9fefc5b 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;
@@ -283,6 +284,9 @@
long int mcsweeps;
long int quiet;
long int shc;
+ long int number_of_vertices_with_c0;
+ ts_double c0;
+ ts_double w;
} ts_tape;
@@ -319,11 +323,13 @@
-typedef struct{
+struct ts_cluster{
ts_uint nvtx;
ts_uint idx;
ts_vertex **vtx;
-} ts_cluster;
+};
+
+typedef struct ts_cluster ts_cluster;
typedef struct{
ts_uint n;
--
Gitblit v1.9.3