Auto Tuner Initial Full Checkin

diff --git a/src/Tuner/searchtuner.cc b/src/Tuner/searchtuner.cc
index fdc9835bf067033ab3b2bf144e3a5d5ee3fb1204..e964f4564471609f7bdd17f2f34ef9dd54af9aff 100644 (file)
--- a/src/Tuner/searchtuner.cc
+++ b/src/Tuner/searchtuner.cc
@@ -30,6 +30,13 @@ void TunableSetting::setDecision(int _low, int _high, int _default, int _selecti
        selectedValue = _selection;
 }
 
+void TunableSetting::print() {
+       if (hasVar) {
+               model_print("Type %llu, ", type);
+       }
+       model_print("Param %u = %u\n", param, selectedValue);
+}
+
 unsigned int tunableSettingHash(TunableSetting *setting) {
        return setting->hasVar ^ setting->type ^ setting->param;
 }
@@ -105,3 +112,22 @@ void SearchTuner::randomMutate() {
        else
                randomSetting->selectedValue = randomchoice + 1;
 }
+
+void SearchTuner::print() {
+       HSIteratorTunableSetting *iterator=settings.iterator();
+       while(iterator->hasNext()) {
+               TunableSetting *setting=iterator->next();
+               setting->print();
+       }
+       delete iterator;
+
+}
+
+void SearchTuner::printUsed() {
+       HSIteratorTunableSetting *iterator=usedSettings.iterator();
+       while(iterator->hasNext()) {
+               TunableSetting *setting=iterator->next();
+               setting->print();
+       }
+       delete iterator;
+}

diff --git a/src/Tuner/searchtuner.h b/src/Tuner/searchtuner.h
index bf96b299529c40c58a8527313e5980b4d9511275..b41a3e0bc1c2a40c04a3f0bf049bffc52547bd72 100644 (file)
--- a/src/Tuner/searchtuner.h
+++ b/src/Tuner/searchtuner.h
@@ -10,6 +10,7 @@ class TunableSetting {
        TunableSetting(TunableParam param);
        TunableSetting(TunableSetting * ts);
        void setDecision(int _low, int _high, int _default, int _selection);
+       void print();
        MEMALLOC;
  private:
        bool hasVar;
@@ -39,7 +40,9 @@ class SearchTuner : public Tuner {
        SearchTuner * copyUsed();
        void randomMutate();
        uint getSize() { return usedSettings.getSize();}
-       
+       void print();
+       void printUsed();
+
        MEMALLOC;
  private:
        /** Used Settings keeps track of settings that were actually used by

diff --git a/src/csolver.cc b/src/csolver.cc
index eecbaf3267379f38df5d6e2a4f14de511a686bd1..a9a4f624820e6f64adfdb145750c4378399a62b4 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -243,8 +243,8 @@ long long CSolver::getEncodeTime() { return satEncoder->getEncodeTime(); }
 
 long long CSolver::getSolveTime() { return satEncoder->getSolveTime(); }
 
-void CSolver::autoTune() {
-       AutoTuner * autotuner=new AutoTuner();
+void CSolver::autoTune(uint budget) {
+       AutoTuner * autotuner=new AutoTuner(budget);
        autotuner->addProblem(this);
        autotuner->tune();
 }

diff --git a/src/csolver.h b/src/csolver.h
index 7939ee516f7fae5ea24c73311929e7c635b7e8bd..92900a19468eb386ce861b8c427e91638279c9d1 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -117,7 +117,7 @@ public:
        void replaceBooleanWithFalse(Boolean *bexpr);
        void replaceBooleanWithBoolean(Boolean *oldb, Boolean *newb);
        CSolver *clone();
-       void autoTune();
+       void autoTune(uint budget);
 
        void setTuner(Tuner * _tuner) { tuner = _tuner; }
        long long getElapsedTime() { return elapsedTime; }