Merge branch 'tuner' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler into...

diff --combined src/Tuner/multituner.cc
index 851dc5321a570aa81fe94c8dac891fe289387c5a,9694fbfa9c63173b506d7c5da72f10a1c1642174..4715ade353532f0707166e3a95740832437c4599
--- 1/src/Tuner/multituner.cc
--- 2/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@@ -217,7 -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);
                }
@@@ -231,8 -230,11 +231,11 @@@
                                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);
+                                       DEBUG("*****************************\n");
                                        if (metric != -1)
                                                tuner->setTime(problem, metric);
                                }
@@@ -242,18 -244,21 +245,21 @@@
                                                if (metric < places.get(k)->getTime(problem))
                                                        break;
                                        }
+                                       DEBUG("place[%u]=Tuner<%p>\n", k, tuner);
                                        places.insertAt(k, tuner);
                                }
                        }
                        int points = 9;
                        for (uint k = 0; k < places.getSize() && points; k++) {
                                TunerRecord *tuner = places.get(k);
-                               points = points / 3;
                                int currScore = 0;
                                if (scores.contains(tuner))
                                        currScore = scores.get(tuner);
                                currScore += points;
+                               DEBUG("Problem<%s>\tTuner<%p>\tmetric<%d>\n", problem->problem, tuner, currScore);
+                               DEBUG("**************************\n");
                                scores.put(tuner, currScore);
+                               points = points / 3;
                        }
                }
                Vector<TunerRecord *> ranking;
@@@ -271,12 -276,14 +277,15 @@@
                                if (score < tscore)
                                        break;
                        }
+                       DEBUG("ranking[%u]=tuner<%p>(Score=%d)\n", j, tuner, score);
+                       DEBUG("************************\n");
                        ranking.insertAt(j, tuner);
                }
+               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++) {
 +                              model_print("Removing tuner %u\n", tuner->tunernumber);
                                if (tunerV->get(j) == tuner)
                                        tunerV->removeAt(j);
                        }