Assign each predicate's initial weight ad 100. Remove some unused function and data...

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index d8b0bc1a0a6342421dce0c17f1859175495dc158..354534d55cf60f723f7a72ee9bc6cea07ef21f98 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -9,12 +9,12 @@
 #define MAX_DIST 10
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
+typedef ModelList<Predicate *> predicate_trace_t;
+
 typedef HashTable<void *, FuncInst *, uintptr_t, 0, model_malloc, model_calloc, model_free> loc_inst_map_t;
 typedef HashTable<FuncInst *, uint32_t, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_id_map_t;
 typedef HashTable<FuncInst *, Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_pred_map_t;
 
-typedef ModelList<Predicate *> predicate_trace_t;
-
 typedef enum edge_type {
        IN_EDGE, OUT_EDGE, BI_EDGE
 } edge_type_t;
@@ -136,8 +136,6 @@ private:
        void init_predicate_tree_data_structure(thread_id_t tid);
        void reset_predicate_tree_data_structure(thread_id_t tid);
 
-       PredSet predicate_leaves;
-       ModelVector<Predicate *> leaves_tmp_storage;
        PredSet failed_predicates;
 
        /* Store the relation between this FuncNode and other FuncNodes */