Fix Tuner framework to be OO

diff --git a/src/Tuner/tunable.cc b/src/Tuner/tunable.cc
index e0a3201a9ad024c601de955fe0e8925afe2afc74..f99424230f50391c3569970a3d7c1eed3827cb74 100644 (file)
--- a/src/Tuner/tunable.cc
+++ b/src/Tuner/tunable.cc
@@ -1,16 +1,11 @@
 #include "tunable.h"
 
-Tuner * allocTuner() {
-       return (Tuner *) ourmalloc(sizeof(Tuner));
+Tuner::Tuner() {
 }
 
-void deleteTuner(Tuner *This) {
-       ourfree(This);
-}
-
-int getTunable(Tuner *This, TunableParam param, TunableDesc * descriptor) {
+int Tuner::getTunable(TunableParam param, TunableDesc * descriptor) {
        return descriptor->defaultValue;
 }
-int getVarTunable(Tuner *This, VarType vartype, TunableParam param, TunableDesc * descriptor) {
+int Tuner::getVarTunable(VarType vartype, TunableParam param, TunableDesc * descriptor) {
        return descriptor->defaultValue;
 }

diff --git a/src/Tuner/tunable.h b/src/Tuner/tunable.h
index 24390caf0b0d4558c4dacf95f7cbdf622eeaf70d..5816d7e7b2e8612d598210e1c96d8f95a68bb6fc 100644 (file)
--- a/src/Tuner/tunable.h
+++ b/src/Tuner/tunable.h
@@ -3,26 +3,30 @@
 #include "classlist.h"
 
 
-struct Tuner {
+class Tuner {
+ public:
+       Tuner();
+       int getTunable(TunableParam param, TunableDesc * descriptor);
+       int getVarTunable(VarType vartype, TunableParam param, TunableDesc * descriptor);
+       MEMALLOC;
 };
 
-struct TunableDesc {
+class TunableDesc {
+ public:
+ TunableDesc(int _lowValue, int _highValue, int _defaultValue) : lowValue(_lowValue), highValue(_highValue), defaultValue(_defaultValue) {}
        int lowValue;
        int highValue;
        int defaultValue;
+       MEMALLOC;
 };
 
-Tuner * allocTuner();
-void deleteTuner(Tuner *This);
 
-int getTunable(Tuner *This, TunableParam param, TunableDesc * descriptor);
-int getVarTunable(Tuner *This, VarType vartype, TunableParam param, TunableDesc * descriptor);
+#define GETTUNABLE(This, param, descriptor) This->getTunable(param, descriptor)
+#define GETVARTUNABLE(This, vartype, param, descriptor) This->getTunable(param, descriptor)
 
-#define GETTUNABLE(This, param, descriptor) getTunable(This, param, descriptor)
-#define GETVARTUNABLE(This, vartype, param, descriptor) getTunable(This, param, descriptor)
+static TunableDesc onoff(0, 1, 1);
+static TunableDesc offon(0, 1, 0);
 
-static TunableDesc onoff={0, 1, 1};
-static TunableDesc offon={0, 1, 0};
 enum Tunables {DECOMPOSEORDER, MUSTREACHGLOBAL, MUSTREACHLOCAL, MUSTREACHPRUNE, OPTIMIZEORDERSTRUCTURE, ORDERINTEGERENCODING};
 typedef enum Tunables Tunables;
 #endif

diff --git a/src/classlist.h b/src/classlist.h
index 33c1398a9f54072137a99caf1e693f069541b2b2..cef1e1fe6bcc8fd4f46b50f73c71a0a9f945754a 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -42,31 +42,29 @@ class Table;
 class Order;
 class OrderPair;
 
-struct IncrementalSolver;
-typedef struct IncrementalSolver IncrementalSolver;
-
-
-
 class OrderElement;
 
 class ElementEncoding;
 class FunctionEncoding;
 class OrderEncoding;
 
-struct TableEntry;
-typedef struct TableEntry TableEntry;
-
 class OrderGraph;
 class OrderNode;
 class OrderEdge;
 
+
+struct IncrementalSolver;
+typedef struct IncrementalSolver IncrementalSolver;
+
+struct TableEntry;
+typedef struct TableEntry TableEntry;
+
 struct OrderEncoder;
 typedef struct OrderEncoder OrderEncoder;
 
-struct Tuner;
-typedef struct Tuner Tuner;
-struct TunableDesc;
-typedef struct TunableDesc TunableDesc;
+class Tuner;
+class TunableDesc;
+
 typedef int TunableParam;
 
 typedef unsigned int uint;

diff --git a/src/csolver.cc b/src/csolver.cc
index 64f0851fa74061e507a96569847ab064edda5fd1..4f26bde7a295d3292482ff4451f5f985414d23ae 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -14,7 +14,7 @@
 #include "orderdecompose.h"
 
 CSolver::CSolver() : unsat(false) {
-       tuner = allocTuner();
+       tuner = new Tuner();
        satEncoder = allocSATEncoder(this);
 }
 
@@ -57,7 +57,7 @@ CSolver::~CSolver() {
        }
 
        deleteSATEncoder(satEncoder);
-       deleteTuner(tuner);
+       delete tuner;
 }
 
 Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) {