X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2FTuner%2Fmultituner.cc;h=4715ade353532f0707166e3a95740832437c4599;hb=e368a6222771bc9876d56b4e6c16fdea896cab77;hp=f28e781fe3c915dbef2804e018eff622ffaf6a22;hpb=b0fc62509a89f906da9bc2731afa806f3cc293c5;p=satune.git

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index f28e781..4715ade 100644
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -10,7 +10,7 @@
 
 #define UNSETVALUE -1
 
-Problem::Problem(const char *_problem) : result(UNSETVALUE) {
+Problem::Problem(const char *_problem) : problemnumber(-1), result(UNSETVALUE) {
 	uint len = strlen(_problem);
 	problem = (char *) ourmalloc(len + 1);
 	memcpy(problem, _problem, len + 1);
@@ -50,7 +50,9 @@ MultiTuner::~MultiTuner() {
 }
 
 void MultiTuner::addProblem(const char *filename) {
-	problems.push(new Problem(filename));
+	Problem *p = new Problem(filename);
+	p->problemnumber = problems.getSize();
+	problems.push(p);
 }
 
 void MultiTuner::printData() {
@@ -72,9 +74,72 @@ void MultiTuner::printData() {
 void MultiTuner::addTuner(SearchTuner *tuner) {
 	TunerRecord *t = new TunerRecord(tuner);
 	tuners.push(t);
+	t->tunernumber = allTuners.getSize();
 	allTuners.push(t);
 }
 
+
+void MultiTuner::readData(uint numRuns) {
+	for (uint i = 0; i < numRuns; i++) {
+		ifstream myfile;
+		char buffer[512];
+		uint tunernumber;
+		snprintf(buffer, sizeof(buffer), "tunernum%u", i);
+		myfile.open (buffer, ios::in);
+		myfile >> tunernumber;
+		myfile.close();
+		if (allTuners.getSize() <= tunernumber)
+			allTuners.setSize(tunernumber + 1);
+		if (allTuners.get(tunernumber) == NULL) {
+			snprintf(buffer, sizeof(buffer), "tuner%u", i);
+			allTuners.set(tunernumber, new TunerRecord(new SearchTuner(buffer)));
+		}
+		//Add any new used records
+		snprintf(buffer, sizeof(buffer), "tuner%uused", i);
+		TunerRecord *tuner = allTuners.get(tunernumber);
+		tuner->getTuner()->addUsed(buffer);
+
+		char problemname[512];
+		uint problemnumber;
+		snprintf(buffer, sizeof(buffer), "problem%u", i);
+		myfile.open(buffer, ios::in);
+		myfile.getline(problemname, sizeof(problemname));
+		myfile >> problemnumber;
+		myfile.close();
+		if (problems.getSize() <= problemnumber)
+			problems.setSize(problemnumber + 1);
+		if (problems.get(problemnumber) == NULL)
+			problems.set(problemnumber, new Problem(problemname));
+		Problem *problem = problems.get(problemnumber);
+		long long metric = -1;
+		int sat = IS_INDETER;
+		//Read data in from results file
+		snprintf(buffer, sizeof(buffer), "result%u", i);
+
+		myfile.open (buffer, ios::in);
+
+
+		if (myfile.is_open()) {
+			myfile >> metric;
+			myfile >> sat;
+			myfile.close();
+		}
+		if (problem->result == UNSETVALUE && sat != IS_INDETER) {
+			problem->result = sat;
+		} else if (problem->result != sat && sat != IS_INDETER) {
+			model_print("******** Result has changed ********\n");
+		}
+
+		if (metric != -1) {
+			if (tuner->getTime(problem) == -1)
+				tuner->problems.push(problem);
+			tuner->setTime(problem, metric);
+		}
+
+	}
+
+}
+
 long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 	char buffer[512];
 	{
@@ -86,6 +151,20 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 
 		if (myfile.is_open()) {
 			myfile << problem->getProblem() << endl;
+			myfile << problem->problemnumber << endl;
+			myfile.close();
+		}
+	}
+
+	{
+		snprintf(buffer, sizeof(buffer), "tunernum%u", execnum);
+
+		ofstream myfile;
+		myfile.open (buffer, ios::out);
+
+
+		if (myfile.is_open()) {
+			myfile << tuner->tunernumber << endl;
 			myfile.close();
 		}
 	}
@@ -132,10 +211,13 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 void MultiTuner::tuneComp() {
 	Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
 	for (uint b = 0; b < budget; b++) {
+		model_print("Round %u of %u\n", b, budget);
 		uint tSize = tunerV->getSize();
 		for (uint i = 0; i < tSize; i++) {
 			SearchTuner *tmpTuner = mutateTuner(tunerV->get(i)->getTuner(), b);
 			TunerRecord *tmp = new TunerRecord(tmpTuner);
+			tmp->tunernumber = allTuners.getSize();
+			model_print("Mutated tuner %u to generate tuner %u\n", tunerV->get(i)->tunernumber, tmp->tunernumber);
 			allTuners.push(tmp);
 			tunerV->push(tmp);
 		}
@@ -149,6 +231,11 @@ void MultiTuner::tuneComp() {
 				long long metric = tuner->getTime(problem);
 				if (metric == -1) {
 					metric = evaluate(problem, tuner);
+					if (tuner->getTime(problem) == -1){
+						tuner->problems.push(problem);
+					}
+					DEBUG("%u.Problem<%s>\tTuner<%p>\tMetric<%lld>\n", i, problem->problem,tuner, metric);
+					DEBUG("*****************************\n");
 					if (metric != -1)
 						tuner->setTime(problem, metric);
 				}
@@ -158,18 +245,21 @@ void MultiTuner::tuneComp() {
 						if (metric < places.get(k)->getTime(problem))
 							break;
 					}
+					DEBUG("place[%u]=Tuner<%p>\n", k, tuner);
 					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;
+				DEBUG("Problem<%s>\tTuner<%p>\tmetric<%d>\n", problem->problem, tuner, currScore);
+				DEBUG("**************************\n");
 				scores.put(tuner, currScore);
+				points = points / 3;
 			}
 		}
 		Vector<TunerRecord *> ranking;
@@ -187,11 +277,15 @@ void MultiTuner::tuneComp() {
 				if (score < tscore)
 					break;
 			}
+			DEBUG("ranking[%u]=tuner<%p>(Score=%d)\n", j, tuner, score);
+			DEBUG("************************\n");
 			ranking.insertAt(j, tuner);
 		}
+		DEBUG("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);
 			for (uint j = 0; j < tunerV->getSize(); j++) {
+				model_print("Removing tuner %u\n", tuner->tunernumber);
 				if (tunerV->get(j) == tuner)
 					tunerV->removeAt(j);
 			}
@@ -298,6 +392,7 @@ TunerRecord *MultiTuner::tune(TunerRecord *tuner) {
 	for (uint i = 0; i < budget; i++) {
 		SearchTuner *tmpTuner = mutateTuner(oldTuner->getTuner(), i);
 		TunerRecord *newTuner = oldTuner->changeTuner(tmpTuner);
+		newTuner->tunernumber = allTuners.getSize();
 		allTuners.push(newTuner);
 		double newScore = evaluateAll(newTuner);
 		newTuner->tuner->printUsed();