From: bdemsky Date: Fri, 12 Oct 2018 23:26:36 +0000 (-0700) Subject: edits X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=9ef43d0b5d36cd8feb6119fb4f0b1873644a15d7 edits --- diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc index cd8d7bb..e20aa1f 100644 --- a/src/Tuner/multituner.cc +++ b/src/Tuner/multituner.cc @@ -8,9 +8,7 @@ #include #include - #define UNSETVALUE -1 -#define TIMEOUTSEC 5000 Problem::Problem(const char *_problem) : result(UNSETVALUE) { uint len = strlen(_problem); @@ -54,7 +52,9 @@ void MultiTuner::addProblem(const char *filename) { } void MultiTuner::addTuner(SearchTuner *tuner) { - tuners.push(new TunerRecord(tuner)); + TunerRecord *t = new TunerRecord(tuner); + tuners.push(t); + allTuners.push(t); } long long MultiTuner::evaluate(Problem *problem, SearchTuner *tuner) { @@ -202,6 +202,7 @@ TunerRecord *MultiTuner::tune(TunerRecord *tuner) { for (uint i = 0; i < budget; i++) { SearchTuner *tmpTuner = mutateTuner(oldTuner->getTuner(), i); TunerRecord *newTuner = oldTuner->changeTuner(tmpTuner); + allTuners.push(newTuner); double newScore = evaluateAll(newTuner); newTuner->tuner->printUsed(); model_print("Received score %f\n", newScore);