Bug Fix: when a tuner cannot solve any problems ...

diff --git a/src/Tuner/basictuner.cc b/src/Tuner/basictuner.cc
index 889b543f07bab6299042f09874903e842a3d9ba9..a2d93bf965713681ceb1432c89243dc993e63c78 100644 (file)
--- a/src/Tuner/basictuner.cc
+++ b/src/Tuner/basictuner.cc
@@ -160,6 +160,7 @@ long long BasicTuner::evaluate(Problem *problem, TunerRecord *tuner) {
 
        //Do run
        snprintf(buffer, sizeof(buffer), "./run.sh deserializerun %s %u tuner%u result%u > log%u", problem->getProblem(), maxtime, execnum, execnum, execnum);
+       model_print("Running: %s\n", buffer);
        int status = system(buffer);
 
        long long metric = -1;

diff --git a/src/Tuner/satuner.cc b/src/Tuner/satuner.cc
index 61c9c355684264762ab28013df28021c071cdcd2..0c405ae15f1b912f65b7781654dd1bb6e2697d0b 100644 (file)
--- a/src/Tuner/satuner.cc
+++ b/src/Tuner/satuner.cc
@@ -153,10 +153,19 @@ void SATuner::tune() {
                        TunerRecord *tuner2 = tunerV->get(tunerNumber + i);
                        ASSERT( tunerNumber + i < tunerV->getSize());
                        model_print("Tuner1 = %d \tTuner2 = %d\n", tuner1->getTunerNumber(), tuner2->getTunerNumber());
-                       ASSERT(scores.contains(tuner1));
-                       ASSERT(scores.contains(tuner2));
-                       int score1 = scores.get(tuner1);
-                       int score2 = scores.get(tuner2);
+                       
+                       int score1, score2;
+                       if(!scores.contains(tuner1)){
+                               score1 = 0;
+                       }else {
+                               score1 = scores.get(tuner1);
+                       }
+                       if(!scores.contains(tuner2)){
+                               score2=0;
+                       }else {
+                               score2= scores.get(tuner2);
+                       }
+                       
                        if( score2 > score1 ){
                                removeTunerIndex(tunerV, i, allplaces);
                        } else if( score2 < score1){