From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Wed, 17 Oct 2018 21:43:46 +0000 (-0700)
Subject: Merging with Brian's commits ...
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fcfe7108b83e46a943e8fae0639af2e29fa92001;p=satune.git

Merging with Brian's commits ...
---

fcfe7108b83e46a943e8fae0639af2e29fa92001
diff --cc src/Tuner/multituner.cc
index 3834d6f,34d2ce1..9694fbf
--- a/src/Tuner/multituner.cc
+++ b/src/Tuner/multituner.cc
@@@ -120,10 -230,8 +230,11 @@@ void MultiTuner::tuneComp() 
  				long long metric = tuner->getTime(problem);
  				if (metric == -1) {
  					metric = evaluate(problem, tuner);
- 					tuner->problems.push(problem);
- 					tuner->timetaken.put(problem, metric);
 -					if (tuner->getTime(problem) == -1)
++					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);
  				}
@@@ -162,14 -267,11 +273,14 @@@
  				int tscore = 0;
  				if (scores.contains(t))
  					tscore = scores.get(t);
- 				if (score > tscore)
+ 				if (score < tscore)
  					break;
  			}
 +			DEBUG("ranking[%u]=tuner<%p>(Score=%d)\n", j, tuner, score);
 +			DEBUG("************************\n");
  			ranking.insertAt(j, tuner);
  		}
- 		model_print("tunerSize=%u\trankingSize=%u\ttunerVSize=%u\n", tuners.getSize(), ranking.getSize(), tunerV->getSize());
++		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);
  			for (uint j = 0; j < tunerV->getSize(); j++) {