Fix tuner issues

diff --git a/src/Tuner/autotuner.cc b/src/Tuner/autotuner.cc
index b769993e0205af0fb33b3fedb4b30478dfc55de0..1bf29d82cb2e46a89fa6c9bbfaf29103d4b219b3 100644 (file)
--- a/src/Tuner/autotuner.cc
+++ b/src/Tuner/autotuner.cc
@@ -11,6 +11,8 @@ AutoTuner::AutoTuner(uint _budget) :
        budget(_budget), result(UNSETVALUE) {
 }
 
        budget(_budget), result(UNSETVALUE) {
 }
 

+AutoTuner::~AutoTuner() {}
+

 void AutoTuner::addProblem(CSolver *solver) {
        solvers.push(solver);
 }
 void AutoTuner::addProblem(CSolver *solver) {
        solvers.push(solver);
 }

diff --git a/src/Tuner/autotuner.h b/src/Tuner/autotuner.h
index 8271008cb74ad4c2ceb560a56a56c49ad564c142..e9c7b40d608258ede13ddfbca78270deb393c536 100644 (file)
--- a/src/Tuner/autotuner.h
+++ b/src/Tuner/autotuner.h
@@ -9,6 +9,7 @@
 class AutoTuner {
 public:
        AutoTuner(uint budget);
 class AutoTuner {
 public:
        AutoTuner(uint budget);

+       virtual ~AutoTuner();

        void addProblem(CSolver *solver);
        virtual void tune();
        CMEMALLOC;
        void addProblem(CSolver *solver);
        virtual void tune();
        CMEMALLOC;

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index fbf66c7f1b9f9b462d6d1e559a98e3239b963b5e..03bfeec88b363fc68294453b7c05660ceb680fc4 100644 (file)
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -59,11 +59,11 @@ void MultiTuner::addTuner(SearchTuner *tuner) {
        allTuners.push(t);
 }
 
        allTuners.push(t);
 }
 

-long long MultiTuner::evaluate(Problem *problem, SearchTuner *tuner) {
+long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {

        char buffer[512];
        //Write out the tuner
        snprintf(buffer, sizeof(buffer), "tuner%u", execnum);
        char buffer[512];
        //Write out the tuner
        snprintf(buffer, sizeof(buffer), "tuner%u", execnum);

-       tuner->serialize(buffer);
+       tuner->getTuner()->serialize(buffer);

 
        //Do run
        snprintf(buffer, sizeof(buffer), "./run.sh deserializerun %s %u tuner%u result%s%u > log%u", problem->getProblem(), timeout, execnum, problem->getProblem(), execnum, execnum);
 
        //Do run
        snprintf(buffer, sizeof(buffer), "./run.sh deserializerun %s %u tuner%u result%s%u > log%u", problem->getProblem(), timeout, execnum, problem->getProblem(), execnum, execnum);


@@ -71,6 +71,7 @@ long long MultiTuner::evaluate(Problem *problem, SearchTuner *tuner) {
 
        long long metric = -1;
        int sat = IS_INDETER;
 
        long long metric = -1;
        int sat = IS_INDETER;

+

        if (status == 0) {
                //Read data in from results file
                snprintf(buffer, sizeof(buffer), "result%s%u", problem->getProblem(), execnum);
        if (status == 0) {
                //Read data in from results file
                snprintf(buffer, sizeof(buffer), "result%s%u", problem->getProblem(), execnum);


@@ -84,6 +85,12 @@ long long MultiTuner::evaluate(Problem *problem, SearchTuner *tuner) {
                        myfile >> sat;
                        myfile.close();
                }
                        myfile >> sat;
                        myfile.close();
                }

+
+               snprintf(buffer, sizeof(buffer), "tuner%uused", execnum);
+               SearchTuner *usedtuner = new SearchTuner(buffer);
+               delete tuner->getTuner();
+               tuner->updateTuner(usedtuner);
+

        }
        //Increment execution count
        execnum++;
        }
        //Increment execution count
        execnum++;


@@ -113,7 +120,7 @@ void MultiTuner::tuneComp() {
                                TunerRecord *tuner = tunerV->get(j);
                                long long metric = tuner->getTime(problem);
                                if (metric == -1) {
                                TunerRecord *tuner = tunerV->get(j);
                                long long metric = tuner->getTime(problem);
                                if (metric == -1) {

-                                       metric = evaluate(problem, tuner->getTuner());
+                                       metric = evaluate(problem, tuner);

                                        if (metric != -1)
                                                tuner->setTime(problem, metric);
                                }
                                        if (metric != -1)
                                                tuner->setTime(problem, metric);
                                }


@@ -173,7 +180,7 @@ void MultiTuner::mapProblemsToTuners(Vector<TunerRecord *> *tunerV) {
                        TunerRecord *tuner = tunerV->get(j);
                        long long metric = tuner->getTime(problem);
                        if (metric == -1) {
                        TunerRecord *tuner = tunerV->get(j);
                        long long metric = tuner->getTime(problem);
                        if (metric == -1) {

-                               metric = evaluate(problem, tuner->getTuner());
+                               metric = evaluate(problem, tuner);

                                if (metric != -1)
                                        tuner->setTime(problem, metric);
                        }
                                if (metric != -1)
                                        tuner->setTime(problem, metric);
                        }


@@ -227,7 +234,7 @@ double MultiTuner::evaluateAll(TunerRecord *tuner) {
                Problem *problem = tuner->problems.get(i);
                long long metric = tuner->getTime(problem);
                if (metric == -1) {
                Problem *problem = tuner->problems.get(i);
                long long metric = tuner->getTime(problem);
                if (metric == -1) {

-                       metric = evaluate(problem, tuner->getTuner());
+                       metric = evaluate(problem, tuner);

                        if (metric != -1)
                                tuner->setTime(problem, metric);
                }
                        if (metric != -1)
                                tuner->setTime(problem, metric);
                }

diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
index 1162e821c7c8ce38f91b41c0ccc544938c9b3f14..69430cc7408617776816ad9342bf82885def7d0b 100644 (file)
--- a/src/Tuner/multituner.h
+++ b/src/Tuner/multituner.h
@@ -22,6 +22,7 @@ public:
        TunerRecord(SearchTuner *_tuner) : tuner(_tuner) {}
        SearchTuner *getTuner() {return tuner;}
        TunerRecord *changeTuner(SearchTuner *_newtuner);
        TunerRecord(SearchTuner *_tuner) : tuner(_tuner) {}
        SearchTuner *getTuner() {return tuner;}
        TunerRecord *changeTuner(SearchTuner *_newtuner);

+       void updateTuner(SearchTuner *_newtuner) {tuner = _newtuner;}

        long long getTime(Problem *problem);
        void setTime(Problem *problem, long long time);
 private:
        long long getTime(Problem *problem);
        void setTime(Problem *problem, long long time);
 private:


@@ -42,7 +43,7 @@ public:
        void tuneComp();
        CMEMALLOC;
 protected:
        void tuneComp();
        CMEMALLOC;
 protected:

-       long long evaluate(Problem *problem, SearchTuner *tuner);
+       long long evaluate(Problem *problem, TunerRecord *tuner);

        double evaluateAll(TunerRecord *tuner);
        SearchTuner *mutateTuner(SearchTuner *oldTuner, uint k);
        void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);
        double evaluateAll(TunerRecord *tuner);
        SearchTuner *mutateTuner(SearchTuner *oldTuner, uint k);
        void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);