Adding a directed search based config for the tuner

diff --git a/src/Backend/satelemencoder.cc b/src/Backend/satelemencoder.cc
index d2c04f62ac2a1aeeb7c9cddb4207c7fa07d61459..8f06eecad991e3d68d9b83e5d5b47f3bba3a4f6b 100644 (file)
--- a/src/Backend/satelemencoder.cc
+++ b/src/Backend/satelemencoder.cc
@@ -226,7 +226,6 @@ void SATEncoder::generateBinaryIndexEncodingVars(ElementEncoding *encoding) {
        if (encoding->element->anyValue){
                uint setSize = encoding->element->getRange()->getSize();
                uint encArraySize = encoding->encArraySize;
-               model_print("setSize=%u\tencArraySize=%u\n", setSize, encArraySize);
                if(setSize < encArraySize * (uint)solver->getTuner()->getTunable(MUSTVALUE, &mustValueBinaryIndex)/10){
                        generateAnyValueBinaryIndexEncodingPositive(encoding);
                } else {

diff --git a/src/Tuner/autotuner.cc b/src/Tuner/autotuner.cc
index 6b297557af8a3e1fec719a09559c3d4bdec59a6e..857b21cf6a5ad3c935d26f63a2d0d2b8e3db5191 100644 (file)
--- a/src/Tuner/autotuner.cc
+++ b/src/Tuner/autotuner.cc
@@ -55,6 +55,13 @@ SearchTuner *AutoTuner::mutateTuner(SearchTuner *oldTuner, uint k) {
        return newTuner;
 }
 
+#ifdef STATICENCGEN
+SearchTuner *AutoTuner::mutateTuner(SearchTuner *oldTuner) {
+       SearchTuner *newTuner = oldTuner->copyUsed();
+       result = newTuner->nextStaticTuner();
+       return result==EXIT_FAILURE? newTuner: NULL;
+}
+#endif
 
 void AutoTuner::tune() {
        SearchTuner *bestTuner = NULL;
@@ -64,6 +71,20 @@ void AutoTuner::tune() {
        double base_temperature = evaluateAll(oldTuner);
        double oldScore = base_temperature;
 
+#ifdef STATICENCGEN
+       while(true){
+               SearchTuner *newTuner = mutateTuner(oldTuner);
+               if(newTuner == NULL)
+                       return;
+               double newScore = evaluateAll(newTuner);
+               newTuner->printUsed();
+               model_print("Received score %f\n", newScore);
+               delete oldTuner;
+               oldScore = newScore;
+               oldTuner = newTuner;
+       }
+#endif
+       
        for (uint i = 0; i < budget; i++) {
                SearchTuner *newTuner = mutateTuner(oldTuner, i);
                double newScore = evaluateAll(newTuner);

diff --git a/src/Tuner/autotuner.h b/src/Tuner/autotuner.h
index 72d4c2b136195c49be2dfc77de923893fe4f393c..ed276ee253963cfc95cd28470cb411dec85c756c 100644 (file)
--- a/src/Tuner/autotuner.h
+++ b/src/Tuner/autotuner.h
@@ -16,7 +16,9 @@ private:
        long long evaluate(CSolver *problem, SearchTuner *tuner);
        double evaluateAll(SearchTuner *tuner);
        SearchTuner *mutateTuner(SearchTuner *oldTuner, uint k);
-
+#ifdef STATICENCGEN
+       SearchTuner *mutateTuner(SearchTuner *oldTuner);
+#endif
        Vector<CSolver *> solvers;
        uint budget;
        int result;

diff --git a/src/Tuner/searchtuner.cc b/src/Tuner/searchtuner.cc
index bfe66bb4dd77cdcb21e15230a09cb9e5a6da5882..1aef3fcd566a4adf28e201aac1fe1ec91d19e7af 100644 (file)
--- a/src/Tuner/searchtuner.cc
+++ b/src/Tuner/searchtuner.cc
@@ -72,6 +72,10 @@ ostream &operator<<(ostream &os, const TunableSetting &ts)
 
 
 SearchTuner::SearchTuner() {
+#ifdef STATICENCGEN
+        graphEncoding =false;
+        naiveEncoding = ELEM_UNASSIGNED;
+#endif
        ifstream myfile;
        myfile.open (TUNEFILE, ios::in);
        if (myfile.is_open()) {
@@ -106,6 +110,12 @@ SearchTuner *SearchTuner::copyUsed() {
                TunableSetting *copy = new TunableSetting(setting);
                tuner->settings.add(copy);
        }
+#ifdef STATICENCGEN
+       if(naiveEncoding != ELEM_UNASSIGNED){
+               tuner->graphEncoding = graphEncoding;
+               tuner->naiveEncoding = naiveEncoding;
+       }
+#endif
        delete iterator;
        return tuner;
 }
@@ -169,6 +179,50 @@ void SearchTuner::randomMutate() {
        model_print("&&&&&&&&&&&&&&&&&&&&&&&\n");
 }
 
+#ifdef STATICENCGEN
+int SearchTuner::nextStaticTuner() {
+       if(naiveEncoding == ELEM_UNASSIGNED){
+               naiveEncoding = ONEHOT;
+               SetIteratorTunableSetting *iter = settings.iterator();
+               while(iter->hasNext()){
+                       TunableSetting *setting = iter->next();
+                       if (setting->param == NAIVEENCODER){
+                               setting->selectedValue = ONEHOT;
+                       } else if(setting->param == ENCODINGGRAPHOPT){
+                               setting->selectedValue = false;
+                       }
+               }
+               delete iter;
+               return EXIT_FAILURE;
+       }
+       int result=EXIT_FAILURE;
+       if(naiveEncoding == BINARYINDEX && graphEncoding){
+               model_print("Best tuner\n");
+               return EXIT_SUCCESS;
+       }else if (naiveEncoding == BINARYINDEX && !graphEncoding){
+               naiveEncoding = ONEHOT;
+               graphEncoding = true;
+       }else {
+               naiveEncoding = (ElementEncodingType)((int)naiveEncoding + 1);
+       }
+       SetIteratorTunableSetting *iter = settings.iterator();
+       uint count = 0;
+       while(iter->hasNext()){
+               TunableSetting * setting = iter->next();
+               if (setting->param == NAIVEENCODER){
+                       setting->selectedValue = naiveEncoding;
+                       count++;
+               } else if(setting->param == ENCODINGGRAPHOPT){
+                       setting->selectedValue = graphEncoding;
+                       count++;
+               }
+       }
+       model_print("Mutating %u settings\n", count);
+       delete iter;
+       return result;
+}
+#endif
+
 void SearchTuner::print() {
        SetIteratorTunableSetting *iterator = settings.iterator();
        while (iterator->hasNext()) {

diff --git a/src/Tuner/searchtuner.h b/src/Tuner/searchtuner.h
index 26fd8df51a66004fa23c1fda5462902811320cd9..612f60e174f826b239911d817428d458fb92a223 100644 (file)
--- a/src/Tuner/searchtuner.h
+++ b/src/Tuner/searchtuner.h
@@ -59,6 +59,12 @@ private:
        HashsetTunableSetting usedSettings;
        /** Settings contains all settings. */
        HashsetTunableSetting settings;
+#ifdef STATICENCGEN
+        bool graphEncoding;
+        ElementEncodingType naiveEncoding;
+public:
+        int nextStaticTuner();
+#endif
 };
 
 

diff --git a/src/config.h b/src/config.h
index 5ce22b0f0fdf89a4f2e0e5c6690201aacddd6579..ef0b9b1929bc5f046f996ace37daf3aa47a81db1 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -19,6 +19,7 @@
 //#define CONFIG_DEBUG
 #endif
 
+//#define STATICENCGEN
 
 #ifndef CONFIG_ASSERT
 #define CONFIG_ASSERT

diff --git a/src/csolver.cc b/src/csolver.cc
index f1bd9b64870f4dd45ed570a2d2608d2772825f8c..9f374cc00df78fc08ac6c7097f0e78aaa4b12b2d 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -154,7 +154,7 @@ CSolver *CSolver::clone() {
 }
 
 CSolver *CSolver::deserialize(const char *file) {
-       model_print("deserializing ...\n");
+       model_print("deserializing %s ...\n", file);
        Deserializer deserializer(file);
        return deserializer.deserialize();
 }