Breaking Multituner into comptuner and kmeanstuner

diff --git a/src/Test/analyzemultituner.cc b/src/Test/analyzemultituner.cc
index fab9082..effe965 100644 (file)
--- a/src/Test/analyzemultituner.cc
+++ b/src/Test/analyzemultituner.cc
@@ -1,5 +1,5 @@
 #include "csolver.h"
 #include "csolver.h"

-#include "multituner.h"
+#include "comptuner.h"

 #include "searchtuner.h"
 
 int main(int argc, char **argv) {
 #include "searchtuner.h"
 
 int main(int argc, char **argv) {


@@ -10,7 +10,7 @@ int main(int argc, char **argv) {
        uint numruns;
        sscanf(argv[1], "%u", &numruns);
 
        uint numruns;
        sscanf(argv[1], "%u", &numruns);
 

-       MultiTuner *multituner = new MultiTuner(0, 0, 0);
+       CompTuner *multituner = new CompTuner(0, 0);

        multituner->readData(numruns);
        multituner->findBestThreeTuners();
        delete multituner;
        multituner->readData(numruns);
        multituner->findBestThreeTuners();
        delete multituner;

diff --git a/src/Test/printtuner.cc b/src/Test/printtuner.cc
index 1c63b2f..8a3ccbd 100644 (file)
--- a/src/Test/printtuner.cc
+++ b/src/Test/printtuner.cc
@@ -1,5 +1,5 @@
 #include "csolver.h"
 #include "csolver.h"

-#include "multituner.h"
+#include "comptuner.h"

 #include "searchtuner.h"
 
 int main(int argc, char **argv) {
 #include "searchtuner.h"
 
 int main(int argc, char **argv) {

diff --git a/src/Test/runcomptuner.cc b/src/Test/runcomptuner.cc
index de751d1..6d9b93f 100644 (file)
--- a/src/Test/runcomptuner.cc
+++ b/src/Test/runcomptuner.cc
@@ -1,5 +1,5 @@
 #include "csolver.h"
 #include "csolver.h"

-#include "multituner.h"
+#include "comptuner.h"

 #include "searchtuner.h"
 
 int main(int argc, char **argv) {
 #include "searchtuner.h"
 
 int main(int argc, char **argv) {


@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
        sscanf(argv[2], "%u", &rounds);
        sscanf(argv[3], "%u", &timeout);
 
        sscanf(argv[2], "%u", &rounds);
        sscanf(argv[3], "%u", &timeout);
 

-       MultiTuner *multituner = new MultiTuner(budget, rounds, timeout);
+       CompTuner *multituner = new CompTuner(budget, timeout);

        bool tunerfiles = false;
        for (int i = 4; i < argc; i++) {
                if (!tunerfiles) {
        bool tunerfiles = false;
        for (int i = 4; i < argc; i++) {
                if (!tunerfiles) {

diff --git a/src/Test/runmultituner.cc b/src/Test/runmultituner.cc
index b66fa5e..659ad7e 100644 (file)
--- a/src/Test/runmultituner.cc
+++ b/src/Test/runmultituner.cc
@@ -1,6 +1,6 @@
 #include "csolver.h"
 #include "csolver.h"

-#include "multituner.h"

 #include "searchtuner.h"
 #include "searchtuner.h"

+#include "kmeanstuner.h"

 
 int main(int argc, char **argv) {
        if (argc < 7) {
 
 int main(int argc, char **argv) {
        if (argc < 7) {


@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
        sscanf(argv[2], "%u", &rounds);
        sscanf(argv[3], "%u", &timeout);
 
        sscanf(argv[2], "%u", &rounds);
        sscanf(argv[3], "%u", &timeout);
 

-       MultiTuner *multituner = new MultiTuner(budget, rounds, timeout);
+       KMeansTuner *multituner = new KMeansTuner(budget, rounds, timeout);

        bool tunerfiles = false;
        for (int i = 4; i < argc; i++) {
                if (!tunerfiles) {
        bool tunerfiles = false;
        for (int i = 4; i < argc; i++) {
                if (!tunerfiles) {


@@ -31,7 +31,7 @@ int main(int argc, char **argv) {
                exit(-1);
        }
 
                exit(-1);
        }
 

-       multituner->tuneK();
+       multituner->tune();

        delete multituner;
        return 0;
 }
        delete multituner;
        return 0;
 }

diff --git a/src/Tuner/comptuner.cc b/src/Tuner/comptuner.cc
new file mode 100644 (file)
index 0000000..be17c4b
--- /dev/null
+++ b/src/Tuner/comptuner.cc
@@ -0,0 +1,210 @@
+#include "comptuner.h"
+#include <float.h>
+#include <math.h>
+#include "searchtuner.h"
+#include <iostream>
+#include <fstream>
+#include "solver_interface.h"
+
+CompTuner::CompTuner(uint _budget, uint _timeout) :
+       BasicTuner(_budget, _timeout)
+{
+}
+
+CompTuner::~CompTuner(){
+       
+}
+
+void CompTuner::findBestThreeTuners() {
+       if (allTuners.getSize() < 3) {
+               printData();
+               return;
+       }
+       TunerRecord *bestTuners[3];
+       double score = DBL_MAX;
+       for (uint i = 0; i < allTuners.getSize() - 2; i++) {
+               for (uint j = i + 1; j < allTuners.getSize() - 1; j++) {
+                       for (uint k = j + 1; k < allTuners.getSize(); k++) {
+                               TunerRecord *tuner1 = allTuners.get(i);
+                               TunerRecord *tuner2 = allTuners.get(j);
+                               TunerRecord *tuner3 = allTuners.get(k);
+                               double mintimes[problems.getSize()];
+                               for (uint l = 0; l < problems.getSize(); l++) {
+                                       Problem *problem = problems.get(l);
+                                       mintimes[l] = pow(min(tuner1->getTime(problem), tuner2->getTime(problem), tuner3->getTime(problem)), (double)1 / problems.getSize());
+                               }
+                               double result = 1;
+                               for (uint l = 0; l < problems.getSize(); l++) {
+                                       result *= mintimes[l];
+                               }
+                               if (result < score) {
+                                       score = result;
+                                       bestTuners[0] = tuner1;
+                                       bestTuners[1] = tuner2;
+                                       bestTuners[2] = tuner3;
+                               }
+                       }
+               }
+       }
+       model_print("Best 3 tuners:\n");
+       for (uint i = 0; i < 3; i++) {
+               TunerRecord *tuner = bestTuners[i];
+               SearchTuner *stun = tuner->getTuner();
+               char buffer[512];
+               snprintf(buffer, sizeof(buffer), "best%u.tuner", i);
+               stun->serialize(buffer);
+               model_print("Tuner %u\n", tuner->getTunerNumber());
+               stun->print();
+               tuner->printProblemsInfo();
+               model_print("----------------------------------\n\n\n");
+       }
+}
+
+void CompTuner::readData(uint numRuns) {
+       for (uint i = 0; i < numRuns; i++) {
+               ifstream myfile;
+               char buffer[512];
+               uint tunernumber;
+               snprintf(buffer, sizeof(buffer), "tunernum%u", i);
+               myfile.open (buffer, ios::in);
+               myfile >> tunernumber;
+               myfile.close();
+               if (allTuners.getSize() <= tunernumber)
+                       allTuners.setSize(tunernumber + 1);
+               if (allTuners.get(tunernumber) == NULL) {
+                       snprintf(buffer, sizeof(buffer), "tuner%u", i);
+                       allTuners.set(tunernumber, new TunerRecord(new SearchTuner(buffer), tunernumber));
+               }
+               //Add any new used records
+               snprintf(buffer, sizeof(buffer), "tuner%uused", i);
+               TunerRecord *tuner = allTuners.get(tunernumber);
+               tuner->getTuner()->addUsed(buffer);
+
+               char problemname[512];
+               uint problemnumber;
+               snprintf(buffer, sizeof(buffer), "problem%u", i);
+               myfile.open(buffer, ios::in);
+               myfile.getline(problemname, sizeof(problemname));
+               myfile >> problemnumber;
+               myfile.close();
+               if (problems.getSize() <= problemnumber)
+                       problems.setSize(problemnumber + 1);
+               if (problems.get(problemnumber) == NULL)
+                       problems.set(problemnumber, new Problem(problemname));
+               Problem *problem = problems.get(problemnumber);
+               long long metric = -1;
+               int sat = IS_INDETER;
+               //Read data in from results file
+               snprintf(buffer, sizeof(buffer), "result%u", i);
+
+               myfile.open (buffer, ios::in);
+
+
+               if (myfile.is_open()) {
+                       myfile >> metric;
+                       myfile >> sat;
+                       myfile.close();
+               }
+               if (problem->getResult() == TUNERUNSETVALUE && sat != IS_INDETER) {
+                       problem->setResult(sat);
+               } else if (problem->getResult() != sat && sat != IS_INDETER) {
+                       model_print("******** Result has changed ********\n");
+               }
+
+               if (metric != -1) {
+                       if (tuner->getTime(problem) == -1)
+                               tuner->addProblem(problem);
+                       tuner->setTime(problem, metric);
+               }
+
+       }
+
+}
+
+void CompTuner::tune() {
+       Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
+       for (uint b = 0; b < budget; b++) {
+               model_print("Round %u of %u\n", b, budget);
+               uint tSize = tunerV->getSize();
+               for (uint i = 0; i < tSize; i++) {
+                       SearchTuner *tmpTuner = mutateTuner(tunerV->get(i)->getTuner(), b);
+                       TunerRecord *tmp = new TunerRecord(tmpTuner);
+                       tmp->setTunerNumber(allTuners.getSize());
+                       model_print("Mutated tuner %u to generate tuner %u\n", tunerV->get(i)->getTunerNumber(), tmp->getTunerNumber());
+                       allTuners.push(tmp);
+                       tunerV->push(tmp);
+               }
+
+               Hashtable<TunerRecord *, int, uint64_t> scores;
+               for (uint i = 0; i < problems.getSize(); i++) {
+                       Problem *problem = problems.get(i);
+                       Vector<TunerRecord *> places;
+                       for (uint j = 0; j < tunerV->getSize(); j++) {
+                               TunerRecord *tuner = tunerV->get(j);
+                               long long metric = tuner->getTime(problem);
+                               if (metric == -1) {
+                                       metric = evaluate(problem, tuner);
+                                       if (tuner->getTime(problem) == -1) {
+                                               tuner->addProblem(problem);
+                                       }
+                                       model_print("%u.Problem<%s>\tTuner<%p, %d>\tMetric<%lld>\n", i, problem->getProblem(),tuner, tuner->getTunerNumber(), metric);
+                                       model_print("*****************************\n");
+                                       if (metric != -1)
+                                               tuner->setTime(problem, metric);
+                                       else
+                                               tuner->setTime(problem, -2);
+                               }
+                               if (metric >= 0) {
+                                       uint k = 0;
+                                       for (; k < places.getSize(); k++) {
+                                               if (metric < places.get(k)->getTime(problem))
+                                                       break;
+                                       }
+                                       model_print("place[%u]=Tuner<%p,%d>\n", k, tuner, tuner->getTunerNumber());
+                                       places.insertAt(k, tuner);
+                               }
+                       }
+                       int points = 9;
+                       for (uint k = 0; k < places.getSize() && points; k++) {
+                               TunerRecord *tuner = places.get(k);
+                               int currScore = 0;
+                               if (scores.contains(tuner))
+                                       currScore = scores.get(tuner);
+                               currScore += points;
+                               model_print("Problem<%s>\tTuner<%p,%d>\tmetric<%d>\n", problem->getProblem(), tuner, tuner->getTunerNumber(),  currScore);
+                               model_print("**************************\n");
+                               scores.put(tuner, currScore);
+                               points = points / 3;
+                       }
+               }
+               Vector<TunerRecord *> ranking;
+               for (uint i = 0; i < tunerV->getSize(); i++) {
+                       TunerRecord *tuner = tunerV->get(i);
+                       int score = 0;
+                       if (scores.contains(tuner))
+                               score = scores.get(tuner);
+                       uint j = 0;
+                       for (; j < ranking.getSize(); j++) {
+                               TunerRecord *t = ranking.get(j);
+                               int tscore = 0;
+                               if (scores.contains(t))
+                                       tscore = scores.get(t);
+                               if (score > tscore)
+                                       break;
+                       }
+                       model_print("ranking[%u]=tuner<%p,%u>(Score=%d)\n", j, tuner, tuner->getTunerNumber(), score);
+                       model_print("************************\n");
+                       ranking.insertAt(j, tuner);
+               }
+               model_print("tunerSize=%u\trankingSize=%u\ttunerVSize=%u\n", tuners.getSize(), ranking.getSize(), tunerV->getSize());
+               for (uint i = tuners.getSize(); i < ranking.getSize(); i++) {
+                       TunerRecord *tuner = ranking.get(i);
+                       model_print("Removing tuner %u\n", tuner->getTunerNumber());
+                       for (uint j = 0; j < tunerV->getSize(); j++) {
+                               if (tunerV->get(j) == tuner)
+                                       tunerV->removeAt(j);
+                       }
+               }
+       }
+       printData();
+}

diff --git a/src/Tuner/comptuner.h b/src/Tuner/comptuner.h
new file mode 100644 (file)
index 0000000..dd28105
--- /dev/null
+++ b/src/Tuner/comptuner.h
@@ -0,0 +1,24 @@
+#ifndef COMPTUNER_H
+#define COMPTUNER_H
+#include "classlist.h"
+#include "structs.h"
+#include "basictuner.h"
+
+
+class CompTuner : public BasicTuner {
+public:
+       CompTuner(uint budget, uint timeout);
+       virtual ~CompTuner();
+       void readData(uint numRuns);
+       void tune();
+       void findBestThreeTuners();
+protected:
+       
+};
+
+inline long long min(long long num1, long long num2, long long num3) {
+       return num1 < num2 && num1 < num3 ? num1 :
+                                num2 < num3 ? num2 : num3;
+}
+
+#endif

diff --git a/src/Tuner/kmeanstuner.cc b/src/Tuner/kmeanstuner.cc
new file mode 100644 (file)
index 0000000..333d9d9
--- /dev/null
+++ b/src/Tuner/kmeanstuner.cc
@@ -0,0 +1,144 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   kmeanstuner.cc
+ * Author: hamed
+ * 
+ * Created on December 19, 2018, 4:16 PM
+ */
+
+#include "kmeanstuner.h"
+#include "float.h"
+#include "searchtuner.h"
+#include "math.h"
+
+KMeansTuner::KMeansTuner(uint budget, uint _rounds, uint timeout) : 
+       BasicTuner(budget, timeout),
+       rounds(_rounds) {
+}
+
+KMeansTuner::~KMeansTuner() {
+}
+
+void clearVector(Vector<TunerRecord *> *tunerV) {
+       for (uint j = 0; j < tunerV->getSize(); j++) {
+               TunerRecord *tuner = tunerV->get(j);
+               tuner->problems.clear();
+       }
+}
+
+void KMeansTuner::tune() {
+       Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
+       for (uint i = 0; i < rounds; i++) {
+               clearVector(tunerV);
+               mapProblemsToTuners(tunerV);
+               improveTuners(tunerV);
+       }
+       model_print("Best tuners\n");
+       for (uint j = 0; j < tunerV->getSize(); j++) {
+               TunerRecord *tuner = tunerV->get(j);
+               char buffer[256];
+               sprintf(buffer, "tuner%u.conf", j);
+               tuner->getTuner()->serialize(buffer);
+               tuner->getTuner()->print();
+       }
+       delete tunerV;
+}
+
+void KMeansTuner::improveTuners(Vector<TunerRecord *> *tunerV) {
+       for (uint j = 0; j < tunerV->getSize(); j++) {
+               TunerRecord *tuner = tunerV->get(j);
+               TunerRecord *newtuner = tune(tuner);
+               tunerV->set(j, newtuner);
+       }
+}
+
+double KMeansTuner::evaluateAll(TunerRecord *tuner) {
+       double product = 1;
+       for (uint i = 0; i < tuner->problemsSize(); i++) {
+               Problem *problem = tuner->getProblem(i);
+               long long metric = tuner->getTime(problem);
+               if (metric == -1) {
+                       metric = evaluate(problem, tuner);
+                       if (metric != -1)
+                               tuner->setTime(problem, metric);
+                       else
+                               tuner->setTime(problem, -2);
+               }
+
+               double score = metric;
+               if (metric < 0)
+                       score = timeout;
+               product *= score;
+       }
+       return pow(product, 1 / ((double)tuner->problemsSize()));
+}
+
+TunerRecord *KMeansTuner::tune(TunerRecord *tuner) {
+       TunerRecord *bestTuner = NULL;
+       double bestScore = DBL_MAX;
+
+       TunerRecord *oldTuner = tuner;
+       double base_temperature = evaluateAll(oldTuner);
+       double oldScore = base_temperature;
+
+       for (uint i = 0; i < budget; i++) {
+               SearchTuner *tmpTuner = mutateTuner(oldTuner->getTuner(), i);
+               TunerRecord *newTuner = oldTuner->changeTuner(tmpTuner);
+               newTuner->setTunerNumber( allTuners.getSize() );
+               allTuners.push(newTuner);
+               double newScore = evaluateAll(newTuner);
+               newTuner->getTuner()->printUsed();
+               model_print("Received score %f\n", newScore);
+               double scoreDiff = newScore - oldScore; //smaller is better
+               if (newScore < bestScore) {
+                       bestScore = newScore;
+                       bestTuner = newTuner;
+               }
+
+               double acceptanceP;
+               if (scoreDiff < 0) {
+                       acceptanceP = 1;
+               } else {
+                       double currTemp = base_temperature * (((double)budget - i) / budget);
+                       acceptanceP = exp(-scoreDiff / currTemp);
+               }
+               double ran = ((double)random()) / RAND_MAX;
+               if (ran <= acceptanceP) {
+                       oldScore = newScore;
+                       oldTuner = newTuner;
+               }
+       }
+
+       return bestTuner;
+}
+
+void KMeansTuner::mapProblemsToTuners(Vector<TunerRecord *> *tunerV) {
+       for (uint i = 0; i < problems.getSize(); i++) {
+               Problem *problem = problems.get(i);
+               TunerRecord *bestTuner = NULL;
+               long long bestscore = 0;
+               for (uint j = 0; j < tunerV->getSize(); j++) {
+                       TunerRecord *tuner = tunerV->get(j);
+                       long long metric = tuner->getTime(problem);
+                       if (metric == -1) {
+                               metric = evaluate(problem, tuner);
+                               if (metric != -1)
+                                       tuner->setTime(problem, metric);
+                               else
+                                       tuner->setTime(problem, -2);
+                       }
+                       if ((bestTuner == NULL && metric >= 0) ||
+                                       (metric < bestscore && metric >= 0)) {
+                               bestTuner = tuner;
+                               bestscore = metric;
+                       }
+               }
+               if (bestTuner != NULL)
+                       bestTuner->addProblem(problem);
+       }
+}
\ No newline at end of file

diff --git a/src/Tuner/kmeanstuner.h b/src/Tuner/kmeanstuner.h
new file mode 100644 (file)
index 0000000..a6025a3
--- /dev/null
+++ b/src/Tuner/kmeanstuner.h
@@ -0,0 +1,34 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/* 
+ * File:   kmeanstuner.h
+ * Author: hamed
+ *
+ * Created on December 19, 2018, 4:16 PM
+ */
+
+#ifndef KMEANSTUNER_H
+#define KMEANSTUNER_H
+
+#include "basictuner.h"
+
+
+class KMeansTuner : public BasicTuner {
+public:
+       KMeansTuner(uint budget, uint rounds, uint timeout );
+       virtual ~KMeansTuner();
+       void tune();
+private:
+       double evaluateAll(TunerRecord *tuner);
+       void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);
+       void improveTuners(Vector<TunerRecord *> *tunerV);
+       TunerRecord *tune(TunerRecord *tuner);
+       uint rounds;
+};
+
+#endif /* KMEANSTUNER_H */
+

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
deleted file mode 100644 (file)
index 743d4cb..0000000
--- a/src/Tuner/multituner.cc
+++ /dev/null
@@ -1,327 +0,0 @@
-#include "multituner.h"
-#include <float.h>
-#include <math.h>
-#include "searchtuner.h"
-#include <iostream>
-#include <fstream>
-#include "solver_interface.h"
-
-MultiTuner::MultiTuner(uint _budget, uint _rounds, uint _timeout) :
-       BasicTuner(_budget, _timeout),
-       rounds(_rounds)
-{
-}
-
-void MultiTuner::findBestThreeTuners() {
-       if (allTuners.getSize() < 3) {
-               printData();
-               return;
-       }
-       TunerRecord *bestTuners[3];
-       double score = DBL_MAX;
-       for (uint i = 0; i < allTuners.getSize() - 2; i++) {
-               for (uint j = i + 1; j < allTuners.getSize() - 1; j++) {
-                       for (uint k = j + 1; k < allTuners.getSize(); k++) {
-                               TunerRecord *tuner1 = allTuners.get(i);
-                               TunerRecord *tuner2 = allTuners.get(j);
-                               TunerRecord *tuner3 = allTuners.get(k);
-                               double mintimes[problems.getSize()];
-                               for (uint l = 0; l < problems.getSize(); l++) {
-                                       Problem *problem = problems.get(l);
-                                       mintimes[l] = pow(min(tuner1->getTime(problem), tuner2->getTime(problem), tuner3->getTime(problem)), (double)1 / problems.getSize());
-                               }
-                               double result = 1;
-                               for (uint l = 0; l < problems.getSize(); l++) {
-                                       result *= mintimes[l];
-                               }
-                               if (result < score) {
-                                       score = result;
-                                       bestTuners[0] = tuner1;
-                                       bestTuners[1] = tuner2;
-                                       bestTuners[2] = tuner3;
-                               }
-                       }
-               }
-       }
-       model_print("Best 3 tuners:\n");
-       for (uint i = 0; i < 3; i++) {
-               TunerRecord *tuner = bestTuners[i];
-               SearchTuner *stun = tuner->getTuner();
-               char buffer[512];
-               snprintf(buffer, sizeof(buffer), "best%u.tuner", i);
-               stun->serialize(buffer);
-               model_print("Tuner %u\n", tuner->getTunerNumber());
-               stun->print();
-               tuner->printProblemsInfo();
-               model_print("----------------------------------\n\n\n");
-       }
-}
-
-void MultiTuner::readData(uint numRuns) {
-       for (uint i = 0; i < numRuns; i++) {
-               ifstream myfile;
-               char buffer[512];
-               uint tunernumber;
-               snprintf(buffer, sizeof(buffer), "tunernum%u", i);
-               myfile.open (buffer, ios::in);
-               myfile >> tunernumber;
-               myfile.close();
-               if (allTuners.getSize() <= tunernumber)
-                       allTuners.setSize(tunernumber + 1);
-               if (allTuners.get(tunernumber) == NULL) {
-                       snprintf(buffer, sizeof(buffer), "tuner%u", i);
-                       allTuners.set(tunernumber, new TunerRecord(new SearchTuner(buffer), tunernumber));
-               }
-               //Add any new used records
-               snprintf(buffer, sizeof(buffer), "tuner%uused", i);
-               TunerRecord *tuner = allTuners.get(tunernumber);
-               tuner->getTuner()->addUsed(buffer);
-
-               char problemname[512];
-               uint problemnumber;
-               snprintf(buffer, sizeof(buffer), "problem%u", i);
-               myfile.open(buffer, ios::in);
-               myfile.getline(problemname, sizeof(problemname));
-               myfile >> problemnumber;
-               myfile.close();
-               if (problems.getSize() <= problemnumber)
-                       problems.setSize(problemnumber + 1);
-               if (problems.get(problemnumber) == NULL)
-                       problems.set(problemnumber, new Problem(problemname));
-               Problem *problem = problems.get(problemnumber);
-               long long metric = -1;
-               int sat = IS_INDETER;
-               //Read data in from results file
-               snprintf(buffer, sizeof(buffer), "result%u", i);
-
-               myfile.open (buffer, ios::in);
-
-
-               if (myfile.is_open()) {
-                       myfile >> metric;
-                       myfile >> sat;
-                       myfile.close();
-               }
-               if (problem->getResult() == TUNERUNSETVALUE && sat != IS_INDETER) {
-                       problem->setResult(sat);
-               } else if (problem->getResult() != sat && sat != IS_INDETER) {
-                       model_print("******** Result has changed ********\n");
-               }
-
-               if (metric != -1) {
-                       if (tuner->getTime(problem) == -1)
-                               tuner->addProblem(problem);
-                       tuner->setTime(problem, metric);
-               }
-
-       }
-
-}
-
-void MultiTuner::tune() {
-       Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
-       for (uint b = 0; b < budget; b++) {
-               model_print("Round %u of %u\n", b, budget);
-               uint tSize = tunerV->getSize();
-               for (uint i = 0; i < tSize; i++) {
-                       SearchTuner *tmpTuner = mutateTuner(tunerV->get(i)->getTuner(), b);
-                       TunerRecord *tmp = new TunerRecord(tmpTuner);
-                       tmp->setTunerNumber(allTuners.getSize());
-                       model_print("Mutated tuner %u to generate tuner %u\n", tunerV->get(i)->getTunerNumber(), tmp->getTunerNumber());
-                       allTuners.push(tmp);
-                       tunerV->push(tmp);
-               }
-
-               Hashtable<TunerRecord *, int, uint64_t> scores;
-               for (uint i = 0; i < problems.getSize(); i++) {
-                       Problem *problem = problems.get(i);
-                       Vector<TunerRecord *> places;
-                       for (uint j = 0; j < tunerV->getSize(); j++) {
-                               TunerRecord *tuner = tunerV->get(j);
-                               long long metric = tuner->getTime(problem);
-                               if (metric == -1) {
-                                       metric = evaluate(problem, tuner);
-                                       if (tuner->getTime(problem) == -1) {
-                                               tuner->addProblem(problem);
-                                       }
-                                       model_print("%u.Problem<%s>\tTuner<%p, %d>\tMetric<%lld>\n", i, problem->getProblem(),tuner, tuner->getTunerNumber(), metric);
-                                       model_print("*****************************\n");
-                                       if (metric != -1)
-                                               tuner->setTime(problem, metric);
-                                       else
-                                               tuner->setTime(problem, -2);
-                               }
-                               if (metric >= 0) {
-                                       uint k = 0;
-                                       for (; k < places.getSize(); k++) {
-                                               if (metric < places.get(k)->getTime(problem))
-                                                       break;
-                                       }
-                                       model_print("place[%u]=Tuner<%p,%d>\n", k, tuner, tuner->getTunerNumber());
-                                       places.insertAt(k, tuner);
-                               }
-                       }
-                       int points = 9;
-                       for (uint k = 0; k < places.getSize() && points; k++) {
-                               TunerRecord *tuner = places.get(k);
-                               int currScore = 0;
-                               if (scores.contains(tuner))
-                                       currScore = scores.get(tuner);
-                               currScore += points;
-                               model_print("Problem<%s>\tTuner<%p,%d>\tmetric<%d>\n", problem->getProblem(), tuner, tuner->getTunerNumber(),  currScore);
-                               model_print("**************************\n");
-                               scores.put(tuner, currScore);
-                               points = points / 3;
-                       }
-               }
-               Vector<TunerRecord *> ranking;
-               for (uint i = 0; i < tunerV->getSize(); i++) {
-                       TunerRecord *tuner = tunerV->get(i);
-                       int score = 0;
-                       if (scores.contains(tuner))
-                               score = scores.get(tuner);
-                       uint j = 0;
-                       for (; j < ranking.getSize(); j++) {
-                               TunerRecord *t = ranking.get(j);
-                               int tscore = 0;
-                               if (scores.contains(t))
-                                       tscore = scores.get(t);
-                               if (score > tscore)
-                                       break;
-                       }
-                       model_print("ranking[%u]=tuner<%p,%u>(Score=%d)\n", j, tuner, tuner->getTunerNumber(), score);
-                       model_print("************************\n");
-                       ranking.insertAt(j, tuner);
-               }
-               model_print("tunerSize=%u\trankingSize=%u\ttunerVSize=%u\n", tuners.getSize(), ranking.getSize(), tunerV->getSize());
-               for (uint i = tuners.getSize(); i < ranking.getSize(); i++) {
-                       TunerRecord *tuner = ranking.get(i);
-                       model_print("Removing tuner %u\n", tuner->getTunerNumber());
-                       for (uint j = 0; j < tunerV->getSize(); j++) {
-                               if (tunerV->get(j) == tuner)
-                                       tunerV->removeAt(j);
-                       }
-               }
-       }
-       printData();
-}
-
-void MultiTuner::mapProblemsToTuners(Vector<TunerRecord *> *tunerV) {
-       for (uint i = 0; i < problems.getSize(); i++) {
-               Problem *problem = problems.get(i);
-               TunerRecord *bestTuner = NULL;
-               long long bestscore = 0;
-               for (uint j = 0; j < tunerV->getSize(); j++) {
-                       TunerRecord *tuner = tunerV->get(j);
-                       long long metric = tuner->getTime(problem);
-                       if (metric == -1) {
-                               metric = evaluate(problem, tuner);
-                               if (metric != -1)
-                                       tuner->setTime(problem, metric);
-                               else
-                                       tuner->setTime(problem, -2);
-                       }
-                       if ((bestTuner == NULL && metric >= 0) ||
-                                       (metric < bestscore && metric >= 0)) {
-                               bestTuner = tuner;
-                               bestscore = metric;
-                       }
-               }
-               if (bestTuner != NULL)
-                       bestTuner->addProblem(problem);
-       }
-}
-
-void clearVector(Vector<TunerRecord *> *tunerV) {
-       for (uint j = 0; j < tunerV->getSize(); j++) {
-               TunerRecord *tuner = tunerV->get(j);
-               tuner->problems.clear();
-       }
-}
-
-void MultiTuner::tuneK() {
-       Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
-       for (uint i = 0; i < rounds; i++) {
-               clearVector(tunerV);
-               mapProblemsToTuners(tunerV);
-               improveTuners(tunerV);
-       }
-       model_print("Best tuners\n");
-       for (uint j = 0; j < tunerV->getSize(); j++) {
-               TunerRecord *tuner = tunerV->get(j);
-               char buffer[256];
-               sprintf(buffer, "tuner%u.conf", j);
-               tuner->getTuner()->serialize(buffer);
-               tuner->getTuner()->print();
-       }
-       delete tunerV;
-}
-
-void MultiTuner::improveTuners(Vector<TunerRecord *> *tunerV) {
-       for (uint j = 0; j < tunerV->getSize(); j++) {
-               TunerRecord *tuner = tunerV->get(j);
-               TunerRecord *newtuner = tune(tuner);
-               tunerV->set(j, newtuner);
-       }
-}
-
-double MultiTuner::evaluateAll(TunerRecord *tuner) {
-       double product = 1;
-       for (uint i = 0; i < tuner->problemsSize(); i++) {
-               Problem *problem = tuner->getProblem(i);
-               long long metric = tuner->getTime(problem);
-               if (metric == -1) {
-                       metric = evaluate(problem, tuner);
-                       if (metric != -1)
-                               tuner->setTime(problem, metric);
-                       else
-                               tuner->setTime(problem, -2);
-               }
-
-               double score = metric;
-               if (metric < 0)
-                       score = timeout;
-               product *= score;
-       }
-       return pow(product, 1 / ((double)tuner->problemsSize()));
-}
-
-TunerRecord *MultiTuner::tune(TunerRecord *tuner) {
-       TunerRecord *bestTuner = NULL;
-       double bestScore = DBL_MAX;
-
-       TunerRecord *oldTuner = tuner;
-       double base_temperature = evaluateAll(oldTuner);
-       double oldScore = base_temperature;
-
-       for (uint i = 0; i < budget; i++) {
-               SearchTuner *tmpTuner = mutateTuner(oldTuner->getTuner(), i);
-               TunerRecord *newTuner = oldTuner->changeTuner(tmpTuner);
-               newTuner->setTunerNumber( allTuners.getSize() );
-               allTuners.push(newTuner);
-               double newScore = evaluateAll(newTuner);
-               newTuner->getTuner()->printUsed();
-               model_print("Received score %f\n", newScore);
-               double scoreDiff = newScore - oldScore; //smaller is better
-               if (newScore < bestScore) {
-                       bestScore = newScore;
-                       bestTuner = newTuner;
-               }
-
-               double acceptanceP;
-               if (scoreDiff < 0) {
-                       acceptanceP = 1;
-               } else {
-                       double currTemp = base_temperature * (((double)budget - i) / budget);
-                       acceptanceP = exp(-scoreDiff / currTemp);
-               }
-               double ran = ((double)random()) / RAND_MAX;
-               if (ran <= acceptanceP) {
-                       oldScore = newScore;
-                       oldTuner = newTuner;
-               }
-       }
-
-       return bestTuner;
-}
-

diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
deleted file mode 100644 (file)
index cf42d9f..0000000
--- a/src/Tuner/multituner.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef MULTITUNER_H
-#define MULTITUNER_H
-#include "classlist.h"
-#include "structs.h"
-#include "basictuner.h"
-
-
-class MultiTuner : public BasicTuner {
-public:
-       MultiTuner(uint budget, uint rounds, uint timeout);
-       void readData(uint numRuns);
-       void tuneK();
-       void tune();
-       void findBestThreeTuners();
-protected:
-       double evaluateAll(TunerRecord *tuner);
-       void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);
-       void improveTuners(Vector<TunerRecord *> *tunerV);
-       TunerRecord *tune(TunerRecord *tuner);
-       uint rounds;
-};
-
-inline long long min(long long num1, long long num2, long long num3) {
-       return num1 < num2 && num1 < num3 ? num1 :
-                                num2 < num3 ? num2 : num3;
-}
-
-#endif

diff --git a/src/Tuner/randomtuner.cc b/src/Tuner/randomtuner.cc
index 1c1a0f3..2b0701c 100644 (file)
--- a/src/Tuner/randomtuner.cc
+++ b/src/Tuner/randomtuner.cc
@@ -1,7 +1,7 @@
 #include "randomtuner.h"
 #include "csolver.h"
 #include "searchtuner.h"
 #include "randomtuner.h"
 #include "csolver.h"
 #include "searchtuner.h"

-#include "multituner.h"
+#include "comptuner.h"

 #include <math.h>
 #include <stdlib.h>
 #include <limits>
 #include <math.h>
 #include <stdlib.h>
 #include <limits>


@@ -12,6 +12,10 @@ RandomTuner::RandomTuner(uint _budget, uint _timeout) :
        BasicTuner(_budget, _timeout) {
 }
 
        BasicTuner(_budget, _timeout) {
 }
 

+RandomTuner::~RandomTuner(){
+       
+}
+

 void RandomTuner::tune() {
        for (uint r = 0; r < budget; r++) {
                model_print("Round %u of %u\n", r, budget);
 void RandomTuner::tune() {
        for (uint r = 0; r < budget; r++) {
                model_print("Round %u of %u\n", r, budget);

diff --git a/src/Tuner/randomtuner.h b/src/Tuner/randomtuner.h
index bc063f0..75b8800 100644 (file)
--- a/src/Tuner/randomtuner.h
+++ b/src/Tuner/randomtuner.h
@@ -2,7 +2,7 @@
 #define RANDOMTUNER_H
 #include "classlist.h"
 #include "structs.h"
 #define RANDOMTUNER_H
 #include "classlist.h"
 #include "structs.h"

-#include "multituner.h"
+#include "comptuner.h"

 #include "basictuner.h"
 
 /**
 #include "basictuner.h"
 
 /**


@@ -11,6 +11,7 @@
 class RandomTuner : public BasicTuner {
 public:
        RandomTuner(uint _budget, uint _timeout);
 class RandomTuner : public BasicTuner {
 public:
        RandomTuner(uint _budget, uint _timeout);

+       virtual ~RandomTuner();

        void tune();
 protected:
         bool randomMutation(SearchTuner *tuner);        
        void tune();
 protected:
         bool randomMutation(SearchTuner *tuner);        

diff --git a/src/classlist.h b/src/classlist.h
index cccf689..c182063 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -57,7 +57,7 @@ class OrderEdge;
 class DOREdge;
 
 class AutoTuner;
 class DOREdge;
 
 class AutoTuner;

-class MultiTuner;
+class CompTuner;

 class SearchTuner;
 class TunableSetting;
 
 class SearchTuner;
 class TunableSetting;