Bug Fix: defining the scope of integer for Alloy

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

diff --git a/src/Tuner/basictuner.cc b/src/Tuner/basictuner.cc
index 23e4d389c569a5c7ac06b5d329f50fc60b9beb01..889b543f07bab6299042f09874903e842a3d9ba9 100644 (file)
--- a/src/Tuner/basictuner.cc
+++ b/src/Tuner/basictuner.cc
@@ -102,10 +102,13 @@ void BasicTuner::printData() {
        }
 }
 
-bool BasicTuner::tunerExists(SearchTuner *tuner){
+bool BasicTuner::tunerExists(TunerRecord *tunerec){
+       SearchTuner *tuner = tunerec->getTuner();
        for(uint i=0; i< explored.getSize(); i++){
-               if(explored.get(i)->getTuner()->equalUsed(tuner))
+               if(explored.get(i)->getTuner()->equalUsed(tuner)){
+                       model_print("************Tuner <%d> is replicate of Tuner <%d>\n", tunerec->getTunerNumber(), explored.get(i)->getTunerNumber());
                        return true;
+               }
        }
        return false;
 }
@@ -206,14 +209,14 @@ SearchTuner *BasicTuner::mutateTuner(SearchTuner *oldTuner, uint k) {
        return newTuner;
 }
 
-bool BasicTuner::subTunerExist(SearchTuner *newTuner){
+int BasicTuner::subTunerIndex(SearchTuner *newTuner){
        for (uint i=0; i< explored.getSize(); i++){
                SearchTuner *tuner = explored.get(i)->getTuner();
                if(tuner->isSubTunerof(newTuner)){
-                       return true;
+                       return i;
                }
        }
-       return false;
+       return -1;
 }
 
 
@@ -221,4 +224,4 @@ void BasicTuner::updateTimeout(Problem *problem, long long metric) {
        if (metric < problem->getBestTime()) {
                problem->setBestTime( metric );
        }
-}
\ No newline at end of file
+}