X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FTuner%2Fmultituner.cc;h=64f67aed459a93601886b0b21486e676115828b9;hp=3961d2bea308df84c3e023fe54e80c7b0915cd72;hb=bb95e237d699d0c859ef948399b63651d21d432e;hpb=3e492a6164d89275fcfe9455b70c427425fe8973

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index 3961d2b..64f67ae 100644
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -7,10 +7,16 @@
 #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, uint _timeout) : 
+	problemnumber(-1),
+	result(UNSETVALUE) , 
+	besttime(std::numeric_limits<double>::infinity()),
+	timeout(_timeout)
+{
 	uint len = strlen(_problem);
 	problem = (char *) ourmalloc(len + 1);
 	memcpy(problem, _problem, len + 1);
@@ -50,7 +56,7 @@ MultiTuner::~MultiTuner() {
 }
 
 void MultiTuner::addProblem(const char *filename) {
-	Problem *p = new Problem(filename);
+	Problem *p = new Problem(filename, timeout);
 	p->problemnumber = problems.getSize();
 	problems.push(p);
 }
@@ -109,7 +115,7 @@ void MultiTuner::readData(uint numRuns) {
 		if (problems.getSize() <= problemnumber)
 			problems.setSize(problemnumber + 1);
 		if (problems.get(problemnumber) == NULL)
-			problems.set(problemnumber, new Problem(problemname));
+			problems.set(problemnumber, new Problem(problemname, timeout));
 		Problem *problem = problems.get(problemnumber);
 		long long metric = -1;
 		int sat = IS_INDETER;
@@ -174,7 +180,7 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 	tuner->getTuner()->serialize(buffer);
 
 	//Do run
-	snprintf(buffer, sizeof(buffer), "./run.sh deserializerun %s %u tuner%u result%u > log%u", problem->getProblem(), timeout, execnum, execnum, execnum);
+	snprintf(buffer, sizeof(buffer), "./run.sh deserializerun %s %u tuner%u result%u > log%u", problem->getProblem(), problem->timeout, execnum, execnum, execnum);
 	int status = system(buffer);
 
 	long long metric = -1;
@@ -193,7 +199,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 +211,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 < problem->timeout){
+		problem->timeout = adoptive;
+	}
+	LOG("Timeout=%u\tadoptive%u\tcurrentTime=%f\n", problem->timeout, adoptive, currentTime);
+}
+
 void MultiTuner::tuneComp() {
 	Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
 	for (uint b = 0; b < budget; b++) {
@@ -234,7 +260,7 @@ void MultiTuner::tuneComp() {
 					if (tuner->getTime(problem) == -1) {
 						tuner->problems.push(problem);
 					}
-					LOG("%u.Problem<%s>\tTuner<%d>\tMetric<%lld>\n", i, problem->problem,tuner->tunernumber, metric);
+					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);
@@ -245,7 +271,7 @@ void MultiTuner::tuneComp() {
 						if (metric < places.get(k)->getTime(problem))
 							break;
 					}
-					LOG("place[%u]=Tuner<%d>\n", k, tuner->tunernumber);
+					LOG("place[%u]=Tuner<%p,%d>\n", k, tuner, tuner->tunernumber);
 					places.insertAt(k, tuner);
 				}
 			}
@@ -256,7 +282,7 @@ void MultiTuner::tuneComp() {
 				if (scores.contains(tuner))
 					currScore = scores.get(tuner);
 				currScore += points;
-				LOG("Problem<%s>\tTuner<%d>\tmetric<%d>\n", problem->problem, tuner->tunernumber, currScore);
+				LOG("Problem<%s>\tTuner<%p,%d>\tmetric<%d>\n", problem->problem, tuner, tuner->tunernumber,  currScore);
 				LOG("**************************\n");
 				scores.put(tuner, currScore);
 				points = points / 3;
@@ -277,14 +303,14 @@ void MultiTuner::tuneComp() {
 				if (score > tscore)
 					break;
 			}
-			LOG("ranking[%u]=tuner<%d>(Score=%d)\n", j, tuner->tunernumber, score);
+			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);
-			model_print("Removing tuner %u\n", tuner->tunernumber);
+			LOG("Removing tuner %u\n", tuner->tunernumber);
 			for (uint j = 0; j < tunerV->getSize(); j++) {
 				if (tunerV->get(j) == tuner)
 					tunerV->removeAt(j);