X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FTuner%2Fsearchtuner.cc;h=3cf94fb1f937f880c0dbb08c23d869d1e799bc49;hp=e594abef11a07062625b8adf9925338600749690;hb=d66b0127223114bdcca550ab39ec3d4e94d270ba;hpb=46ec863801c9ca9d8d92d65008ffc3f7cf234f89

diff --git a/src/Tuner/searchtuner.cc b/src/Tuner/searchtuner.cc
index e594abe..3cf94fb 100644
--- a/src/Tuner/searchtuner.cc
+++ b/src/Tuner/searchtuner.cc
@@ -52,16 +52,6 @@ void TunableSetting::print() {
 	model_print("\n");
 }
 
-unsigned int tunableSettingHash(TunableSetting *setting) {
-	return setting->hasVar ^ setting->type1 ^ setting->type2 ^ setting->param;
-}
-
-bool tunableSettingEquals(TunableSetting *setting1, TunableSetting *setting2) {
-	return setting1->hasVar == setting2->hasVar &&
-				 setting1->type1 == setting2->type1 &&
-				 setting1->type2 == setting2->type2 &&
-				 setting1->param == setting2->param;
-}
 
 ostream &operator<<(ostream &os, const TunableSetting &ts)
 {
@@ -74,7 +64,62 @@ ostream &operator<<(ostream &os, const TunableSetting &ts)
 SearchTuner::SearchTuner() {
 }
 
-SearchTuner::SearchTuner(const char *filename) {
+SearchTuner::SearchTuner(const char *filename, bool addused) {
+	ifstream myfile;
+	myfile.open (filename, ios::in);
+	if (myfile.is_open()) {
+		bool hasVar;
+		VarType type1;
+		VarType type2;
+		TunableParam param;
+		int lowValue;
+		int highValue;
+		int defaultValue;
+		int selectedValue;
+		while (myfile >> hasVar >> type1 >> type2 >> param >> lowValue >> highValue >> defaultValue >> selectedValue) {
+			TunableSetting *setting;
+
+			if (hasVar) {
+				setting = new TunableSetting(type1, type2, param);
+			} else {
+				setting = new TunableSetting(param);
+			}
+			setting->setDecision(lowValue, highValue, defaultValue, selectedValue);
+			settings.add(setting);
+			if (addused) {
+				usedSettings.add(setting);
+			}
+		}
+		myfile.close();
+	} else {
+		model_print("Warning: Tuner %s couldn't be loaded ... Using default tuner instead ....\n", filename);
+	}
+}
+
+bool SearchTuner::equalUsed(SearchTuner *tuner) {
+	if (tuner->usedSettings.getSize() != usedSettings.getSize()) {
+		return false;
+	}
+	bool result = true;
+	SetIteratorTunableSetting *iterator = usedSettings.iterator();
+	while (iterator->hasNext()) {
+		TunableSetting *setting = iterator->next();
+		if (!tuner->usedSettings.contains(setting)) {
+			result = false;
+			break;
+		} else {
+			TunableSetting *tunerSetting = tuner->usedSettings.get(setting);
+			if (tunerSetting->selectedValue != setting->selectedValue) {
+				result = false;
+				break;
+			}
+		}
+	}
+	delete iterator;
+	return result;
+}
+
+void SearchTuner::addUsed(const char *filename) {
 	ifstream myfile;
 	myfile.open (filename, ios::in);
 	if (myfile.is_open()) {
@@ -95,15 +140,43 @@ SearchTuner::SearchTuner(const char *filename) {
 				setting = new TunableSetting(param);
 			}
 			setting->setDecision(lowValue, highValue, defaultValue, selectedValue);
-			usedSettings.add(setting);
+			if (!settings.contains(setting)) {
+				settings.add(setting);
+				usedSettings.add(setting);
+			} else {
+				TunableSetting *tmp = settings.get(setting);
+				settings.remove(tmp);
+				usedSettings.remove(tmp);
+				delete tmp;
+				settings.add(setting);
+				usedSettings.add(setting);
+			}
 		}
 		myfile.close();
 	}
 }
 
+bool SearchTuner::isSubTunerof(SearchTuner *newTuner) {
+	SetIteratorTunableSetting *iterator = usedSettings.iterator();
+	while (iterator->hasNext()) {
+		TunableSetting *setting = iterator->next();
+		if (!newTuner->settings.contains(setting)) {
+			return false;
+		} else {
+			TunableSetting *newSetting = newTuner->settings.get(setting);
+			if (newSetting->selectedValue != setting->selectedValue) {
+				return false;
+			}
+		}
+	}
+	delete iterator;
+	return true;
+}
+
 SearchTuner *SearchTuner::copyUsed() {
 	SearchTuner *tuner = new SearchTuner();
-	SetIteratorTunableSetting *iterator = usedSettings.iterator();
+	
+	SetIteratorTunableSetting *iterator = !usedSettings.isEmpty()? usedSettings.iterator():settings.iterator();
 	while (iterator->hasNext()) {
 		TunableSetting *setting = iterator->next();
 		TunableSetting *copy = new TunableSetting(setting);
@@ -212,6 +285,18 @@ void SearchTuner::serialize(const char *filename) {
 	delete iterator;
 }
 
+void SearchTuner::serializeUsed(const char *filename) {
+	ofstream myfile;
+	myfile.open (filename, ios::out | ios::trunc);
+	SetIteratorTunableSetting *iterator = usedSettings.iterator();
+	while (iterator->hasNext()) {
+		TunableSetting *setting = iterator->next();
+		myfile << *setting << endl;
+	}
+	myfile.close();
+	delete iterator;
+}
+
 void SearchTuner::printUsed() {
 	SetIteratorTunableSetting *iterator = usedSettings.iterator();
 	while (iterator->hasNext()) {