Adoptive timeout ...

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

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index a9fe693fa92b258e3b272a682cffd0c0cf7ba34a..ec8bcb78a56fd5dd8c0d5e231e64b4b943bc30a3 100644 (file)
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -39,7 +39,7 @@ TunerRecord *TunerRecord::changeTuner(SearchTuner *_newtuner) {
 }
 
 MultiTuner::MultiTuner(uint _budget, uint _rounds, uint _timeout) :
-       budget(_budget), rounds(_rounds), timeout(_timeout), execnum(0) {
+       budget(_budget), rounds(_rounds), timeout(_timeout), besttime(_timeout), execnum(0) {
 }
 
 MultiTuner::~MultiTuner() {
@@ -193,7 +193,7 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
                        myfile >> sat;
                        myfile.close();
                }
-
+               updateTimeout(metric);
                snprintf(buffer, sizeof(buffer), "tuner%uused", execnum);
                tuner->getTuner()->addUsed(buffer);
        }
@@ -205,9 +205,28 @@ 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(long long metric){
+       double currentTime= metric / NANOSEC;
+       if(currentTime < besttime){
+               besttime = currentTime;
+       }
+       uint adoptive;
+       if(besttime > 30){
+               adoptive = besttime * 5;
+       }else {
+               adoptive = 150;
+       }
+       if(adoptive < timeout){
+               timeout = adoptive;
+       }
+}
+
 void MultiTuner::tuneComp() {
        Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
        for (uint b = 0; b < budget; b++) {
@@ -281,7 +300,7 @@ void MultiTuner::tuneComp() {
                        DEBUG("************************\n");
                        ranking.insertAt(j, tuner);
                }
-               DEBUG("tunerSize=%u\trankingSize=%u\ttunerVSize=%u\n", tuners.getSize(), ranking.getSize(), tunerV->getSize());
+               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);
                        model_print("Removing tuner %u\n", tuner->tunernumber);