From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Thu, 21 Mar 2019 20:58:54 +0000 (-0700)
Subject: commit after merge
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=e5c1ee81132998d6a80d83e95f1faf2ca06ac7fb

commit after merge
---

e5c1ee81132998d6a80d83e95f1faf2ca06ac7fb
diff --cc src/Tuner/satuner.cc
index 0c405ae,4844ce3..2775081
--- a/src/Tuner/satuner.cc
+++ b/src/Tuner/satuner.cc
@@@ -153,34 -153,25 +153,34 @@@ 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));
- 				double prob = 1/(exp((score1-score2)*1.0/t) );
+ 			} else if ( score2 < score1) {
+ 				model_print("score1=%d\tscore2=%d\tt=%u\texp=%f\n", score1, score2, t, exp((score1 - score2) * 1.0 / t));
+ 				double prob = 1 / (exp((score1 - score2) * 1.0 / t) );
  				double random = ((double) rand() / (RAND_MAX));
  				model_print("prob=%f\trandom=%f\n", prob, random);
- 				if(prob > random){
+ 				if (prob > random) {
  					removeTunerIndex(tunerV, i, allplaces);
- 				}else{
+ 				} else {
  					removeTunerIndex(tunerV, tunerNumber + i, allplaces);
  				}
- 			} else{
+ 			} else {
  				double random = ((double) rand() / (RAND_MAX));
- 				int index = random > 0.5? i : tunerNumber + i;
+ 				int index = random > 0.5 ? i : tunerNumber + i;
  				removeTunerIndex(tunerV, index, allplaces);
  			}
  		}