projects
/
satune.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f641a37
)
Some edits...
author
bdemsky
<bdemsky@uci.edu>
Wed, 17 Oct 2018 04:49:24 +0000
(21:49 -0700)
committer
bdemsky
<bdemsky@uci.edu>
Wed, 17 Oct 2018 04:49:24 +0000
(21:49 -0700)
src/Tuner/multituner.cc
patch
|
blob
|
history
diff --git
a/src/Tuner/multituner.cc
b/src/Tuner/multituner.cc
index 1cdeee2dd53973156799a56c5d8a97e427e31343..25dcc5d875c78cdd8fb0c31a5f0999a5cb6fb538 100644
(file)
--- a/
src/Tuner/multituner.cc
+++ b/
src/Tuner/multituner.cc
@@
-61,6
+61,19
@@
void MultiTuner::addTuner(SearchTuner *tuner) {
long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
char buffer[512];
long long MultiTuner::evaluate(Problem *problem, TunerRecord *tuner) {
char buffer[512];
+ {
+ snprintf(buffer, sizeof(buffer), "problem%u", execnum);
+
+ ofstream myfile;
+ myfile.open (buffer, ios::out);
+
+
+ if (myfile.is_open()) {
+ myfile << problem->getProblem() << endl;
+ myfile.close();
+ }
+ }
+
//Write out the tuner
snprintf(buffer, sizeof(buffer), "tuner%u", execnum);
tuner->getTuner()->serialize(buffer);
//Write out the tuner
snprintf(buffer, sizeof(buffer), "tuner%u", execnum);
tuner->getTuner()->serialize(buffer);
@@
-106,7
+119,9
@@
void MultiTuner::tuneComp() {
uint tSize = tunerV->getSize();
for (uint i = 0; i < tSize; i++) {
SearchTuner *tmpTuner = mutateTuner(tunerV->get(i)->getTuner(), b);
uint tSize = tunerV->getSize();
for (uint i = 0; i < tSize; i++) {
SearchTuner *tmpTuner = mutateTuner(tunerV->get(i)->getTuner(), b);
- tunerV->push(new TunerRecord(tmpTuner));
+ TunerRecord *tmp = new TunerRecord(tmpTuner);
+ allTuners.push(tmp);
+ tunerV->push(tmp);
}
Hashtable<TunerRecord *, int, uint64_t> scores;
}
Hashtable<TunerRecord *, int, uint64_t> scores;
@@
-153,7
+168,7
@@
void MultiTuner::tuneComp() {
int tscore = 0;
if (scores.contains(t))
tscore = scores.get(t);
int tscore = 0;
if (scores.contains(t))
tscore = scores.get(t);
- if (score
>
tscore)
+ if (score
<
tscore)
break;
}
ranking.insertAt(j, tuner);
break;
}
ranking.insertAt(j, tuner);