From 526e78e9379fb1cf98186f4195e8f52866e80063 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky@uci.edu>
Date: Mon, 15 Oct 2018 17:13:58 -0700
Subject: [PATCH] Fix result file

---
 src/Test/deserializerun.cc | 6 +++---
 src/Test/run.sh            | 2 +-
 src/Tuner/multituner.cc    | 9 +++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Test/deserializerun.cc b/src/Test/deserializerun.cc
index d2c591a..1b7371b 100644
--- a/src/Test/deserializerun.cc
+++ b/src/Test/deserializerun.cc
@@ -19,9 +19,9 @@ int main(int argc, char **argv) {
 	int sat = solver->solve();
 	long long metric = solver->getElapsedTime();
 	ofstream myfile;
-	myfile.open (argv[4], ios::out);
-	myfile << metric;
-	myfile << sat;
+	myfile.open (argv[4], ios::out | ios::trunc);
+	myfile << metric << endl;
+	myfile << sat << endl;
 	myfile.close();
 	//serialize out the tuner we used
 	snprintf(buffer, sizeof(buffer), "%sused", argv[3]);
diff --git a/src/Test/run.sh b/src/Test/run.sh
index e74b557..4590ede 100755
--- a/src/Test/run.sh
+++ b/src/Test/run.sh
@@ -5,5 +5,5 @@ export LD_LIBRARY_PATH=../bin
 export DYLD_LIBRARY_PATH=../bin
 # For sat_solver
 export PATH=.:$PATH
-
+echo $@
 $@
diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index 03bfeec..1cdeee2 100644
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -66,7 +66,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%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;
@@ -74,7 +74,7 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 
 	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);
@@ -87,10 +87,7 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 		}
 
 		snprintf(buffer, sizeof(buffer), "tuner%uused", execnum);
-		SearchTuner *usedtuner = new SearchTuner(buffer);
-		delete tuner->getTuner();
-		tuner->updateTuner(usedtuner);
-
+		tuner->getTuner()->addUsed(buffer);
 	}
 	//Increment execution count
 	execnum++;
-- 
2.34.1