bug

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

diff --git a/src/Tuner/multituner.cc b/src/Tuner/multituner.cc
index cc35abc16c8765adec341b17234010836655ac56..51034140e5459e162a74e2ca6841989a3432c9b9 100644 (file)
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@ -83,20 +83,58 @@ void MultiTuner::readData(uint numRuns) {
        for (uint i = 0; i < numRuns; i++) {
                ifstream myfile;
                char buffer[512];
-               uint tunernum;
+               uint tunernumber;
                snprintf(buffer, sizeof(buffer), "tunernum%u", i);
                myfile.open (buffer, ios::in);
-               myfile >> tunernum;
+               myfile >> tunernumber;
                myfile.close();
+               if (allTuners.getSize() <= tunernumber)
+                       allTuners.setSize(tunernumber + 1);
+               if (allTuners.get(tunernumber) == NULL) {
+                       snprintf(buffer, sizeof(buffer), "tuner%u", i);
+                       allTuners.set(tunernumber, new TunerRecord(new SearchTuner(buffer)));
+               }
+               //Add any new used records
+               snprintf(buffer, sizeof(buffer), "tuner%uused", i);
+               TunerRecord *tuner = allTuners.get(tunernumber);
+               tuner->getTuner()->addUsed(buffer);
 
                char problemname[512];
+               uint problemnumber;
                snprintf(buffer, sizeof(buffer), "problem%u", i);
                myfile.open(buffer, ios::in);
                myfile.getline(problemname, sizeof(problemname));
+               myfile >> problemnumber;
                myfile.close();
+               if (problems.getSize() <= problemnumber)
+                       problems.setSize(problemnumber + 1);
+               if (problems.get(problemnumber) == NULL)
+                       problems.set(problemnumber, new Problem(problemname));
+               Problem *problem = problems.get(problemnumber);
+               long long metric = -1;
+               int sat = IS_INDETER;
+               //Read data in from results file
+               snprintf(buffer, sizeof(buffer), "result%u", i);
 
+               myfile.open (buffer, ios::in);
 
 
+               if (myfile.is_open()) {
+                       myfile >> metric;
+                       myfile >> sat;
+                       myfile.close();
+               }
+               if (problem->result == UNSETVALUE && sat != IS_INDETER) {
+                       problem->result = sat;
+               } else if (problem->result != sat && sat != IS_INDETER) {
+                       model_print("******** Result has changed ********\n");
+               }
+
+               if (metric != -1) {
+                       if (tuner->getTime(problem) == -1)
+                               tuner->problems.push(problem);
+                       tuner->setTime(problem, metric);
+               }
 
        }
 
@@ -173,11 +211,13 @@ long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 void MultiTuner::tuneComp() {
        Vector<TunerRecord *> *tunerV = new Vector<TunerRecord *>(&tuners);
        for (uint b = 0; b < budget; b++) {
+               model_print("Round %u of %u\n", b, budget);
                uint tSize = tunerV->getSize();
                for (uint i = 0; i < tSize; i++) {
                        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);
                }
@@ -191,6 +231,11 @@ void MultiTuner::tuneComp() {
                                long long metric = tuner->getTime(problem);
                                if (metric == -1) {
                                        metric = evaluate(problem, tuner);
+                                       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);
                                }
@@ -200,18 +245,21 @@ void MultiTuner::tuneComp() {
                                                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;
@@ -229,10 +277,14 @@ void MultiTuner::tuneComp() {
                                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);
+                       model_print("Removing tuner %u\n", tuner->tunernumber);
                        for (uint j = 0; j < tunerV->getSize(); j++) {
                                if (tunerV->get(j) == tuner)
                                        tunerV->removeAt(j);