edit

diff --git a/src/Makefile b/src/Makefile
index 965d4d779227bf12b0727b6a34a4eab00b2c0ac1..007705d0aa6682300bb40bb02b65db9b71c28b7c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,12 +6,12 @@ OBJ_DIR = bin
 
 C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard Tuner/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) $(wildcard Encoders/*.c)
 
-HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard Tuner.*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
+HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard Tuner/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 
 CFLAGS := -Wall -g -O0
-CFLAGS += -IAST -ICollections -IBackend -I. -IEncoders
+CFLAGS += -IAST -ICollections -IBackend -I. -IEncoders -ITuner
 LDFLAGS := -ldl -lrt -rdynamic
 SHARED := -shared
 

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

diff --git a/src/Tuner/tunable.h b/src/Tuner/tunable.h
index 84bf8627df3deeacfb4937284efc57fe1979291f..6f091abdeb5974e875951241650eb2281453a531 100644 (file)
--- a/src/Tuner/tunable.h
+++ b/src/Tuner/tunable.h
@@ -12,6 +12,9 @@ struct TunableDesc {
        int defaultValue;
 };
 
+Tuner * allocTuner();
+void deleteTuner(Tuner *This);
+
 int getTunable(Tuner This, TunableParam param, TunableDesc * descriptor);
 int getVarTunable(Tuner This, VarType vartype, TunableParam param, TunableDesc * descriptor);
 

diff --git a/src/csolver.c b/src/csolver.c
index 2295e7bd923b487fd86f50f65f258d6bcd730535..036729b1d9e235c4da20c0ab71516ad1fc4aaa62 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -9,6 +9,7 @@
 #include "function.h"
 #include "satencoder.h"
 #include "sattranslator.h"
+#include "tunable.h"
 
 CSolver *allocCSolver() {
        CSolver *This = (CSolver *) ourmalloc(sizeof(CSolver));
@@ -22,6 +23,7 @@ CSolver *allocCSolver() {
        This->allOrders = allocDefVectorOrder();
        This->allFunctions = allocDefVectorFunction();
        This->satEncoder = allocSATEncoder();
+       This->tuner = allocTuner();
        return This;
 }
 
@@ -72,6 +74,7 @@ void deleteSolver(CSolver *This) {
        }
        deleteVectorFunction(This->allFunctions);
        deleteSATEncoder(This->satEncoder);
+       deleteTuner(This->tuner);
        ourfree(This);
 }
 

diff --git a/src/csolver.h b/src/csolver.h
index e225d0890c7b5df4511821a4f2d522ac99cd8fa8..fbf22da5bb7aa3f97284a69b5bbb72946e7c3cd6 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -7,7 +7,8 @@
 struct CSolver {
        SATEncoder *satEncoder;
        bool unsat;
-
+       Tuner *tuner;
+       
        /** This is a vector of constraints that must be satisfied. */
        HashSetBoolean *constraints;