github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-12-31 13:49:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

fdr: use braced init syntax for pairs

Browse Source
This commit is contained in:
Justin Viiret
2016-04-29 09:40:44 +10:00
committed by Matthew Barr
parent b8cd169cde
commit ad74f3b895
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fdr/fdr_compile.cpp
View File

@@ -315,12 +315,12 @@ void FDRCompiler::assignStringsToBuckets() {
for (u32 k = j; k < nChunks; ++k) {
cnt += count[k];
}
t[j][0] = make_pair(getScoreUtil(length[j], cnt), 0);
t[j][0] = {getScoreUtil(length[j], cnt), 0};
}
for (u32 i = 1; i < nb; i++) {
for (u32 j = 0; j < nChunks - 1; j++) { // don't process last, empty row
SCORE_INDEX_PAIR best = make_pair(MAX_SCORE, 0);
SCORE_INDEX_PAIR best = {MAX_SCORE, 0};
u32 cnt = count[j];
for (u32 k = j + 1; k < nChunks - 1; k++, cnt += count[k]) {
SCORE score = getScoreUtil(length[j], cnt);
@@ -329,12 +329,12 @@ void FDRCompiler::assignStringsToBuckets() {
}
score += t[k][i-1].first;
if (score < best.first) {
best = make_pair(score, k);
best = {score, k};
}
}
t[j][i] = best;
}
t[nChunks - 1][i] = make_pair(0,0); // fill in empty final row for next iteration
t[nChunks - 1][i] = {0,0}; // fill in empty final row for next iteration
}
#ifdef DEBUG_ASSIGNMENT