From: bdemsky <bdemsky@uci.edu>
Date: Fri, 12 Oct 2018 19:52:41 +0000 (-0700)
Subject: edits
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=de496db6f2115b2ebf599f55842880b42993893b

edits
---

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index 8ad7a32..e990823 100644
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -22,8 +22,8 @@ Problem::~Problem() {
 	ourfree(problem);
 }
 
-MultiTuner::MultiTuner(uint _budget, uint _timeout) :
-	budget(_budget), timeout(_timeout), execnum(0) {
+MultiTuner::MultiTuner(uint _budget, uint _rounds, uint _timeout) :
+	budget(_budget), rounds(_rounds), timeout(_timeout), execnum(0) {
 }
 
 MultiTuner::~MultiTuner() {
@@ -104,12 +104,19 @@ void clearVector(Vector<TunerRecord *> *tunerV) {
 
 void MultiTuner::tuneK() {
 	Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
-	while (true) {
+	for (uint i = 0; i < rounds; i++) {
 		clearVector(tunerV);
 		mapProblemsToTuners(tunerV);
 		improveTuners(tunerV);
 	}
-
+	model_print("Best tuners\n");
+	for (uint j = 0; j < tunerV->getSize(); j++) {
+		TunerRecord *tuner = tunerV->get(j);
+		char buffer[256];
+		sprintf(buffer, "tuner%u.conf", j);
+		tuner->getTuner()->serialize(buffer);
+		tuner->getTuner()->print();
+	}
 	delete tunerV;
 }
 
diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
index 79cacf6..1c2a1fe 100644
--- a/src/Tuner/multituner.h
+++ b/src/Tuner/multituner.h
@@ -30,7 +30,7 @@ private:
 
 class MultiTuner {
 public:
-	MultiTuner(uint budget, uint timeout);
+	MultiTuner(uint budget, uint rounds, uint timeout);
 	~MultiTuner();
 	void addProblem(const char *filename);
 	void addTuner(SearchTuner *tuner);
@@ -49,6 +49,7 @@ protected:
 	Vector<Problem *> problems;
 	Vector<TunerRecord *> tuners;
 	uint budget;
+	uint rounds;
 	uint timeout;
 	int execnum;
 };