Merging with Brian's commits ...

diff --cc src/Tuner/multituner.cc
index 3834d6f2affe3b47a563dd4203ed659da5d24912,34d2ce1a43c374e25dec2e8b2ab3d4fa32a39893..9694fbfa9c63173b506d7c5da72f10a1c1642174
--- 1/src/Tuner/multituner.cc
--- 2/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@@ -120,10 -230,8 +230,11 @@@ void MultiTuner::tuneComp() 
                                long long metric = tuner->getTime(problem);
                                if (metric == -1) {
                                        metric = evaluate(problem, tuner);
-                                       tuner->problems.push(problem);
-                                       tuner->timetaken.put(problem, metric);
 -                                      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);
 +                                      DEBUG("*****************************\n");
                                        if (metric != -1)
                                                tuner->setTime(problem, metric);
                                }
@@@ -162,14 -267,11 +273,14 @@@
                                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);
 +                      DEBUG("************************\n");
                        ranking.insertAt(j, tuner);
                }
-               model_print("tunerSize=%u\trankingSize=%u\ttunerVSize=%u\n", tuners.getSize(), ranking.getSize(), tunerV->getSize());
++              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);
                        for (uint j = 0; j < tunerV->getSize(); j++) {