X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_analysis_eval.h;h=736dc8b03d089a99df9242460ed91a284995daa0;hb=e2793cfa2a24ec3d0fcfb58d7f75dfcf0a79556c;hp=dbd4ac954e870a63e4eaa3c31560f73ceedadaf3;hpb=0a87ec9a018cc9731ce3b04309eaa4dcc77df6d2;p=lttv.git

diff --git a/lttv/lttv/sync/event_analysis_eval.h b/lttv/lttv/sync/event_analysis_eval.h
index dbd4ac95..736dc8b0 100644
--- a/lttv/lttv/sync/event_analysis_eval.h
+++ b/lttv/lttv/sync/event_analysis_eval.h
@@ -23,9 +23,6 @@
 #endif
 
 #include <glib.h>
-#ifdef HAVE_LIBGLPK
-#include <glpk.h>
-#endif
 
 #include "data_structures.h"
 
@@ -61,12 +58,6 @@ typedef struct
 	 * For this table, saddr and daddr are swapped as necessary such that
 	 * saddr < daddr */
 	GHashTable* exchangeRtt;
-
-#ifdef HAVE_LIBGLPK
-	// Only the lower triangular part of theses matrixes is used
-	AllFactors* chFactorsArray;
-	AllFactors* lpFactorsArray;
-#endif
 } AnalysisStatsEval;
 
 #define BIN_NB 1001
@@ -125,17 +116,8 @@ typedef struct
 	 * bounds[i][j] where i > j */
 	Bounds** bounds;
 
-#ifdef HAVE_LIBGLPK
-	/* glp_prob* lps[traceNum][traceNum]
-	 *
-	 * Only the lower triangular part of the matrix is allocated, that is
-	 * lps[i][j] where i > j */
-	glp_prob*** lps;
-
-	/* Only the lower triangular part of the matrix is allocated, that is
-	 * lpFactorsArray[i][j] where i > j */
-	AllFactors* lpFactorsArray;
-#endif
+	// Extra SyncState used to overlay the chull-calculated accuracy region
+	SyncState* chullSS;
 } AnalysisGraphsEval;
 
 typedef struct
@@ -143,11 +125,6 @@ typedef struct
 	// double* rttInfo[RttKey]
 	GHashTable* rttInfo;
 
-	/* The convex hull analysis is encapsulated and messages are passed to it
-	 * so that it builds the convex hulls. These are reused in the linear
-	 * program. */
-	struct _SyncState* chullSS;
-
 	AnalysisStatsEval* stats;
 	AnalysisGraphsEval* graphs;
 } AnalysisDataEval;