Bug fix: besttime for each problem

[satune.git] / src / Tuner / multituner.cc

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index 851dc5321a570aa81fe94c8dac891fe289387c5a..e872fac42f92f23dec32841ffa8c616395a00094 100644 (file)
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -7,10 +7,11 @@
 #include <string.h>
 #include <iostream>
 #include <fstream>
+#include <limits>
 
 #define UNSETVALUE -1
 
-Problem::Problem(const char *_problem) : problemnumber(-1), result(UNSETVALUE) {
+Problem::Problem(const char *_problem) : problemnumber(-1), result(UNSETVALUE) , besttime(std::numeric_limits<double>::infinity()){
        uint len = strlen(_problem);
        problem = (char *) ourmalloc(len + 1);
        memcpy(problem, _problem, len + 1);
@@ -193,7 +194,7 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
                        myfile >> sat;
                        myfile.close();
                }
-
+               updateTimeout(problem, metric);
                snprintf(buffer, sizeof(buffer), "tuner%uused", execnum);
                tuner->getTuner()->addUsed(buffer);
        }
@@ -205,9 +206,29 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
        } else if (problem->result != sat && sat != IS_INDETER) {
                model_print("******** Result has changed ********\n");
        }
+       if(sat == IS_INDETER && metric != -1){ //The case when we have a timeout
+               metric = -1; 
+       }
        return metric;
 }
 
+void MultiTuner::updateTimeout(Problem *problem, long long metric){
+       double currentTime= metric / NANOSEC;
+       if(currentTime < problem->besttime){
+               problem->besttime = currentTime;
+       }
+       uint adoptive;
+       if(problem->besttime > 30){
+               adoptive = problem->besttime * 5;
+       }else {
+               adoptive = 150;
+       }
+       if(adoptive < timeout){
+               timeout = adoptive;
+       }
+       LOG("Timeout=%u\tadoptive%u\tcurrentTime=%f\n", timeout, adoptive, currentTime);
+}
+
 void MultiTuner::tuneComp() {
        Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
        for (uint b = 0; b < budget; b++) {
@@ -231,8 +252,11 @@ void MultiTuner::tuneComp() {
                                long long metric = tuner->getTime(problem);
                                if (metric == -1) {
                                        metric = evaluate(problem, tuner);
-                                       if (tuner->getTime(problem) == -1)
+                                       if (tuner->getTime(problem) == -1) {
                                                tuner->problems.push(problem);
+                                       }
+                                       LOG("%u.Problem<%s>\tTuner<%p, %d>\tMetric<%lld>\n", i, problem->problem,tuner, tuner->tunernumber, metric);
+                                       LOG("*****************************\n");
                                        if (metric != -1)
                                                tuner->setTime(problem, metric);
                                }
@@ -242,18 +266,21 @@ void MultiTuner::tuneComp() {
                                                if (metric < places.get(k)->getTime(problem))
                                                        break;
                                        }
+                                       LOG("place[%u]=Tuner<%p,%d>\n", k, tuner, tuner->tunernumber);
                                        places.insertAt(k, tuner);
                                }
                        }
                        int points = 9;
                        for (uint k = 0; k < places.getSize() && points; k++) {
                                TunerRecord *tuner = places.get(k);
-                               points = points / 3;
                                int currScore = 0;
                                if (scores.contains(tuner))
                                        currScore = scores.get(tuner);
                                currScore += points;
+                               LOG("Problem<%s>\tTuner<%p,%d>\tmetric<%d>\n", problem->problem, tuner, tuner->tunernumber,  currScore);
+                               LOG("**************************\n");
                                scores.put(tuner, currScore);
+                               points = points / 3;
                        }
                }
                Vector<TunerRecord *> ranking;
@@ -268,15 +295,18 @@ void MultiTuner::tuneComp() {
                                int tscore = 0;
                                if (scores.contains(t))
                                        tscore = scores.get(t);
-                               if (score < tscore)
+                               if (score > tscore)
                                        break;
                        }
+                       LOG("ranking[%u]=tuner<%p,%u>(Score=%d)\n", j, tuner, tuner->tunernumber, score);
+                       LOG("************************\n");
                        ranking.insertAt(j, tuner);
                }
+               LOG("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);
+                       LOG("Removing tuner %u\n", tuner->tunernumber);
                        for (uint j = 0; j < tunerV->getSize(); j++) {
-                               model_print("Removing tuner %u\n", tuner->tunernumber);
                                if (tunerV->get(j) == tuner)
                                        tunerV->removeAt(j);
                        }