Don't use public members for solver flags

2012-12-27 15:44:40 +00:00
parent b996436b24
commit 7b7f663ac6
9 changed files with 64 additions and 45 deletions
--- a/packages/CLPBN/horus/ElimGraph.h
+++ b/packages/CLPBN/horus/ElimGraph.h
@@ -58,7 +58,9 @@ class ElimGraph

    static VarIds getEliminationOrder (const Factors&, VarIds);

-    static ElimHeuristic elimHeuristic;
+    static ElimHeuristic elimHeuristic (void) { return elimHeuristic_; }
+
+    static void setElimHeuristic (ElimHeuristic eh) { elimHeuristic_ = eh; }

  private:

@@ -132,6 +134,8 @@ class ElimGraph
    vector<EgNode*>                nodes_;
    TinySet<EgNode*>               unmarked_;
    unordered_map<VarId, EgNode*>  varMap_;
+
+    static ElimHeuristic elimHeuristic_;
 };

 #endif // HORUS_ELIMGRAPH_H