Tuner shouldn't try to find really bad implementations

[satune.git] / src / Tuner / multituner.cc

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index 9694fbfa9c63173b506d7c5da72f10a1c1642174..e0fee46074f5656e7df7fd9bba9cd4a7ba5e18a1 100644 (file)
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -217,6 +217,7 @@ void MultiTuner::tuneComp() {
                        SearchTuner *tmpTuner = mutateTuner(tunerV->get(i)->getTuner(), b);
                        TunerRecord *tmp = new TunerRecord(tmpTuner);
                        tmp->tunernumber = allTuners.getSize();
+                       model_print("Mutated tuner %u to generate tuner %u\n", tunerV->get(i)->tunernumber, tmp->tunernumber);
                        allTuners.push(tmp);
                        tunerV->push(tmp);
                }
@@ -230,7 +231,7 @@ void MultiTuner::tuneComp() {
                                long long metric = tuner->getTime(problem);
                                if (metric == -1) {
                                        metric = evaluate(problem, tuner);
-                                       if (tuner->getTime(problem) == -1){
+                                       if (tuner->getTime(problem) == -1) {
                                                tuner->problems.push(problem);
                                        }
                                        DEBUG("%u.Problem<%s>\tTuner<%p>\tMetric<%lld>\n", i, problem->problem,tuner, metric);
@@ -273,7 +274,7 @@ void MultiTuner::tuneComp() {
                                int tscore = 0;
                                if (scores.contains(t))
                                        tscore = scores.get(t);
-                               if (score < tscore)
+                               if (score > tscore)
                                        break;
                        }
                        DEBUG("ranking[%u]=tuner<%p>(Score=%d)\n", j, tuner, score);
@@ -283,6 +284,7 @@ void MultiTuner::tuneComp() {
                DEBUG("tunerSize=%u\trankingSize=%u\ttunerVSize=%u\n", tuners.getSize(), ranking.getSize(), tunerV->getSize());
                for (uint i = tuners.getSize(); i < ranking.getSize(); i++) {
                        TunerRecord *tuner = ranking.get(i);
+                       model_print("Removing tuner %u\n", tuner->tunernumber);
                        for (uint j = 0; j < tunerV->getSize(); j++) {
                                if (tunerV->get(j) == tuner)
                                        tunerV->removeAt(j);