commit after merge

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

diff --git a/src/Tuner/satuner.cc b/src/Tuner/satuner.cc
index 4844ce37a2f8f5796188225e7272f10c94bbcfa3..277508160b323a0b5d84d78da941d5c226d480a6 100644 (file)
--- a/src/Tuner/satuner.cc
+++ b/src/Tuner/satuner.cc
@@ -153,11 +153,20 @@ 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);
-                       if ( score2 > score1 ) {
+                       
+                       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) {
                                model_print("score1=%d\tscore2=%d\tt=%u\texp=%f\n", score1, score2, t, exp((score1 - score2) * 1.0 / t));