X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FTuner%2Fmultituner.cc;h=1cdeee2dd53973156799a56c5d8a97e427e31343;hp=cd8d7bb942407f23894df49729f8c922283689c9;hb=526e78e9379fb1cf98186f4195e8f52866e80063;hpb=c4d487198922b374ba6b2c7d744789c9d1d17735

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index cd8d7bb..1cdeee2 100644
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -8,9 +8,7 @@
 #include <iostream>
 #include <fstream>
 
-
 #define UNSETVALUE -1
-#define TIMEOUTSEC 5000
 
 Problem::Problem(const char *_problem) : result(UNSETVALUE) {
 	uint len = strlen(_problem);
@@ -47,6 +45,8 @@ MultiTuner::MultiTuner(uint _budget, uint _rounds, uint _timeout) :
 MultiTuner::~MultiTuner() {
 	for (uint i = 0; i < problems.getSize(); i++)
 		ourfree(problems.get(i));
+	for (uint i = 0; i < allTuners.getSize(); i++)
+		delete allTuners.get(i);
 }
 
 void MultiTuner::addProblem(const char *filename) {
@@ -54,24 +54,27 @@ void MultiTuner::addProblem(const char *filename) {
 }
 
 void MultiTuner::addTuner(SearchTuner *tuner) {
-	tuners.push(new TunerRecord(tuner));
+	TunerRecord *t = new TunerRecord(tuner);
+	tuners.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);
-	tuner->serialize(buffer);
+	tuner->getTuner()->serialize(buffer);
 
 	//Do run
-	snprintf(buffer, sizeof(buffer), "deserializerun %s %u tuner%u result%s%u > log%u", problem->getProblem(), timeout, execnum, problem->getProblem(), execnum, execnum);
+	snprintf(buffer, sizeof(buffer), "./run.sh deserializerun %s %u tuner%u result%u > log%u", problem->getProblem(), timeout, execnum, execnum, execnum);
 	int status = system(buffer);
 
 	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);
+		snprintf(buffer, sizeof(buffer), "result%u", execnum);
 
 		ifstream myfile;
 		myfile.open (buffer, ios::in);
@@ -82,6 +85,9 @@ long long MultiTuner::evaluate(Problem *problem, SearchTuner *tuner) {
 			myfile >> sat;
 			myfile.close();
 		}
+
+		snprintf(buffer, sizeof(buffer), "tuner%uused", execnum);
+		tuner->getTuner()->addUsed(buffer);
 	}
 	//Increment execution count
 	execnum++;
@@ -96,12 +102,70 @@ long long MultiTuner::evaluate(Problem *problem, SearchTuner *tuner) {
 
 void MultiTuner::tuneComp() {
 	Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
-	for (uint i = 0; i < problems.getSize(); i++) {
-		Problem *problem = problems.get(i);
-
+	for (uint b = 0; b < budget; b++) {
+		uint tSize = tunerV->getSize();
+		for (uint i = 0; i < tSize; i++) {
+			SearchTuner *tmpTuner = mutateTuner(tunerV->get(i)->getTuner(), b);
+			tunerV->push(new TunerRecord(tmpTuner));
+		}
 
+		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 (metric != -1)
+						tuner->setTime(problem, metric);
+				}
+				if (metric != -1) {
+					uint k = 0;
+					for (; k < places.getSize(); k++) {
+						if (metric < places.get(k)->getTime(problem))
+							break;
+					}
+					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;
+				scores.put(tuner, currScore);
+			}
+		}
+		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;
+			}
+			ranking.insertAt(j, tuner);
+		}
+		for (uint i = tuners.getSize(); i < ranking.getSize(); i++) {
+			TunerRecord *tuner = ranking.get(i);
+			for (uint j = 0; j < tunerV->getSize(); j++) {
+				if (tunerV->get(j) == tuner)
+					tunerV->removeAt(j);
+			}
+		}
 	}
-
 }
 
 void MultiTuner::mapProblemsToTuners(Vector<TunerRecord *> *tunerV) {
@@ -113,7 +177,7 @@ void MultiTuner::mapProblemsToTuners(Vector<TunerRecord *> *tunerV) {
 			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);
 			}
@@ -167,7 +231,7 @@ double MultiTuner::evaluateAll(TunerRecord *tuner) {
 		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);
 		}
@@ -202,6 +266,7 @@ TunerRecord *MultiTuner::tune(TunerRecord *tuner) {
 	for (uint i = 0; i < budget; i++) {
 		SearchTuner *tmpTuner = mutateTuner(oldTuner->getTuner(), i);
 		TunerRecord *newTuner = oldTuner->changeTuner(tmpTuner);
+		allTuners.push(newTuner);
 		double newScore = evaluateAll(newTuner);
 		newTuner->tuner->printUsed();
 		model_print("Received score %f\n", newScore);