Add file to generate tuner files and fix tunable usage

diff --git a/src/Encoders/naiveencoder.cc b/src/Encoders/naiveencoder.cc
index 3f9e44eeaad1df92acc6654a93d5089b43e36ff2..63ec82f66d4d55488a60869067c11d1383bd1524 100644 (file)
--- a/src/Encoders/naiveencoder.cc
+++ b/src/Encoders/naiveencoder.cc
@@ -69,7 +69,10 @@ void naiveEncodingElement(CSolver *csolver, Element *This) {
                if (This->type != ELEMCONST) {
                        model_print("INFO: naive encoder is making the decision about element %p....\n", This);
                }
-               encoding->setElementEncodingType((ElementEncodingType)csolver->getTuner()->getVarTunable(This->getRange()->getType(), NAIVEENCODER, &NaiveEncodingDesc));
+               uint enc = csolver->getTuner()->getVarTunable(This->getRange()->getType(), NODEENCODING, &NodeEncodingDesc);
+               if (enc == ELEM_UNASSIGNED)
+                       enc = csolver->getTuner()->getTunable(NAIVEENCODER, &NaiveEncodingDesc);
+               encoding->setElementEncodingType((ElementEncodingType)enc);
                encoding->encodingArrayInitialization();
        }
 

diff --git a/src/Test/runmultituner.cc b/src/Test/runmultituner.cc
new file mode 100644 (file)
index 0000000..b66fa5e
--- /dev/null
+++ b/src/Test/runmultituner.cc
@@ -0,0 +1,37 @@
+#include "csolver.h"
+#include "multituner.h"
+#include "searchtuner.h"
+
+int main(int argc, char **argv) {
+       if (argc < 7) {
+               printf("You should specify %s budget rounds timeout problemfilenames - tunerfilenames", argv[0]);
+               exit(-1);
+       }
+       uint budget;
+       uint rounds;
+       uint timeout;
+       sscanf(argv[1], "%u", &budget);
+       sscanf(argv[2], "%u", &rounds);
+       sscanf(argv[3], "%u", &timeout);
+
+       MultiTuner *multituner = new MultiTuner(budget, rounds, timeout);
+       bool tunerfiles = false;
+       for (int i = 4; i < argc; i++) {
+               if (!tunerfiles) {
+                       if (argv[i][0] == '-' && argv[i][1] == 0)
+                               tunerfiles = true;
+                       else
+                               multituner->addProblem(argv[i]);
+               } else
+                       multituner->addTuner(new SearchTuner(argv[i]));
+       }
+
+       if (!tunerfiles) {
+               printf("You should specify %s budget rounds timeout problemfilenames - tunerfilenames", argv[0]);
+               exit(-1);
+       }
+
+       multituner->tuneK();
+       delete multituner;
+       return 0;
+}

diff --git a/src/Test/serializetuner.cc b/src/Test/serializetuner.cc
new file mode 100644 (file)
index 0000000..dcce0c5
--- /dev/null
+++ b/src/Test/serializetuner.cc
@@ -0,0 +1,20 @@
+#include "csolver.h"
+#include "searchtuner.h"
+#include "tunable.h"
+#include <stdlib.h>
+
+int main(int argc, char **argv) {
+       SearchTuner *elem_bin = new SearchTuner();
+       SearchTuner *elem_onehot = new SearchTuner();
+       SearchTuner *elem_unary = new SearchTuner();
+       elem_bin->setTunable(NAIVEENCODER, &NaiveEncodingDesc, BINARYINDEX);
+       elem_onehot->setTunable(NAIVEENCODER, &NaiveEncodingDesc, ONEHOT);
+       elem_unary->setTunable(NAIVEENCODER, &NaiveEncodingDesc, UNARY);
+
+       elem_bin->serialize("binarytuner.conf");
+       elem_onehot->serialize("onehottuner.conf");
+       elem_unary->serialize("unarytuner.conf");
+       delete elem_bin;
+       delete elem_onehot;
+       delete elem_unary;
+}

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index 2504110fd3fe2003c5301cf405bcce400f20ba69..a30b482c880747820ffaabe8b5e32c960db1dc23 100644 (file)
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -155,11 +155,11 @@ void MultiTuner::tuneComp() {
                        ranking.insertAt(j, tuner);
                }
                for (uint i = tuners.getSize(); i < ranking.getSize(); i++) {
-                 TunerRecord * tuner = ranking.get(i);
-                 for(uint j = 0; j < tunerV->getSize(); j++) {
-                   if (tunerV->get(j) == tuner)
-                     tunerV->removeAt(j);
-                 }
+                       TunerRecord *tuner = ranking.get(i);
+                       for (uint j = 0; j < tunerV->getSize(); j++) {
+                               if (tunerV->get(j) == tuner)
+                                       tunerV->removeAt(j);
+                       }
                }
        }
 }

diff --git a/src/Tuner/searchtuner.cc b/src/Tuner/searchtuner.cc
index 674758e2580ff1ac1e454a25228dc9f1f8ceabff..e594abef11a07062625b8adf9925338600749690 100644 (file)
--- a/src/Tuner/searchtuner.cc
+++ b/src/Tuner/searchtuner.cc
@@ -122,6 +122,24 @@ SearchTuner::~SearchTuner() {
        delete iterator;
 }
 
+void SearchTuner::setTunable(TunableParam param, TunableDesc *descriptor, uint value) {
+       TunableSetting *result = new TunableSetting(param);
+       result->setDecision(descriptor->lowValue, descriptor->highValue, descriptor->defaultValue, value);
+       settings.add(result);
+       usedSettings.add(result);
+}
+
+void SearchTuner::setVarTunable(VarType vartype, TunableParam param, TunableDesc *descriptor, uint value) {
+       setVarTunable(vartype, 0, param, descriptor, value);
+}
+
+void SearchTuner::setVarTunable(VarType vartype1, VarType vartype2, TunableParam param, TunableDesc *descriptor, uint value) {
+       TunableSetting *result = new TunableSetting(vartype1, vartype2, param);
+       result->setDecision(descriptor->lowValue, descriptor->highValue, descriptor->defaultValue, value);
+       settings.add(result);
+       usedSettings.add(result);
+}
+
 int SearchTuner::getTunable(TunableParam param, TunableDesc *descriptor) {
        TunableSetting setting(param);
        TunableSetting *result = usedSettings.get(&setting);

diff --git a/src/Tuner/searchtuner.h b/src/Tuner/searchtuner.h
index e00a6dd4315bec6ed57eacbcd40af719444df545..44dcd5c64d6fe2ffce91a2fcdbaa628013f63cea 100644 (file)
--- a/src/Tuner/searchtuner.h
+++ b/src/Tuner/searchtuner.h
@@ -45,6 +45,9 @@ public:
        int getTunable(TunableParam param, TunableDesc *descriptor);
        int getVarTunable(VarType vartype, TunableParam param, TunableDesc *descriptor);
        int getVarTunable(VarType vartype1, VarType vartype2, TunableParam param, TunableDesc *descriptor);
+       void setTunable(TunableParam param, TunableDesc *descriptor, uint value);
+       void setVarTunable(VarType vartype, TunableParam param, TunableDesc *descriptor, uint value);
+       void setVarTunable(VarType vartype1, VarType vartype2, TunableParam param, TunableDesc *descriptor, uint value);
        SearchTuner *copyUsed();
        void randomMutate();
        uint getSize() { return usedSettings.getSize();}