Fix result file

diff --git a/src/Test/deserializerun.cc b/src/Test/deserializerun.cc
index d2c591a50b8e222b79964a4dffe54f4d18ea949c..1b7371b45b80714798ccd32c0725dba544a517df 100644 (file)
--- 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;
        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]);
        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 e74b557af516008fcecb3684c8450d2af9e13fa0..4590edeaa012c9cc0681ae01ea025f418215a4f2 100755 (executable)
--- 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
 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 03bfeec88b363fc68294453b7c05660ceb680fc4..1cdeee2dd53973156799a56c5d8a97e427e31343 100644 (file)
--- 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
        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;
        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
 
        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);
 
                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);
                }
 
                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++;
        }
        //Increment execution count
        execnum++;